feat(AutoGenerateColumnAttribute): remove Required parameter (#5416)

* refactor: 支持 Required 设置

* test: 更新单元测试

* refactor: 代码格式化

* refactor: 重构代码

* refactor: 屏蔽 IsRequiredWhenAdd/IsRequiredWhenEdit 设置

* test: 更新单元测试

* chore: bump version 9.3.1-beta27

Co-Authored-By: cqths <[email protected]>

---------

Co-authored-by: cqths <[email protected]>

Author: ArgoZhang

src/BootstrapBlazor.Server/Data/Foo.cs

@@ -109,7 +109,7 @@ public class Foo
     /// Generate Foo class, random data
     /// </summary>
     /// <returns>返回一个Foo类的List，Return a List of Foo class</returns>
-    public static List<Foo> GenerateFoo(IStringLocalizer<Foo> localizer, int count = 80) => Enumerable.Range(1, count).Select(i => new Foo()
+    public static List<Foo> GenerateFoo(IStringLocalizer<Foo> localizer, int count = 80) => [.. Enumerable.Range(1, count).Select(i => new Foo()
     {
         Id = i,
         Name = localizer["Foo.Name", $"{i:d4}"],
@@ -119,7 +119,7 @@ public class Foo
         Complete = Random.Shared.Next(1, 100) > 50,
         Education = Random.Shared.Next(1, 100) > 50 ? EnumEducation.Primary : EnumEducation.Middle,
         ReadonlyColumn = Random.Shared.Next(10, 50)
-    }).ToList();
+    })];
 
     /// <summary>
     /// 生成 Foo 类 Hobbies 数据

src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs

@@ -81,20 +81,12 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu
         set => IsVisibleWhenEdit = value ?? true;
     }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public bool? Required { get; set; }
+    bool? IEditorItem.Required { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public bool? IsRequiredWhenAdd { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    public bool? IsRequiredWhenEdit { get; set; }
+    bool? ITableColumn.IsRequiredWhenAdd { get; set; }
+
+    bool? ITableColumn.IsRequiredWhenEdit { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
@@ -109,7 +101,7 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu
     bool? IEditorItem.ShowLabelTooltip
     {
         get => ShowLabelTooltip;
-        set => ShowLabelTooltip = value.HasValue && value.Value;
+        set => ShowLabelTooltip = value ?? false;
     }
 
     /// <summary>

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.3.1-beta26</Version>
+    <Version>9.3.1-beta27</Version>
   </PropertyGroup>
 
   <ItemGroup>

test/UnitTest/Attributes/AutoGenerateClassTest.cs

@@ -70,10 +70,7 @@ public void AutoGenerateColumn_Ok()
             HeaderTextWrap = true,
             IsMarkupString = true,
 
-            Required = true,
-            RequiredErrorMessage = "test",
-            IsRequiredWhenAdd = true,
-            IsRequiredWhenEdit = true
+            RequiredErrorMessage = "test"
         };
         Assert.Equal(1, attr.Order);
         Assert.True(attr.Ignore);
@@ -201,6 +198,11 @@ public void AutoGenerateColumn_Ok()
         attrInterface.ToolboxTemplate = col => builder => builder.AddContent(0, "test");
         Assert.NotNull(attrInterface.ToolboxTemplate);
 
+        attrInterface.IsRequiredWhenAdd = true;
+        Assert.True(attrInterface.IsRequiredWhenAdd);
+        attrInterface.IsRequiredWhenEdit = true;
+        Assert.True(attrInterface.IsRequiredWhenEdit);
+
         var attrEditor = (IEditorItem)attr;
         attrEditor.Items = null;
         Assert.Null(attrEditor.Items);
@@ -226,13 +228,13 @@ public void AutoGenerateColumn_Ok()
         attrEditor.LookupService = new LookupService();
         Assert.NotNull(attrEditor.LookupService);
 
+        attrEditor.Required = true;
+        Assert.True(attrEditor.Required);
+
         // 增加 GetDisplay 单元覆盖率
         attr.Text = null;
         Assert.Equal(string.Empty, attr.GetDisplayName());
 
-        Assert.True(attr.Required);
-        Assert.True(attr.IsRequiredWhenEdit);
-        Assert.True(attr.IsRequiredWhenAdd);
         Assert.Equal("test", attr.RequiredErrorMessage);
     }