refactor: 代码重构

ArgoZhang · ArgoZhang · commit c0b415225ec2 · 2025-05-13T12:07:50.000+08:00
diff --git a/src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs
@@ -48,10 +48,10 @@ public override void Reset()
     /// <returns></returns>
     public override FilterKeyValueAction GetFilterConditions()
     {
-        var filter = new FilterKeyValueAction() { Filters = [] };
+        var filter = new FilterKeyValueAction { Filters = [] };
         if (!string.IsNullOrEmpty(_value))
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = _value == "true",
diff --git a/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs
@@ -6,7 +6,7 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+///
 /// </summary>
 public partial class DateTimeFilter
 {
@@ -85,7 +85,7 @@ public override FilterKeyValueAction GetFilterConditions()
 
         if (Count > 0 && _value2 != null)
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = _value2,
@@ -112,7 +112,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
         }
         _action1 = first.FilterAction;
 
-        if (filter.Filters != null && filter.Filters.Count == 2)
+        if (filter.Filters is { Count: 2 })
         {
             Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
diff --git a/src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs
@@ -103,7 +103,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
             _value = "";
         }
 
-        if (filter.Filters != null && filter.Filters.Count == 2)
+        if (filter.Filters is { Count: 2 })
         {
             Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
diff --git a/src/BootstrapBlazor/Components/Filters/FilterBase.cs b/src/BootstrapBlazor/Components/Filters/FilterBase.cs
@@ -8,57 +8,35 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+/// 过滤器基类
 /// </summary>
 public abstract class FilterBase : BootstrapModuleComponentBase, IFilterAction
 {
     /// <summary>
-    /// 
+    /// 获得/设置 <see cref="IStringLocalizer{TableFilter}"/> 实例
     /// </summary>
     [Inject]
     [NotNull]
     protected IStringLocalizer<TableFilter>? Localizer { get; set; }
 
     /// <summary>
-    /// 获得/设置 所属 TableFilter 实例
-    /// </summary>
-    [CascadingParameter, NotNull]
-    protected TableFilter? TableFilter { get; set; }
-
-    /// <summary>
-    /// 重置按钮文本
+    /// 获得/设置 相关 Field 字段名称
     /// </summary>
     [Parameter]
     [NotNull]
-    public string? ClearButtonText { get; set; }
+    public string? FieldKey { get; set; }
 
     /// <summary>
-    /// 过滤按钮文本
+    /// 获得/设置 是否为 HeaderRow 模式 默认 false
     /// </summary>
     [Parameter]
-    [NotNull]
-    public string? FilterButtonText { get; set; }
+    public bool IsHeaderRow { get; set; }
 
     /// <summary>
-    /// 获得/设置 Header 显示文字
-    /// </summary>
-    protected string? Title;
-
-    /// <summary>
-    /// 获得/设置 相关 Field 字段名称
-    /// </summary>
-    [NotNull]
-    protected string? FieldKey { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    protected FilterLogic Logic { get; set; }
-
-    /// <summary>
-    /// 获得/设置 是否为 HeaderRow 模式 默认 false
+    /// 获得/设置 所属 TableFilter 实例
     /// </summary>
-    protected bool IsHeaderRow => TableFilter.IsHeaderRow;
+    [CascadingParameter, NotNull]
+    protected TableFilter? TableFilter { get; set; }
 
     /// <summary>
     /// <inheritdoc/>
@@ -74,74 +52,16 @@ protected override void OnInitialized()
     }
 
     /// <summary>
-    /// <inheritdoc/>
-    /// </summary>
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
-
-        FilterButtonText ??= Localizer[nameof(FilterButtonText)];
-        ClearButtonText ??= Localizer[nameof(ClearButtonText)];
-
-        var column = TableFilter.Column;
-        if (column != null)
-        {
-            Title = column.GetDisplayName();
-            FieldKey = column.GetFieldName();
-        }
-    }
-
-    /// <summary>
-    /// 点击重置按钮时回调此方法
-    /// </summary>
-    /// <returns></returns>
-    protected async Task OnClickReset()
-    {
-        var table = TableFilter.Table;
-        if (table != null)
-        {
-            TableFilter.FilterAction.Reset();
-            table.Filters.Remove(FieldKey);
-
-            if (table.OnFilterAsync != null)
-            {
-                await table.OnFilterAsync();
-            }
-        }
-    }
-
-    /// <summary>
-    /// 点击确认时回调此方法
+    /// 过滤按钮回调方法
     /// </summary>
     /// <returns></returns>
-    protected async Task OnClickConfirm()
+    protected async Task OnFilterValueChanged()
     {
-        var table = TableFilter.Table;
-        if (table != null)
+        if (TableFilter != null)
         {
-            var f = GetFilterConditions();
-            if (f.Filters is { Count: > 0 })
-            {
-                table.Filters[FieldKey] = TableFilter.FilterAction;
-            }
-            else
-            {
-                table.Filters.Remove(FieldKey);
-            }
-            if (table.OnFilterAsync != null)
-            {
-                await table.OnFilterAsync();
-            }
+            await TableFilter.OnFilterAsync();
         }
-    }
 
-    /// <summary>
-    /// 过滤按钮回调方法
-    /// </summary>
-    /// <returns></returns>
-    protected async Task OnFilterValueChanged()
-    {
-        await TableFilter.OnFilterAsync();
         StateHasChanged();
     }
 
diff --git a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs
@@ -6,14 +6,14 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+/// Lookup 过滤器
 /// </summary>
 public partial class LookupFilter
 {
-    private Type _type = default!;
+    private Type _type = null!;
     private string? _value;
     private bool _isShowSearch;
-    private ILookup _lookup = default!;
+    private ILookup _lookup = null!;
 
     /// <summary>
     /// <inheritdoc/>
@@ -22,11 +22,13 @@ protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
-        var column = TableFilter.Column;
-
-        _isShowSearch = column.ShowSearchWhenSelect;
-        _type = column.PropertyType;
-        _lookup = column;
+        if (TableFilter != null)
+        {
+            var column = TableFilter.Column;
+            _isShowSearch = column.ShowSearchWhenSelect;
+            _type = column.PropertyType;
+            _lookup = column;
+        }
     }
 
     /// <summary>
@@ -44,12 +46,12 @@ public override void Reset()
     /// <returns></returns>
     public override FilterKeyValueAction GetFilterConditions()
     {
-        var filter = new FilterKeyValueAction() { Filters = [] };
+        var filter = new FilterKeyValueAction { Filters = [] };
         if (!string.IsNullOrEmpty(_value))
         {
             var type = Nullable.GetUnderlyingType(_type) ?? _type;
             var val = Convert.ChangeType(_value, type);
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = val,
diff --git a/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs
@@ -137,11 +137,11 @@ public override void Reset()
     /// <returns></returns>
     public override FilterKeyValueAction GetFilterConditions()
     {
-        var filter = new FilterKeyValueAction() { Filters = [], FilterLogic = FilterLogic.Or };
+        var filter = new FilterKeyValueAction{ Filters = [], FilterLogic = FilterLogic.Or };
 
         foreach (var item in GetItems().Where(i => i.Active))
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = item.Value,
diff --git a/src/BootstrapBlazor/Components/Filters/MultipleFilterBase.cs b/src/BootstrapBlazor/Components/Filters/MultipleFilterBase.cs
@@ -6,12 +6,17 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+/// 多条件过滤器基类
 /// </summary>
 public abstract class MultipleFilterBase : FilterBase
 {
     /// <summary>
     /// 获得/设置 条件数量
     /// </summary>
-    protected int Count { get; set; }
+    public int Count { get; set; }
+
+    /// <summary>
+    /// 获得/设置 多个条件逻辑关系符号
+    /// </summary>
+    protected FilterLogic Logic { get; set; }
 }
diff --git a/src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs
@@ -6,7 +6,7 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+///
 /// </summary>
 public partial class NumberFilter<TType>
 {
@@ -78,10 +78,10 @@ public override void Reset()
     /// <returns></returns>
     public override FilterKeyValueAction GetFilterConditions()
     {
-        var filter = new FilterKeyValueAction() { Filters = [] };
+        var filter = new FilterKeyValueAction { Filters = [] };
         if (_value1 != null)
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = _value1,
@@ -91,7 +91,7 @@ public override FilterKeyValueAction GetFilterConditions()
 
         if (Count > 0 && _value2 != null)
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = _value2,
@@ -118,7 +118,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
         }
         _action1 = first.FilterAction;
 
-        if (filter.Filters != null && filter.Filters.Count == 2)
+        if (filter.Filters is { Count: 2 })
         {
             Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
diff --git a/src/BootstrapBlazor/Components/Filters/StringFilter.razor b/src/BootstrapBlazor/Components/Filters/StringFilter.razor
@@ -10,7 +10,7 @@
 }
 else
 {
-    <Select Items="@Items" @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></Select>
+    <Select Items="@Items" @bind-Value="@_action1" ShowLabel="false" SkipValidate="true"></Select>
     <BootstrapInput @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></BootstrapInput>
     @if (Count > 0)
     {
diff --git a/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs
@@ -6,7 +6,7 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+///
 /// </summary>
 public partial class StringFilter
 {
@@ -81,10 +81,10 @@ public override void Reset()
     /// <returns></returns>
     public override FilterKeyValueAction GetFilterConditions()
     {
-        var filter = new FilterKeyValueAction() { Filters = [] };
+        var filter = new FilterKeyValueAction { Filters = [] };
         if (!string.IsNullOrEmpty(_value1))
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = _value1,
@@ -94,7 +94,7 @@ public override FilterKeyValueAction GetFilterConditions()
 
         if (Count > 0 && !string.IsNullOrEmpty(_value2))
         {
-            filter.Filters.Add(new FilterKeyValueAction()
+            filter.Filters.Add(new FilterKeyValueAction
             {
                 FieldKey = FieldKey,
                 FieldValue = _value2,
@@ -121,7 +121,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
         }
         _action1 = first.FilterAction;
 
-        if (filter.Filters != null && filter.Filters.Count == 2)
+        if (filter.Filters is { Count: 2 })
         {
             Count = 1;
             FilterKeyValueAction second = filter.Filters[1];
diff --git a/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor b/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor
@@ -1,5 +1,6 @@
 ﻿@namespace BootstrapBlazor.Components
 @inherits ComponentBase
+@typeparam TFilter
 
 @if (IsHeaderRow)
 {
diff --git a/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/TableColumnFilter.razor.cs
diff --git a/src/BootstrapBlazor/Components/Filters/TableFilter.razor b/src/BootstrapBlazor/Components/Filters/TableFilter.razor
diff --git a/src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/TableFilter.razor.cs

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ public override void Reset()`
`48`	`48`	`/// <returns></returns>`
`49`	`49`	`public override FilterKeyValueAction GetFilterConditions()`
`50`	`50`	`{`
`51`		`- var filter = new FilterKeyValueAction() { Filters = [] };`
	`51`	`+ var filter = new FilterKeyValueAction { Filters = [] };`
`52`	`52`	`if (!string.IsNullOrEmpty(_value))`
`53`	`53`	`{`
`54`		`- filter.Filters.Add(new FilterKeyValueAction()`
	`54`	`+ filter.Filters.Add(new FilterKeyValueAction`
`55`	`55`	`{`
`56`	`56`	`FieldKey = FieldKey,`
`57`	`57`	`FieldValue = _value == "true",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace BootstrapBlazor.Components;`
`7`	`7`
`8`	`8`	`/// <summary>`
`9`		`-///`
	`9`	`+///`
`10`	`10`	`/// </summary>`
`11`	`11`	`public partial class DateTimeFilter`
`12`	`12`	`{`
`@@ -85,7 +85,7 @@ public override FilterKeyValueAction GetFilterConditions()`
`85`	`85`
`86`	`86`	`if (Count > 0 && _value2 != null)`
`87`	`87`	`{`
`88`		`- filter.Filters.Add(new FilterKeyValueAction()`
	`88`	`+ filter.Filters.Add(new FilterKeyValueAction`
`89`	`89`	`{`
`90`	`90`	`FieldKey = FieldKey,`
`91`	`91`	`FieldValue = _value2,`
`@@ -112,7 +112,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)`
`112`	`112`	`}`
`113`	`113`	`_action1 = first.FilterAction;`
`114`	`114`
`115`		`- if (filter.Filters != null && filter.Filters.Count == 2)`
	`115`	`+ if (filter.Filters is { Count: 2 })`
`116`	`116`	`{`
`117`	`117`	`Count = 1;`
`118`	`118`	`FilterKeyValueAction second = filter.Filters[1];`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)`
`103`	`103`	`_value = "";`
`104`	`104`	`}`
`105`	`105`
`106`		`- if (filter.Filters != null && filter.Filters.Count == 2)`
	`106`	`+ if (filter.Filters is { Count: 2 })`
`107`	`107`	`{`
`108`	`108`	`Count = 1;`
`109`	`109`	`FilterKeyValueAction second = filter.Filters[1];`
Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,11 @@ public override void Reset()`
`137`	`137`	`/// <returns></returns>`
`138`	`138`	`public override FilterKeyValueAction GetFilterConditions()`
`139`	`139`	`{`
`140`		`- var filter = new FilterKeyValueAction() { Filters = [], FilterLogic = FilterLogic.Or };`
	`140`	`+ var filter = new FilterKeyValueAction{ Filters = [], FilterLogic = FilterLogic.Or };`
`141`	`141`
`142`	`142`	`foreach (var item in GetItems().Where(i => i.Active))`
`143`	`143`	`{`
`144`		`- filter.Filters.Add(new FilterKeyValueAction()`
	`144`	`+ filter.Filters.Add(new FilterKeyValueAction`
`145`	`145`	`{`
`146`	`146`	`FieldKey = FieldKey,`
`147`	`147`	`FieldValue = item.Value,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`else`
`12`	`12`	`{`
`13`		`- <Select Items="@Items" @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></Select>`
	`13`	`+ <Select Items="@Items" @bind-Value="@_action1" ShowLabel="false" SkipValidate="true"></Select>`
`14`	`14`	`<BootstrapInput @bind-Value="@_value1" ShowLabel="false" SkipValidate="true"></BootstrapInput>`
`15`	`15`	`@if (Count > 0)`
`16`	`16`	`{`