From 43f0f16bb78fbc332b2596c8c17a55eee333cb4d Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 11:17:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E5=87=8F=E5=B0=91=E4=B8=80=E6=AC=A1=20new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Dynamic/DynamicObjectContext.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/Dynamic/DynamicObjectContext.cs b/src/BootstrapBlazor/Dynamic/DynamicObjectContext.cs index 881b46a34b7..0c53f21347e 100644 --- a/src/BootstrapBlazor/Dynamic/DynamicObjectContext.cs +++ b/src/BootstrapBlazor/Dynamic/DynamicObjectContext.cs @@ -45,13 +45,14 @@ public void AddAttribute(string columnName, Type attributeType, Type[] types, ob var attr = attributeType.GetConstructor(types); if (attr != null) { - var cab = new CustomAttributeBuilder(attr, constructorArgs, namedProperties: propertyInfos ?? [], propertyValues: propertyValues ?? []); - CustomerAttributeBuilderCache.AddOrUpdate(columnName, key => [cab], (key, builders) => + CustomerAttributeBuilderCache.AddOrUpdate(columnName, key => [CreateCustomAttributeBuilder()], (key, builders) => { - builders.Add(cab); + builders.Add(CreateCustomAttributeBuilder()); return builders; }); } + + CustomAttributeBuilder CreateCustomAttributeBuilder() => new(attr, constructorArgs, propertyInfos ?? [], propertyValues ?? []); } /// From 29d34767e34889298eca7ca66ad740de2d0447f4 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 11:17:27 +0800 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/DynamicObjectContextExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Extensions/DynamicObjectContextExtensions.cs b/src/BootstrapBlazor/Extensions/DynamicObjectContextExtensions.cs index 3cfa3f88a38..61c30de3589 100644 --- a/src/BootstrapBlazor/Extensions/DynamicObjectContextExtensions.cs +++ b/src/BootstrapBlazor/Extensions/DynamicObjectContextExtensions.cs @@ -67,7 +67,7 @@ public static void AddMultipleParameterAttribute(this DynamicObjectC propertyValues.Add(kv.Value); } } - context.AddAttribute(columnName, type, Type.EmptyTypes, Array.Empty(), propertyInfos.ToArray(), propertyValues.ToArray()); + context.AddAttribute(columnName, type, Type.EmptyTypes, [], [.. propertyInfos], [.. propertyValues]); } /// From 63f1955229d1fd13430a8cd9c2cbf1b3055bf587 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 11:17:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Table/TablesDynamic.razor | 5 ++--- .../Components/Samples/Table/TablesDynamic.razor.cs | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor index 3e4eff4fd47..ac6c1fcdff4 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor @@ -13,7 +13,7 @@ -
@((MarkupString)Localizer["TablesDynamicEditDescription"].Value)
@@ -47,5 +47,4 @@
- - + *@ diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor.cs index 44709f13f11..e284d952258 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor.cs @@ -51,25 +51,25 @@ private void CreateContext() { context.AddRequiredAttribute(nameof(Foo.DateTime)); // 使用 AutoGenerateColumnAttribute 设置显示名称示例 - context.AddAutoGenerateColumnAttribute(nameof(Foo.DateTime), new KeyValuePair[] { new(nameof(AutoGenerateColumnAttribute.Text), Localizer[nameof(Foo.DateTime)].Value) }); + context.AddAutoGenerateColumnAttribute(nameof(Foo.DateTime), new KeyValuePair[] { new(nameof(AutoGenerateColumnAttribute.Text), LocalizerFoo[nameof(Foo.DateTime)].Value) }); } else if (propertyName == nameof(Foo.Name)) { - context.AddRequiredAttribute(nameof(Foo.Name), Localizer["Name.Required"]); + context.AddRequiredAttribute(nameof(Foo.Name), LocalizerFoo["Name.Required"]); // 使用 Text 设置显示名称示例 - col.Text = Localizer[nameof(Foo.Name)]; + col.Text = LocalizerFoo[nameof(Foo.Name)]; } else if (propertyName == nameof(Foo.Count)) { context.AddRequiredAttribute(nameof(Foo.Count)); // 使用 DisplayNameAttribute 设置显示名称示例 - context.AddDisplayNameAttribute(nameof(Foo.Count), Localizer[nameof(Foo.Count)].Value); + context.AddDisplayNameAttribute(nameof(Foo.Count), LocalizerFoo[nameof(Foo.Count)].Value); } else if (propertyName == nameof(Foo.Complete)) { col.Filterable = true; // 使用 DisplayAttribute 设置显示名称示例 - context.AddDisplayAttribute(nameof(Foo.Complete), new KeyValuePair[] { new(nameof(DisplayAttribute.Name), Localizer[nameof(Foo.Complete)].Value) }); + context.AddDisplayAttribute(nameof(Foo.Complete), new KeyValuePair[] { new(nameof(DisplayAttribute.Name), LocalizerFoo[nameof(Foo.Complete)].Value) }); } else if (propertyName == nameof(Foo.Id)) { From cc573c075675f3817e610239d8077af67547e8bb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 12:54:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=E7=B2=BE=E7=AE=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Utils/EmitHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Utils/EmitHelper.cs b/src/BootstrapBlazor/Utils/EmitHelper.cs index 31498980d82..658aee95376 100644 --- a/src/BootstrapBlazor/Utils/EmitHelper.cs +++ b/src/BootstrapBlazor/Utils/EmitHelper.cs @@ -67,7 +67,7 @@ private static void CreateProperty(this TypeBuilder typeBuilder, string property propertyId.SetGetMethod(methodGetField); propertyId.SetSetMethod(methodSetField); - foreach (var cab in attributeBuilds ?? Enumerable.Empty()) + foreach (var cab in attributeBuilds ?? []) { propertyId.SetCustomAttribute(cab); } From 3c1f606b10c82ca7fd395ae01c7b2dcf9c5264a3 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 12:54:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=20Text=20=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs b/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs index ec98af44d11..4d1df8a63af 100644 --- a/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs +++ b/src/BootstrapBlazor/Dynamic/DataTableDynamicContext.cs @@ -164,7 +164,7 @@ private List InternalGetColumns() var ret = new List(); foreach (DataColumn col in DataTable.Columns) { - ret.Add(new InternalTableColumn(col.ColumnName, col.DataType, col.Caption)); + ret.Add(new InternalTableColumn(col.ColumnName, col.DataType)); } return ret; } From b1d4519c7046fda3fa9d3fea8a76353b28d1c3a4 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 12:55:49 +0800 Subject: [PATCH 6/7] chore: bump version 9.11.4 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 417a370ca4e..7ed5f9ec485 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.11.3-beta06 + 9.11.4 From 9dbfb9d881143b91a790488372394c24189b3337 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 21 Oct 2025 13:11:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/Table/TablesDynamic.razor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor index ac6c1fcdff4..136f9b7f60b 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesDynamic.razor @@ -13,7 +13,7 @@
-@*
@((MarkupString)Localizer["TablesDynamicEditDescription"].Value)
@@ -47,4 +47,3 @@
- *@