refactor: 重构过滤器

Author: ArgoZhang

src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs

@@ -18,19 +18,6 @@ public partial class BoolFilter
 
     private string? _value;
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        if (TableFilter != null)
-        {
-            TableFilter.ShowMoreButton = false;
-        }
-    }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs

@@ -64,19 +64,6 @@ public partial class MultiFilter
     [Parameter]
     public IEnumerable<SelectedItem>? Items { get; set; }
 
-    /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-
-        if (TableFilter != null)
-        {
-            TableFilter.ShowMoreButton = false;
-        }
-    }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs

@@ -8,24 +8,10 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// TableFilter 基类
+/// TableFilter component
 /// </summary>
 public partial class TableFilter : IFilter
 {
-    /// <summary>
-    /// 获得 过滤小图标样式
-    /// </summary>
-    private string? FilterClassString => CssBuilder.Default(Icon)
-        .AddClass("active", IsActive)
-        .Build();
-
-    /// <summary>
-    /// 获得 样式
-    /// </summary>
-    private string? ClassString => CssBuilder.Default("filter-icon")
-        .AddClassFromAttributes(AdditionalAttributes)
-        .Build();
-
     /// <summary>
     /// 获得/设置 是否 active
     /// </summary>
@@ -44,34 +30,11 @@ public partial class TableFilter : IFilter
     [Parameter]
     public string? NotSupportedMessage { get; set; }
 
-    /// <summary>
-    /// 获得/设置 相关 Field 字段名称
-    /// </summary>
-    [NotNull]
-    internal string? FieldKey { get; set; }
-
-    /// <summary>
-    /// 获得/设置 是否显示增加减少条件按钮
-    /// </summary>
-    public bool ShowMoreButton { get; set; } = true;
-
-    /// <summary>
-    /// 获得/设置 过滤条件 IFilterAction 接口
-    /// </summary>
-    [NotNull]
-    public IFilterAction? FilterAction { get; set; }
-
-    /// <summary>
-    /// 获得 当前过滤条件是否激活
-    /// </summary>
-    internal bool HasFilter => (Table != null) && Table.Filters.ContainsKey(Column.GetFieldName());
-
     /// <summary>
     /// 获得 相关联 ITableColumn 实例
     /// </summary>
     [Parameter]
     [NotNull]
-    [EditorRequired]
     public ITableColumn? Column { get; set; }
 
     /// <summary>
@@ -93,6 +56,33 @@ public partial class TableFilter : IFilter
     [NotNull]
     protected IStringLocalizer<TableFilter>? Localizer { get; set; }
 
+    /// <summary>
+    /// 获得 过滤小图标样式
+    /// </summary>
+    private string? FilterClassString => CssBuilder.Default(Icon)
+        .AddClass("active", IsActive)
+        .Build();
+
+    /// <summary>
+    /// 获得 样式
+    /// </summary>
+    private string? ClassString => CssBuilder.Default("filter-icon")
+        .AddClassFromAttributes(AdditionalAttributes)
+        .Build();
+
+    /// <summary>
+    /// 获得/设置 过滤条件 IFilterAction 接口
+    /// </summary>
+    [NotNull]
+    public IFilterAction? FilterAction { get; set; }
+
+    /// <summary>
+    /// 获得 当前过滤条件是否激活
+    /// </summary>
+    internal bool HasFilter => (Table != null) && Table.Filters.ContainsKey(Column.GetFieldName());
+
+    private string _fieldKey = "";
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -111,7 +101,7 @@ protected override void OnParametersSet()
         base.OnParametersSet();
 
         NotSupportedMessage ??= Localizer[nameof(NotSupportedMessage)];
-        FieldKey = Column.GetFieldName();
+        _fieldKey = Column.GetFieldName();
     }
 
     /// <summary>
@@ -137,11 +127,11 @@ internal async Task OnFilterAsync()
             var f = FilterAction.GetFilterConditions();
             if (f.Filters != null && f.Filters.Count > 0)
             {
-                Table.Filters[FieldKey] = FilterAction;
+                Table.Filters[_fieldKey] = FilterAction;
             }
             else
             {
-                Table.Filters.Remove(FieldKey);
+                Table.Filters.Remove(_fieldKey);
             }
             if (Table.OnFilterAsync != null)
             {