Skip to content

Commit 7309a05

Browse files
committed
feat(GenerateComponentType)#4982-Numeric-type-rendered
1 parent 471f290 commit 7309a05

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/BootstrapBlazor/Utils/Utility.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Microsoft.Extensions.Localization;
88
using System.ComponentModel;
99
using System.Data;
10+
using System.Globalization;
1011
using System.Linq.Expressions;
1112
using System.Reflection;
1213

@@ -101,6 +102,11 @@ public static class Utility
101102
/// <returns></returns>
102103
public static TResult GetPropertyValue<TModel, TResult>(TModel model, string fieldName) => CacheManager.GetPropertyValue<TModel, TResult>(model, fieldName);
103104

105+
/// <summary>
106+
/// 获得 当前输入语言小数点分隔符
107+
/// </summary>
108+
private static string NumberDecimalSeparator => CultureInfo.CurrentCulture?.NumberFormat?.NumberDecimalSeparator ?? ".";
109+
104110
/// <summary>
105111
/// 获取 指定对象的属性值
106112
/// </summary>
@@ -429,12 +435,10 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
429435
builder.OpenComponent(0, typeof(Display<>).MakeGenericType(fieldType));
430436
builder.AddAttribute(10, nameof(Display<string>.DisplayText), displayName);
431437
builder.AddAttribute(20, nameof(Display<string>.Value), fieldValue);
432-
builder.AddAttribute(30, nameof(Display<string>.Lookup), item.Lookup);
433-
builder.AddAttribute(30, nameof(Display<string>.LookupService), item.LookupService);
434-
builder.AddAttribute(40, nameof(Display<string>.LookupServiceKey), item.LookupServiceKey);
435-
builder.AddAttribute(50, nameof(Display<string>.LookupServiceData), item.LookupServiceData);
436-
builder.AddAttribute(60, nameof(Display<string>.LookupStringComparison), item.LookupStringComparison);
437-
builder.AddAttribute(65, nameof(Display<string>.ShowLabelTooltip), item.ShowLabelTooltip);
438+
builder.AddAttribute(30, nameof(Display<string>.LookupServiceKey), item.LookupServiceKey);
439+
builder.AddAttribute(40, nameof(Display<string>.LookupServiceData), item.LookupServiceData);
440+
builder.AddAttribute(50, nameof(Display<string>.Lookup), item.Lookup);
441+
builder.AddAttribute(60, nameof(Display<string>.ShowLabelTooltip), item.ShowLabelTooltip);
438442
if (item is ITableColumn col)
439443
{
440444
if (col.Formatter != null)
@@ -524,7 +528,6 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co
524528
if (item.IsLookup() && item.Items == null)
525529
{
526530
builder.AddAttribute(110, nameof(Select<SelectedItem>.ShowSearch), item.ShowSearchWhenSelect);
527-
builder.AddAttribute(115, nameof(Select<SelectedItem>.Items), item.Lookup);
528531
builder.AddAttribute(120, nameof(Select<SelectedItem>.LookupService), lookupService);
529532
builder.AddAttribute(121, nameof(Select<SelectedItem>.LookupServiceKey), item.LookupServiceKey);
530533
builder.AddAttribute(122, nameof(Select<SelectedItem>.LookupServiceData), item.LookupServiceData);
@@ -638,7 +641,7 @@ private static Type GenerateComponentType(IEditorItem item)
638641
{
639642
ret = typeof(NullSwitch);
640643
}
641-
else if (fieldType.IsNumber())
644+
else if (fieldType.IsNumber() && NumberDecimalSeparator == ".")
642645
{
643646
ret = typeof(BootstrapInputNumber<>).MakeGenericType(fieldType);
644647
}

0 commit comments

Comments
 (0)