Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions src/BootstrapBlazor/Components/Filters/BoolFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public partial class BoolFilter
private string _value = "";

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc/>
/// </summary>
protected override void OnParametersSet()
{
Expand All @@ -37,8 +36,7 @@ protected override void OnParametersSet()
}

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -47,8 +45,7 @@ public override void Reset()
}

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand All @@ -66,8 +63,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down
12 changes: 4 additions & 8 deletions src/BootstrapBlazor/Components/Filters/DateTimeFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public partial class DateTimeFilter
public IEnumerable<SelectedItem>? Items { get; set; }

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc/>
/// </summary>
protected override void OnParametersSet()
{
Expand All @@ -47,8 +46,7 @@ protected override void OnParametersSet()
}

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -62,8 +60,7 @@ public override void Reset()
}

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand Down Expand Up @@ -92,8 +89,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <para lang="zh"><inheritdoc/></para>
/// <para lang="en"><inheritdoc/></para>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/Components/Filters/EnumFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected override void OnParametersSet()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -58,7 +58,7 @@ public override void Reset()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand Down Expand Up @@ -87,7 +87,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down
9 changes: 3 additions & 6 deletions src/BootstrapBlazor/Components/Filters/FilterBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,17 @@ protected virtual async Task OnFilterAsync()
}

/// <summary>
/// <para lang="zh">重置过滤条件方法</para>
/// <para lang="en">Reset Filter Conditions Method</para>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public abstract void Reset();

/// <summary>
/// <para lang="zh">获得过滤窗口的所有条件的方法</para>
/// <para lang="en">Gets all filter conditions</para>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public abstract FilterKeyValueAction GetFilterConditions();

/// <summary>
/// <para lang="zh">设置过滤集合的方法</para>
/// <para lang="en">Sets the filter collection</para>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
/// <param name="filter"></param>
public virtual Task SetFilterConditionsAsync(FilterKeyValueAction filter) => OnFilterAsync();
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/Components/Filters/LookupFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected override async Task OnParametersSetAsync()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -55,7 +55,7 @@ public override void Reset()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand All @@ -75,7 +75,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down
8 changes: 3 additions & 5 deletions src/BootstrapBlazor/Components/Filters/MultiFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,7 @@ private Task OnSearchValueChanged(string? val)
private List<SelectedItem> GetItems() => _items ?? _source ?? [];

/// <summary>
/// <para lang="zh">重置过滤条件方法</para>
/// <para lang="en">Reset Filter Conditions Method</para>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -226,8 +225,7 @@ public override void Reset()
}

/// <summary>
/// <para lang="zh">生成过滤条件方法</para>
/// <para lang="en">Generate Filter Conditions Method</para>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand All @@ -245,7 +243,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
/// <param name="filter"></param>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public partial class MultiSelectFilter<TType>
public List<SelectedItem>? Items { get; set; }

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -37,7 +37,7 @@ public override void Reset()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand Down Expand Up @@ -71,7 +71,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down
12 changes: 6 additions & 6 deletions src/BootstrapBlazor/Components/Filters/NotSupportFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ protected override void OnParametersSet()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
public override void Reset()
{
return new();

}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override void Reset()
public override FilterKeyValueAction GetFilterConditions()
{

return new();
}
}
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/Components/Filters/NumberFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected override void OnParametersSet()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -62,7 +62,7 @@ public override void Reset()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand Down Expand Up @@ -91,7 +91,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down
27 changes: 12 additions & 15 deletions src/BootstrapBlazor/Components/Filters/SearchFilterAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,25 @@ public class SearchFilterAction(string name, object? value, FilterAction action
public FilterAction Action { get; set; } = action;

/// <summary>
/// <para lang="zh">重置过滤条件方法</para>
/// <para lang="en">Resets filter conditions</para>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public void Reset()
{
Value = null;
}

/// <summary>
/// <para lang="zh">设置过滤条件方法</para>
/// <para lang="en">Sets filter conditions</para>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public virtual FilterKeyValueAction GetFilterConditions() => new()
{
FieldKey = Name,
FieldValue = Value,
FilterAction = Action,
};

/// <summary>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
/// <param name="filter"></param>
public Task SetFilterConditionsAsync(FilterKeyValueAction filter)
Expand All @@ -55,15 +63,4 @@ public Task SetFilterConditionsAsync(FilterKeyValueAction filter)
}
return Task.CompletedTask;
}

/// <summary>
/// <para lang="zh">获得 所有过滤条件集合</para>
/// <para lang="en">Gets all filter conditions</para>
/// </summary>
public virtual FilterKeyValueAction GetFilterConditions() => new()
{
FieldKey = Name,
FieldValue = Value,
FilterAction = Action,
};
}
17 changes: 7 additions & 10 deletions src/BootstrapBlazor/Components/Filters/SerializeFilterAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,25 @@ public sealed class SerializeFilterAction : IFilterAction
public FilterKeyValueAction? Filter { get; set; }

/// <summary>
/// <para lang="zh">重置过滤条件方法</para>
/// <para lang="en">Resets filter conditions</para>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public void Reset()
{
Filter = new();
}

/// <summary>
/// <para lang="zh">设置过滤条件方法</para>
/// <para lang="en">Sets filter conditions</para>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public FilterKeyValueAction GetFilterConditions() => Filter ?? new();

/// <summary>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
/// <param name="filter"></param>
public Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Filter = filter;
return Task.CompletedTask;
}

/// <summary>
/// <para lang="zh">获得 所有过滤条件集合</para>
/// <para lang="en">Gets all filter conditions</para>
/// </summary>
public FilterKeyValueAction GetFilterConditions() => Filter ?? new();
}
6 changes: 3 additions & 3 deletions src/BootstrapBlazor/Components/Filters/StringFilter.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected override void OnParametersSet()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.Reset"/>
/// </summary>
public override void Reset()
{
Expand All @@ -68,7 +68,7 @@ public override void Reset()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.GetFilterConditions"/>
/// </summary>
public override FilterKeyValueAction GetFilterConditions()
{
Expand Down Expand Up @@ -97,7 +97,7 @@ public override FilterKeyValueAction GetFilterConditions()
}

/// <summary>
/// <inheritdoc/>
/// <inheritdoc cref="IFilterAction.SetFilterConditionsAsync(FilterKeyValueAction)"/>
/// </summary>
public override async Task SetFilterConditionsAsync(FilterKeyValueAction filter)
{
Expand Down