Skip to content

Commit 2fec2d0

Browse files
authored
feat(MultipleFilterBase): remove MultipleFilterBase use FilterBase (#6033)
* refactor(FilterProvider): refactoring to improve code readability * refactor: 移除 MultipleFilterBase 基类
1 parent 356f3b2 commit 2fec2d0

File tree

10 files changed

+23
-31
lines changed

10 files changed

+23
-31
lines changed

src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@namespace BootstrapBlazor.Components
2-
@inherits MultipleFilterBase
2+
@inherits FilterBase
33

44
@if (IsHeaderRow)
55
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace BootstrapBlazor.Components;
77

88
/// <summary>
9-
///
9+
/// DataTime filter component
1010
/// </summary>
1111
public partial class DateTimeFilter
1212
{

src/BootstrapBlazor/Components/Filters/EnumFilter.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@namespace BootstrapBlazor.Components
2-
@inherits MultipleFilterBase
2+
@inherits FilterBase
33

44
@if (IsHeaderRow)
55
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace BootstrapBlazor.Components;
77

88
/// <summary>
9-
/// 枚举类型过滤组件
9+
/// Enum filter component
1010
/// </summary>
1111
public partial class EnumFilter
1212
{

src/BootstrapBlazor/Components/Filters/FilterBase.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ public abstract class FilterBase : BootstrapModuleComponentBase, IFilterAction
3232
[Parameter]
3333
public bool IsHeaderRow { get; set; }
3434

35+
/// <summary>
36+
/// 获得/设置 条件数量
37+
/// </summary>
38+
[Parameter]
39+
public int Count { get; set; }
40+
41+
/// <summary>
42+
/// 获得/设置 多个条件逻辑关系符号
43+
/// </summary>
44+
protected FilterLogic Logic { get; set; }
45+
3546
/// <summary>
3647
/// 获得/设置 所属 TableFilter 实例
3748
/// </summary>
@@ -68,6 +79,7 @@ protected override void OnParametersSet()
6879
{
6980
FieldKey = FilterContext.FieldKey;
7081
IsHeaderRow = FilterContext.IsHeaderRow;
82+
Count = FilterContext.Count;
7183
}
7284
}
7385

src/BootstrapBlazor/Components/Filters/MultipleFilterBase.cs

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,11 @@
66
namespace BootstrapBlazor.Components;
77

88
/// <summary>
9-
/// 多条件过滤器基类
9+
/// Multiple filter base class
1010
/// </summary>
11+
[Obsolete("Deprecated. Please use FilterBase class. 已弃用 请使用 FilterBase 类")]
12+
[ExcludeFromCodeCoverage]
1113
public abstract class MultipleFilterBase : FilterBase
1214
{
13-
/// <summary>
14-
/// 获得/设置 条件数量
15-
/// </summary>
16-
[Parameter]
17-
public int Count { get; set; }
1815

19-
/// <summary>
20-
/// 获得/设置 多个条件逻辑关系符号
21-
/// </summary>
22-
protected FilterLogic Logic { get; set; }
23-
24-
/// <summary>
25-
/// <inheritdoc/>
26-
/// </summary>
27-
protected override void OnParametersSet()
28-
{
29-
base.OnParametersSet();
30-
31-
if (FilterContext != null)
32-
{
33-
Count = FilterContext.Count;
34-
}
35-
}
3616
}

src/BootstrapBlazor/Components/Filters/NumberFilter.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@namespace BootstrapBlazor.Components
22
@typeparam TType
3-
@inherits MultipleFilterBase
3+
@inherits FilterBase
44

55
@if (IsHeaderRow)
66
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace BootstrapBlazor.Components;
77

88
/// <summary>
9-
/// NumberFilter 组件
9+
/// NumberFilter component
1010
/// </summary>
1111
public partial class NumberFilter<TType>
1212
{

src/BootstrapBlazor/Components/Filters/StringFilter.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@namespace BootstrapBlazor.Components
2-
@inherits MultipleFilterBase
2+
@inherits FilterBase
33

44
@if (IsHeaderRow)
55
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace BootstrapBlazor.Components;
77

88
/// <summary>
9-
/// StringFilter 组件
9+
/// StringFilter component
1010
/// </summary>
1111
public partial class StringFilter
1212
{

0 commit comments

Comments
 (0)