Skip to content

feat(BootstrapInputNumber): support NumberDecimalSeparator setting #4983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 29, 2024
Merged

feat(BootstrapInputNumber): support NumberDecimalSeparator setting #4983

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7309a05
feat(GenerateComponentType)#4982-Numeric-type-rendered
densen2014 Dec 28, 2024
0dec74e
Revert "feat(GenerateComponentType)#4982-Numeric-type-rendered"
densen2014 Dec 28, 2024
8c3a5bb
feat(GenerateComponentType)#4982-Numeric-type-rendered
densen2014 Dec 28, 2024
f8801bc
Merge branch 'main' into alex/feat(GenerateComponentType)#4982-Numeri…
ArgoZhang Dec 29, 2024
41a6d31
refactor: 移动扩展方法
ArgoZhang Dec 29, 2024
a4cc93f
test: 增加单元测试
ArgoZhang Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/BootstrapBlazor/Utils/Utility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.Extensions.Localization;
using System.ComponentModel;
using System.Data;
using System.Globalization;
using System.Linq.Expressions;
using System.Reflection;

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

/// <summary>
/// 获得 当前输入语言小数点分隔符
/// </summary>
private static string NumberDecimalSeparator => CultureInfo.CurrentCulture?.NumberFormat?.NumberDecimalSeparator ?? ".";

/// <summary>
/// 获取 指定对象的属性值
/// </summary>
Expand Down Expand Up @@ -429,12 +435,10 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
builder.OpenComponent(0, typeof(Display<>).MakeGenericType(fieldType));
builder.AddAttribute(10, nameof(Display<string>.DisplayText), displayName);
builder.AddAttribute(20, nameof(Display<string>.Value), fieldValue);
builder.AddAttribute(30, nameof(Display<string>.Lookup), item.Lookup);
builder.AddAttribute(30, nameof(Display<string>.LookupService), item.LookupService);
builder.AddAttribute(40, nameof(Display<string>.LookupServiceKey), item.LookupServiceKey);
builder.AddAttribute(50, nameof(Display<string>.LookupServiceData), item.LookupServiceData);
builder.AddAttribute(60, nameof(Display<string>.LookupStringComparison), item.LookupStringComparison);
builder.AddAttribute(65, nameof(Display<string>.ShowLabelTooltip), item.ShowLabelTooltip);
builder.AddAttribute(30, nameof(Display<string>.LookupServiceKey), item.LookupServiceKey);
builder.AddAttribute(40, nameof(Display<string>.LookupServiceData), item.LookupServiceData);
builder.AddAttribute(50, nameof(Display<string>.Lookup), item.Lookup);
builder.AddAttribute(60, nameof(Display<string>.ShowLabelTooltip), item.ShowLabelTooltip);
if (item is ITableColumn col)
{
if (col.Formatter != null)
Expand Down Expand Up @@ -524,7 +528,6 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co
if (item.IsLookup() && item.Items == null)
{
builder.AddAttribute(110, nameof(Select<SelectedItem>.ShowSearch), item.ShowSearchWhenSelect);
builder.AddAttribute(115, nameof(Select<SelectedItem>.Items), item.Lookup);
builder.AddAttribute(120, nameof(Select<SelectedItem>.LookupService), lookupService);
builder.AddAttribute(121, nameof(Select<SelectedItem>.LookupServiceKey), item.LookupServiceKey);
builder.AddAttribute(122, nameof(Select<SelectedItem>.LookupServiceData), item.LookupServiceData);
Expand Down Expand Up @@ -638,7 +641,7 @@ private static Type GenerateComponentType(IEditorItem item)
{
ret = typeof(NullSwitch);
}
else if (fieldType.IsNumber())
else if (fieldType.IsNumber() && NumberDecimalSeparator == ".")
{
ret = typeof(BootstrapInputNumber<>).MakeGenericType(fieldType);
}
Expand Down
Loading