feat: 支持 AddMultipleAttributes

dotnetcore · Feb 19, 2024 · 0e6d646 · 0e6d646
1 parent 0e56e40
commit 0e6d646
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs
@@ -128,7 +128,7 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu
     /// <summary>
     /// 获得/设置 组件自定义类型参数集合 默认为 null
     /// </summary>
-    IEnumerable<KeyValuePair<string, object>>? IEditorItem.ComponentParameters { get; set; }
+    IEnumerable<KeyValuePair<string, object?>>? IEditorItem.ComponentParameters { get; set; }
 
     /// <summary>
     /// 获得/设置 显示模板

diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs
@@ -128,7 +128,7 @@ public class EditorItem<TValue> : ComponentBase, IEditorItem
     /// 获得/设置 组件自定义类型参数集合 默认为 null
     /// </summary>
     [Parameter]
-    public IEnumerable<KeyValuePair<string, object>>? ComponentParameters { get; set; }
+    public IEnumerable<KeyValuePair<string, object?>>? ComponentParameters { get; set; }
 
     /// <summary>
     /// 获得/设置 placeholder 文本 默认为 null

diff --git a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs
@@ -83,7 +83,7 @@ public interface IEditorItem
     /// <summary>
     /// 获得/设置 组件自定义类型参数集合 默认为 null
     /// </summary>
-    IEnumerable<KeyValuePair<string, object>>? ComponentParameters { get; set; }
+    IEnumerable<KeyValuePair<string, object?>>? ComponentParameters { get; set; }
 
     /// <summary>
     /// 获得/设置 字典数据源 常用于外键自动转换为名称操作

diff --git a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
@@ -107,7 +107,7 @@ class InternalTableColumn(string fieldName, Type fieldType, string? fieldText =
     /// <summary>
     /// 获得/设置 组件自定义类型参数集合 默认为 null
     /// </summary>
-    public IEnumerable<KeyValuePair<string, object>>? ComponentParameters { get; set; }
+    public IEnumerable<KeyValuePair<string, object?>>? ComponentParameters { get; set; }
 
     /// <summary>
     /// 获得/设置 额外数据源一般用于下拉框或者 CheckboxList 这种需要额外配置数据源组件使用

diff --git a/src/BootstrapBlazor/Components/Table/TableColumn.cs b/src/BootstrapBlazor/Components/Table/TableColumn.cs
@@ -36,7 +36,7 @@ public class TableColumn<TItem, TType> : BootstrapComponentBase, ITableColumn
     /// 获得/设置 组件自定义类型参数集合 默认为 null
     /// </summary>
     [Parameter]
-    public IEnumerable<KeyValuePair<string, object>>? ComponentParameters { get; set; }
+    public IEnumerable<KeyValuePair<string, object?>>? ComponentParameters { get; set; }
 
     /// <summary>
     /// 获得/设置 绑定列类型

diff --git a/src/BootstrapBlazor/Utils/Utility.cs b/src/BootstrapBlazor/Utils/Utility.cs
@@ -384,6 +384,7 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
             {
                 builder.AddAttribute(5, "class", col.CssClass);
             }
+            builder.AddMultipleAttributes(6, item.ComponentParameters);
             builder.CloseComponent();
         }
         else if (item.ComponentType == typeof(Textarea))
@@ -399,12 +400,9 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
             }
             if (item is ITableColumn col)
             {
-                if (col.ComponentParameters != null)
-                {
-                    builder.AddMultipleAttributes(6, col.ComponentParameters);
-                }
-                builder.AddAttribute(7, "class", col.CssClass);
+                builder.AddAttribute(6, "class", col.CssClass);
             }
+            builder.AddMultipleAttributes(7, item.ComponentParameters);
             builder.CloseComponent();
         }
         else
@@ -426,6 +424,7 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
                 }
                 builder.AddAttribute(6, "class", col.CssClass);
             }
+            builder.AddMultipleAttributes(7, item.ComponentParameters);
             builder.CloseComponent();
         }
     }

diff --git a/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs b/test/UnitTest/Extensions/ITableColumnExtensionsTest.cs
@@ -43,7 +43,7 @@ public void CopyValue_Ok()
         var attr = new MockTableColumn("Name", typeof(string))
         {
             ComponentType = typeof(NullSwitch),
-            ComponentParameters = Enumerable.Empty<KeyValuePair<string, object>>(),
+            ComponentParameters = [],
             Editable = false,
             EditTemplate = new RenderFragment<object>(obj => builder => builder.AddContent(0, "test")),
             Items = new List<SelectedItem>(),

diff --git a/test/UnitTest/Misc/MockTableColumn.cs b/test/UnitTest/Misc/MockTableColumn.cs
@@ -86,7 +86,7 @@ internal class MockTableColumn : ITableColumn
 
     public Action<TableCellArgs>? OnCellRender { get; set; }
 
-    public IEnumerable<KeyValuePair<string, object>>? ComponentParameters { get; set; }
+    public IEnumerable<KeyValuePair<string, object?>>? ComponentParameters { get; set; }
 
     public string? PlaceHolder { get; set; }