feat(IEditor): add Cols parameter (#5778)

* doc: 更新 DemoTableEditTemplate 逻辑

* feat: 增加 Cols 参数

* test: 更新单元测试

* refactor: IsCheckBoxList 公开化

* refactor: 重构自动判定列宽逻辑

* refactor: 重构代码

* test: 更新单元测试

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Components/DemoTableEditTemplate.razor

@@ -4,36 +4,18 @@
 
 <div class="row form-inline g-3">
     <div class="col-12 col-sm-6">
-        <BootstrapInput @bind-Value="Model.Name" />
+        <BootstrapInput @bind-Value="Model.Name"></BootstrapInput>
     </div>
     <div class="col-12 col-sm-6">
-        <MultiSelect @bind-Value="@Model.Hobby" Items="Hobbies" />
+        <MultiSelect @bind-Value="@Model.Hobby" Items="Hobbies"></MultiSelect>
     </div>
     <div class="col-12">
-        <Textarea @bind-Value="Model.Address" rows="3"/>
+        <Textarea @bind-Value="Model.Address" rows="3"></Textarea>
     </div>
     <div class="col-12 col-sm-6">
-        <Select @bind-Value="Model.Education" />
+        <Select @bind-Value="Model.Education"></Select>
     </div>
     <div class="col-12 col-sm-6">
-        <Display Value="@EducationDesc" ShowLabel="true" DisplayText="@Localizer["TablesEditTemplateDisplayLabel"]" />
+        <Display Value="@EducationDesc" ShowLabel="true" DisplayText="@Localizer["TablesEditTemplateDisplayLabel"]"></Display>
     </div>
 </div>
-
-@code {
-    [Parameter]
-    [NotNull]
-    public Foo? Model { get; set; }
-
-    private IEnumerable<SelectedItem>? Hobbies { get; set; }
-
-    private string? EducationDesc => Model.Education == EnumEducation.Primary ? Localizer["TablesEditTemplateDisplayDetail1"] : Localizer["TablesEditTemplateDisplayDetail2"];
-
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        Hobbies = Foo.GenerateHobbies(LocalizerFoo);
-    }
-}

src/BootstrapBlazor.Server/Components/Components/DemoTableEditTemplate.razor.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Components;
+
+/// <summary>
+/// DemoTableEditTemplate component
+/// </summary>
+public partial class DemoTableEditTemplate
+{
+    /// <summary>
+    /// Gets or sets the Foo instance.
+    /// </summary>
+    [Parameter]
+    [NotNull]
+    public Foo? Model { get; set; }
+
+    private IEnumerable<SelectedItem>? Hobbies { get; set; }
+
+    private string? EducationDesc => Model.Education switch
+    {
+        EnumEducation.Primary => Localizer["TablesEditTemplateDisplayDetail1"],
+        EnumEducation.Middle => Localizer["TablesEditTemplateDisplayDetail2"],
+        _ => ""
+    };
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override void OnInitialized()
+    {
+        Hobbies = Foo.GenerateHobbies(LocalizerFoo);
+    }
+}

src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs

@@ -27,19 +27,15 @@ public partial class EditorForm<TModel> : IShowLabel
     /// <returns></returns>
     private string? GetCssString(IEditorItem item)
     {
-        int cols = 0;
+        int cols = Math.Max(0, Math.Min(12, item.Cols));
         double mdCols = 6;
-        if (item is AutoGenerateColumnAttribute a && a.Cols > 0 && a.Cols < 13)
-        {
-            cols = a.Cols;
-        }
         if (ItemsPerRow.HasValue)
         {
-            mdCols = Math.Min(12, Math.Ceiling(12d / ItemsPerRow.Value));
+            mdCols = Math.Max(0, Math.Min(12, Math.Ceiling(12d / ItemsPerRow.Value)));
         }
         return CssBuilder.Default("col-12")
             .AddClass($"col-sm-{cols}", cols > 0) // 指定 Cols
-            .AddClass($"col-sm-6 col-md-{mdCols}", mdCols < 12 && cols == 0 && item.Items == null && item.Rows == 0) // 指定 ItemsPerRow
+            .AddClass($"col-sm-6 col-md-{mdCols}", mdCols > 0 && cols == 0 && item.Rows == 0 && !Utility.IsCheckboxList(item.PropertyType, item.ComponentType)) // 指定 ItemsPerRow
             .Build();
     }
 

src/BootstrapBlazor/Components/EditorForm/EditorItem.cs

@@ -99,6 +99,12 @@ public class EditorItem<TModel, TValue> : ComponentBase, IEditorItem
     [Parameter]
     public int Rows { get; set; }
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    [Parameter]
+    public int Cols { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs

@@ -66,6 +66,11 @@ public interface IEditorItem : ILookup
     /// </summary>
     int Rows { get; set; }
 
+    /// <summary>
+    /// Gets or sets the field expand columns. Default is 0.
+    /// </summary>
+    int Cols { get; set; }
+
     /// <summary>
     /// Gets or sets the edit template.
     /// </summary>

src/BootstrapBlazor/Components/Table/InternalTableColumn.cs

@@ -183,6 +183,11 @@ class InternalTableColumn(string fieldName, Type fieldType, string? fieldText =
     /// </summary>
     public int Rows { get; set; }
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public int Cols { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Table/TableColumn.cs

@@ -112,13 +112,19 @@ public class TableColumn<TItem, TType> : BootstrapComponentBase, ITableColumn
     public string? Step { get; set; }
 
     /// <summary>
-    /// 获得/设置 Textarea 行数 默认为 0
+    /// <inheritdoc/>
     /// </summary>
     [Parameter]
     public int Rows { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否为默认排序规则 默认为 SortOrder.Unset
+    /// <inheritdoc/>
+    /// </summary>
+    [Parameter]
+    public int Cols { get; set; }
+
+    /// <summary>
+    /// <inheritdoc/>
     /// </summary>
     [Parameter]
     public SortOrder DefaultSortOrder { get; set; }

src/BootstrapBlazor/Extensions/ITableColumnExtensions.cs

@@ -53,6 +53,7 @@ public static void CopyValue(this ITableColumn dest, IEditorItem source)
         if (source.LookupService != null) dest.LookupService = source.LookupService;
         if (source.Readonly.HasValue) dest.Readonly = source.Readonly;
         if (source.Rows > 0) dest.Rows = source.Rows;
+        if (source.Cols > 0) dest.Cols = source.Cols;
         if (source.SkipValidate) dest.SkipValidate = source.SkipValidate;
         if (!string.IsNullOrEmpty(source.Text)) dest.Text = source.Text;
         if (source.ValidateRules != null) dest.ValidateRules = source.ValidateRules;

src/BootstrapBlazor/Utils/Utility.cs

@@ -574,12 +574,12 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co
         return ret;
     }
 
-    private static List<SelectedItem> Clone(this IEnumerable<SelectedItem> source) => source.Select(d => new SelectedItem(d.Value, d.Text)
+    private static List<SelectedItem> Clone(this IEnumerable<SelectedItem> source) => [.. source.Select(d => new SelectedItem(d.Value, d.Text)
     {
         Active = d.Active,
         IsDisabled = d.IsDisabled,
         GroupName = d.GroupName
-    }).ToList();
+    })];
 
     private static object? GenerateValue(object model, string fieldName) => GetPropertyValue<object, object?>(model, fieldName);
 
@@ -671,7 +671,7 @@ private static Type GenerateComponentType(IEditorItem item)
     /// <param name="fieldType"></param>
     /// <param name="componentType">组件类型</param>
     /// <returns></returns>
-    private static bool IsCheckboxList(Type fieldType, Type? componentType = null)
+    public static bool IsCheckboxList(Type fieldType, Type? componentType = null)
     {
         var ret = false;
         if (componentType != null)

test/UnitTest/Attributes/AutoGenerateClassTest.cs

@@ -59,6 +59,7 @@ public void AutoGenerateColumn_Ok()
             ComponentType = typeof(Select<string>),
             Step = "1",
             Rows = 1,
+            Cols = 6,
             LookupStringComparison = StringComparison.Ordinal,
             LookupServiceKey = "test-lookup",
             LookupServiceData = true,
@@ -93,6 +94,7 @@ public void AutoGenerateColumn_Ok()
         Assert.Equal(typeof(Select<string>), attr.ComponentType);
         Assert.Equal("1", attr.Step);
         Assert.Equal(1, attr.Rows);
+        Assert.Equal(6, attr.Cols);
         Assert.Equal(StringComparison.Ordinal, attr.LookupStringComparison);
         Assert.Equal("Test", attr.GroupName);
         Assert.Equal(1, attr.GroupOrder);