refactor: 重构方法名称

Author: ArgoZhang

src/BootstrapBlazor/Components/Filters/BoolFilter.razor

@@ -4,7 +4,7 @@
 @if (IsHeaderRow)
 {
     <Select Items="@Items" @bind-Value="@_value" ShowLabel="false" SkipValidate="true"
-            OnSelectedItemChanged="_ => OnFilterValueChanged()" IsPopover="true"></Select>
+            OnSelectedItemChanged="_ => OnFilterAsync()" IsPopover="true"></Select>
 }
 else
 {

src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor

@@ -4,9 +4,9 @@
 @if (IsHeaderRow)
 {
     <div class="@FilterRowClassString">
-        <DateTimePicker class="is-filter" @bind-Value="_value1" OnValueChanged="_ => OnFilterValueChanged()"
+        <DateTimePicker class="is-filter" @bind-Value="_value1" OnValueChanged="_ => OnFilterAsync()"
                         ShowLabel="false" SkipValidate="true"></DateTimePicker>
-        <FilterButton Items="Items" @bind-Value="_action1" OnSelectedItemChanged="_ => OnFilterValueChanged()" OnClearFilter="OnClearFilter" />
+        <FilterButton Items="Items" @bind-Value="_action1" OnSelectedItemChanged="_ => OnFilterAsync()" OnClearFilter="OnClearFilter"></FilterButton>
     </div>
 }
 else

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

@@ -16,7 +16,7 @@ public partial class DateTimeFilter
     private FilterAction _action2 = FilterAction.LessThanOrEqual;
 
     private string? FilterRowClassString => CssBuilder.Default("filter-row")
-        .AddClass("active", TableFilter.HasFilter())
+        .AddClass("active", TableColumnFilter.HasFilter())
         .Build();
 
     /// <summary>
@@ -43,15 +43,6 @@ protected override void OnParametersSet()
         ];
     }
 
-    private async Task OnClearFilter()
-    {
-        if (TableFilter != null)
-        {
-            Reset();
-            await TableFilter.OnFilterAsync();
-        }
-    }
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>

src/BootstrapBlazor/Components/Filters/EnumFilter.razor

@@ -3,12 +3,12 @@
 
 @if (IsHeaderRow)
 {
-    <Select Items="@Items" @bind-Value="@_value" ShowLabel="false" SkipValidate="true"
-            OnSelectedItemChanged="_ => OnFilterValueChanged()" IsPopover="true"></Select>
+    <Select Items="@Items" @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"
+            OnSelectedItemChanged="_ => OnFilterAsync()" IsPopover="true"></Select>
 }
 else
 {
-    <Select Items="@Items" @bind-Value="@_value" ShowLabel="false" SkipValidate="true"></Select>
+    <Select Items="@Items" @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></Select>
     @if (Count > 0)
     {
         <FilterLogicItem @bind-Logic="Logic"></FilterLogicItem>

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

@@ -29,7 +29,7 @@ public partial class EnumFilter
     [Parameter]
     public IEnumerable<SelectedItem>? Items { get; set; }
 
-    private string? _value;
+    private string? _value1;
     private string? _value2;
 
     /// <summary>
@@ -39,7 +39,7 @@ protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
-        Type ??= TableFilter?.Column.PropertyType;
+        Type ??= TableColumnFilter?.Column.PropertyType;
         if (Type == null) throw new InvalidOperationException("the Parameter Type must be set.");
 
         EnumType = Nullable.GetUnderlyingType(Type) ?? Type;
@@ -51,7 +51,7 @@ protected override void OnParametersSet()
     /// </summary>
     public override void Reset()
     {
-        _value = null;
+        _value1 = null;
         _value2 = null;
         Count = 0;
         StateHasChanged();
@@ -64,7 +64,7 @@ public override void Reset()
     public override FilterKeyValueAction GetFilterConditions()
     {
         var filter = new FilterKeyValueAction() { Filters = [] };
-        if (!string.IsNullOrEmpty(_value) && Enum.TryParse(EnumType, _value, out var val))
+        if (!string.IsNullOrEmpty(_value1) && Enum.TryParse(EnumType, _value1, out var val))
         {
             filter.Filters.Add(new FilterKeyValueAction()
             {
@@ -96,11 +96,11 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
         var type = Nullable.GetUnderlyingType(Type) ?? Type;
         if (first.FieldValue != null && first.FieldValue.GetType() == type)
         {
-            _value = first.FieldValue.ToString();
+            _value1 = first.FieldValue.ToString();
         }
         else
         {
-            _value = "";
+            _value1 = null;
         }
 
         if (filter.Filters is { Count: 2 })
@@ -113,7 +113,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
             }
             else
             {
-                _value2 = "";
+                _value2 = null;
             }
             Logic = filter.FilterLogic;
         }

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

@@ -93,9 +93,14 @@ protected override void OnParametersSet()
     /// 点击重置按钮时回调此方法
     /// </summary>
     /// <returns></returns>
-    protected void OnClickReset()
+    private async Task OnClickReset()
     {
-        TableColumnFilter?.Reset();
+        _count = 0;
+        if (TableColumnFilter != null)
+        {
+            await TableColumnFilter.Reset();
+        }
+        StateHasChanged();
     }
 
     /// <summary>

src/BootstrapBlazor/Components/Filters/FilterBase.cs

@@ -36,7 +36,7 @@ public abstract class FilterBase : BootstrapModuleComponentBase, IFilterAction
     /// 获得/设置 所属 TableFilter 实例
     /// </summary>
     [CascadingParameter, NotNull]
-    protected TableColumnFilter? TableFilter { get; set; }
+    protected TableColumnFilter? TableColumnFilter { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
@@ -45,21 +45,35 @@ protected override void OnInitialized()
     {
         base.OnInitialized();
 
-        if (TableFilter != null)
+        if (TableColumnFilter != null)
         {
-            TableFilter.FilterAction = this;
+            TableColumnFilter.FilterAction = this;
         }
     }
 
+    /// <summary>
+    /// 重置按钮回调方法
+    /// </summary>
+    /// <returns></returns>
+    protected virtual async Task OnClearFilter()
+    {
+        if (TableColumnFilter != null)
+        {
+            await TableColumnFilter.Reset();
+        }
+
+        StateHasChanged();
+    }
+
     /// <summary>
     /// 过滤按钮回调方法
     /// </summary>
     /// <returns></returns>
-    protected async Task OnFilterValueChanged()
+    protected virtual async Task OnFilterAsync()
     {
-        if (TableFilter != null)
+        if (TableColumnFilter != null)
         {
-            await TableFilter.OnFilterAsync();
+            await TableColumnFilter.OnFilterAsync();
         }
 
         StateHasChanged();
@@ -80,5 +94,5 @@ protected async Task OnFilterValueChanged()
     /// 设置过滤集合方法
     /// </summary>
     /// <param name="filter"></param>
-    public virtual Task SetFilterConditionsAsync(FilterKeyValueAction filter) => OnFilterValueChanged();
+    public virtual Task SetFilterConditionsAsync(FilterKeyValueAction filter) => OnFilterAsync();
 }

src/BootstrapBlazor/Components/Filters/IFilterAction.cs

@@ -13,6 +13,11 @@ namespace BootstrapBlazor.Components;
 [JsonDerivedType(typeof(SearchFilterAction))]
 public interface IFilterAction
 {
+    /// <summary>
+    /// 获得/设置 过滤器 Key 值
+    /// </summary>
+    public string? FieldKey { get; set; }
+
     /// <summary>
     /// 获得 IFilter 实例中的过滤条件集合
     /// </summary>

src/BootstrapBlazor/Components/Filters/LookupFilter.razor

@@ -7,7 +7,7 @@
             LookupService="@_lookup.LookupService" StringComparison="@_lookup.LookupStringComparison"
             LookupServiceKey="@_lookup.LookupServiceKey" LookupServiceData="@_lookup.LookupServiceData"
             @bind-Value="@_value" ShowSearch="@_isShowSearch"
-            OnSelectedItemChanged="_ => OnFilterValueChanged()" IsPopover="true"></Select>
+            OnSelectedItemChanged="_ => OnFilterAsync()" IsPopover="true"></Select>
 }
 else
 {

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

@@ -22,9 +22,9 @@ protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
-        if (TableFilter != null)
+        if (TableColumnFilter != null)
         {
-            var column = TableFilter.Column;
+            var column = TableColumnFilter.Column;
             _isShowSearch = column.ShowSearchWhenSelect;
             _type = column.PropertyType;
             _lookup = column;