diff --git a/src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs index aefcfb005c8..f004afa1447 100644 --- a/src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs @@ -21,8 +21,7 @@ public partial class BoolFilter private string _value = ""; /// - /// - /// + /// /// protected override void OnParametersSet() { @@ -37,8 +36,7 @@ protected override void OnParametersSet() } /// - /// - /// + /// /// public override void Reset() { @@ -47,8 +45,7 @@ public override void Reset() } /// - /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -66,8 +63,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) { diff --git a/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs index 740b5dd7fb2..f22d2b78845 100644 --- a/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs @@ -28,8 +28,7 @@ public partial class DateTimeFilter public IEnumerable? Items { get; set; } /// - /// - /// + /// /// protected override void OnParametersSet() { @@ -47,8 +46,7 @@ protected override void OnParametersSet() } /// - /// - /// + /// /// public override void Reset() { @@ -62,8 +60,7 @@ public override void Reset() } /// - /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -92,8 +89,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) { diff --git a/src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs index 0ee95f9e122..213f7d3d515 100644 --- a/src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs @@ -47,7 +47,7 @@ protected override void OnParametersSet() } /// - /// + /// /// public override void Reset() { @@ -58,7 +58,7 @@ public override void Reset() } /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -87,7 +87,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) { diff --git a/src/BootstrapBlazor/Components/Filters/FilterBase.cs b/src/BootstrapBlazor/Components/Filters/FilterBase.cs index 1400d52c8f1..052d648f4c6 100644 --- a/src/BootstrapBlazor/Components/Filters/FilterBase.cs +++ b/src/BootstrapBlazor/Components/Filters/FilterBase.cs @@ -120,20 +120,17 @@ protected virtual async Task OnFilterAsync() } /// - /// 重置过滤条件方法 - /// Reset Filter Conditions Method + /// /// public abstract void Reset(); /// - /// 获得过滤窗口的所有条件的方法 - /// Gets all filter conditions + /// /// public abstract FilterKeyValueAction GetFilterConditions(); /// - /// 设置过滤集合的方法 - /// Sets the filter collection + /// /// /// public virtual Task SetFilterConditionsAsync(FilterKeyValueAction filter) => OnFilterAsync(); diff --git a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs index 2fde7c2049b..b15d4bdd759 100644 --- a/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs @@ -46,7 +46,7 @@ protected override async Task OnParametersSetAsync() } /// - /// + /// /// public override void Reset() { @@ -55,7 +55,7 @@ public override void Reset() } /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -75,7 +75,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) { diff --git a/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs index f2fa989f01a..8a6b589999f 100644 --- a/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs @@ -208,8 +208,7 @@ private Task OnSearchValueChanged(string? val) private List GetItems() => _items ?? _source ?? []; /// - /// 重置过滤条件方法 - /// Reset Filter Conditions Method + /// /// public override void Reset() { @@ -226,8 +225,7 @@ public override void Reset() } /// - /// 生成过滤条件方法 - /// Generate Filter Conditions Method + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -245,7 +243,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// + /// /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) diff --git a/src/BootstrapBlazor/Components/Filters/MultiSelectFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/MultiSelectFilter.razor.cs index 3ea08827348..ee3a0e35325 100644 --- a/src/BootstrapBlazor/Components/Filters/MultiSelectFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/MultiSelectFilter.razor.cs @@ -26,7 +26,7 @@ public partial class MultiSelectFilter public List? Items { get; set; } /// - /// + /// /// public override void Reset() { @@ -37,7 +37,7 @@ public override void Reset() } /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -71,7 +71,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) { diff --git a/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs index 35e17bcbd98..5b321154a75 100644 --- a/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs @@ -30,18 +30,18 @@ protected override void OnParametersSet() } /// - /// + /// /// - public override FilterKeyValueAction GetFilterConditions() + public override void Reset() { - return new(); + } /// - /// + /// /// - public override void Reset() + public override FilterKeyValueAction GetFilterConditions() { - + return new(); } } diff --git a/src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs index f84f596f1d1..22690f3e35a 100644 --- a/src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs @@ -48,7 +48,7 @@ protected override void OnParametersSet() } /// - /// + /// /// public override void Reset() { @@ -62,7 +62,7 @@ public override void Reset() } /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -91,7 +91,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) { diff --git a/src/BootstrapBlazor/Components/Filters/SearchFilterAction.cs b/src/BootstrapBlazor/Components/Filters/SearchFilterAction.cs index cfdf1967814..1adebc6f6fa 100644 --- a/src/BootstrapBlazor/Components/Filters/SearchFilterAction.cs +++ b/src/BootstrapBlazor/Components/Filters/SearchFilterAction.cs @@ -33,8 +33,7 @@ public class SearchFilterAction(string name, object? value, FilterAction action public FilterAction Action { get; set; } = action; /// - /// 重置过滤条件方法 - /// Resets filter conditions + /// /// public void Reset() { @@ -42,8 +41,17 @@ public void Reset() } /// - /// 设置过滤条件方法 - /// Sets filter conditions + /// + /// + public virtual FilterKeyValueAction GetFilterConditions() => new() + { + FieldKey = Name, + FieldValue = Value, + FilterAction = Action, + }; + + /// + /// /// /// public Task SetFilterConditionsAsync(FilterKeyValueAction filter) @@ -55,15 +63,4 @@ public Task SetFilterConditionsAsync(FilterKeyValueAction filter) } return Task.CompletedTask; } - - /// - /// 获得 所有过滤条件集合 - /// Gets all filter conditions - /// - public virtual FilterKeyValueAction GetFilterConditions() => new() - { - FieldKey = Name, - FieldValue = Value, - FilterAction = Action, - }; } diff --git a/src/BootstrapBlazor/Components/Filters/SerializeFilterAction.cs b/src/BootstrapBlazor/Components/Filters/SerializeFilterAction.cs index 8a8183cff48..f974a8e87c8 100644 --- a/src/BootstrapBlazor/Components/Filters/SerializeFilterAction.cs +++ b/src/BootstrapBlazor/Components/Filters/SerializeFilterAction.cs @@ -18,8 +18,7 @@ public sealed class SerializeFilterAction : IFilterAction public FilterKeyValueAction? Filter { get; set; } /// - /// 重置过滤条件方法 - /// Resets filter conditions + /// /// public void Reset() { @@ -27,8 +26,12 @@ public void Reset() } /// - /// 设置过滤条件方法 - /// Sets filter conditions + /// + /// + public FilterKeyValueAction GetFilterConditions() => Filter ?? new(); + + /// + /// /// /// public Task SetFilterConditionsAsync(FilterKeyValueAction filter) @@ -36,10 +39,4 @@ public Task SetFilterConditionsAsync(FilterKeyValueAction filter) Filter = filter; return Task.CompletedTask; } - - /// - /// 获得 所有过滤条件集合 - /// Gets all filter conditions - /// - public FilterKeyValueAction GetFilterConditions() => Filter ?? new(); } diff --git a/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs b/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs index f4ff992c9d1..f64fc977b59 100644 --- a/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs +++ b/src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs @@ -54,7 +54,7 @@ protected override void OnParametersSet() } /// - /// + /// /// public override void Reset() { @@ -68,7 +68,7 @@ public override void Reset() } /// - /// + /// /// public override FilterKeyValueAction GetFilterConditions() { @@ -97,7 +97,7 @@ public override FilterKeyValueAction GetFilterConditions() } /// - /// + /// /// public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter) {