Merge remote-tracking branch 'origin/refactor-input' into refactor-export

Author: ArgoZhang

src/BootstrapBlazor/Extensions/ObjectExtensions.cs

@@ -50,15 +50,24 @@ public static string ConvertToPercentString(this string? val)
     /// <returns></returns>
     public static bool IsNumber(this Type t)
     {
-        var separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+        var targetType = Nullable.GetUnderlyingType(t) ?? t;
+        return targetType == typeof(int) || targetType == typeof(long) || targetType == typeof(short) ||
+            targetType == typeof(float) || targetType == typeof(double) || targetType == typeof(decimal);
+    }
+
+    /// <summary>
+    /// 检查是否应该渲染成 <see cref="BootstrapInputNumber{TValue}"/>
+    /// </summary>
+    /// <param name="t"></param>
+    /// <returns></returns>
+    public static bool IsNumberWithDotSeparator(this Type t)
+    {
+        var separator = CultureInfo.CurrentUICulture.NumberFormat.NumberDecimalSeparator;
         if (separator != ".")
         {
             return false;
         }
-
-        var targetType = Nullable.GetUnderlyingType(t) ?? t;
-        return targetType == typeof(int) || targetType == typeof(long) || targetType == typeof(short) ||
-            targetType == typeof(float) || targetType == typeof(double) || targetType == typeof(decimal);
+        return t.IsNumber();
     }
 
     /// <summary>

src/BootstrapBlazor/Utils/Utility.cs

@@ -638,7 +638,7 @@ private static Type GenerateComponentType(IEditorItem item)
         {
             ret = typeof(NullSwitch);
         }
-        else if (fieldType.IsNumber())
+        else if (fieldType.IsNumberWithDotSeparator())
         {
             ret = typeof(BootstrapInputNumber<>).MakeGenericType(fieldType);
         }
@@ -704,7 +704,7 @@ private static Dictionary<string, object> CreateMultipleAttributes(Type fieldTyp
                 ret.Add("rows", item.Rows);
             }
         }
-        else if (type.IsNumber())
+        else if (type.IsNumberWithDotSeparator())
         {
             if (!string.IsNullOrEmpty(item.Step))
             {

test/UnitTest/Extensions/ObjectExtensionsTest.cs

@@ -49,11 +49,13 @@ public void IsNumber_Culture()
     {
         var culture = new CultureInfo("es-ES");
         CultureInfo.CurrentCulture = culture;
-        Assert.False(typeof(long).IsNumber());
+        Assert.True(typeof(long).IsNumber());
+        Assert.False(typeof(long).IsNumberWithDotSeparator());
 
         culture = new CultureInfo("en-US");
         CultureInfo.CurrentCulture = culture;
         Assert.True(typeof(long).IsNumber());
+        Assert.True(typeof(long).IsNumberWithDotSeparator());
     }
 
     [Theory]