Skip to content

feat(MultipleFilterBase): remove MultipleFilterBase use FilterBase #6033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 16, 2025
Merged

feat(MultipleFilterBase): remove MultipleFilterBase use FilterBase #6033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8376d7
refactor(FilterProvider): refactoring to improve code readability
ArgoZhang May 16, 2025
4f7ad72
Merge branch 'main' into refactor-filter
ArgoZhang May 16, 2025
a7371bf
refactor: 移除 MultipleFilterBase 基类
ArgoZhang May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@namespace BootstrapBlazor.Components
@inherits MultipleFilterBase
@inherits FilterBase

@if (IsHeaderRow)
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace BootstrapBlazor.Components;

/// <summary>
///
/// DataTime filter component
Copy link
Contributor

@sourcery-ai sourcery-ai bot May 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (typo): Typo in summary: 'DataTime' should be 'DateTime'

Suggested change
/// DataTime filter component
/// DateTime filter component

/// </summary>
public partial class DateTimeFilter
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/EnumFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@namespace BootstrapBlazor.Components
@inherits MultipleFilterBase
@inherits FilterBase

@if (IsHeaderRow)
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace BootstrapBlazor.Components;

/// <summary>
/// 枚举类型过滤组件
/// Enum filter component
/// </summary>
public partial class EnumFilter
{
Expand Down
12 changes: 12 additions & 0 deletions src/BootstrapBlazor/Components/Filters/FilterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ public abstract class FilterBase : BootstrapModuleComponentBase, IFilterAction
[Parameter]
public bool IsHeaderRow { get; set; }

/// <summary>
/// 获得/设置 条件数量
/// </summary>
[Parameter]
public int Count { get; set; }

/// <summary>
/// 获得/设置 多个条件逻辑关系符号
/// </summary>
protected FilterLogic Logic { get; set; }

/// <summary>
/// 获得/设置 所属 TableFilter 实例
/// </summary>
Expand Down Expand Up @@ -68,6 +79,7 @@ protected override void OnParametersSet()
{
FieldKey = FilterContext.FieldKey;
IsHeaderRow = FilterContext.IsHeaderRow;
Count = FilterContext.Count;
}
}

Expand Down
26 changes: 3 additions & 23 deletions src/BootstrapBlazor/Components/Filters/MultipleFilterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,11 @@
namespace BootstrapBlazor.Components;

/// <summary>
/// 多条件过滤器基类
/// Multiple filter base class
/// </summary>
[Obsolete("Deprecated. Please use FilterBase class. 已弃用 请使用 FilterBase 类")]
[ExcludeFromCodeCoverage]
public abstract class MultipleFilterBase : FilterBase
{
/// <summary>
/// 获得/设置 条件数量
/// </summary>
[Parameter]
public int Count { get; set; }

/// <summary>
/// 获得/设置 多个条件逻辑关系符号
/// </summary>
protected FilterLogic Logic { get; set; }

/// <summary>
/// <inheritdoc/>
/// </summary>
protected override void OnParametersSet()
{
base.OnParametersSet();

if (FilterContext != null)
{
Count = FilterContext.Count;
}
}
}
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/NumberFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@namespace BootstrapBlazor.Components
@typeparam TType
@inherits MultipleFilterBase
@inherits FilterBase

@if (IsHeaderRow)
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace BootstrapBlazor.Components;

/// <summary>
/// NumberFilter 组件
/// NumberFilter component
/// </summary>
public partial class NumberFilter<TType>
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/StringFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@namespace BootstrapBlazor.Components
@inherits MultipleFilterBase
@inherits FilterBase

@if (IsHeaderRow)
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace BootstrapBlazor.Components;

/// <summary>
/// StringFilter 组件
/// StringFilter component
/// </summary>
public partial class StringFilter
{
Expand Down