Skip to content

Commit 98e6e9b

Browse files
ArgoZhangArgoZhang
committed
revert: 撤销更改结构
1 parent b70c99b commit 98e6e9b

3 files changed

Lines changed: 48 additions & 53 deletions

File tree

‎src/BootstrapBlazor.Server/Components/Components/CustomerFilter.razor‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
@inherits FilterBase
22

3-
<FilterProvider>
4-
@if (IsHeaderRow)
5-
{
3+
@if (IsHeaderRow)
4+
{
65

7-
}
8-
else
9-
{
10-
<Select Items="@_items" @bind-Value="@Value"></Select>
11-
}
12-
</FilterProvider>
6+
}
7+
else
8+
{
9+
<Select Items="@_items" @bind-Value="@Value"></Select>
10+
}

‎src/BootstrapBlazor/Components/Filters/FilterProvider.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ else
2525
</div>
2626
</div>
2727
}
28-

‎src/BootstrapBlazor/Components/Filters/MultiFilter.razor‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,47 @@
22
@inherits FilterBase
33
@attribute [BootstrapModuleAutoLoader("Filters/MultiFilter.razor.js", JSObjectReference = true)]
44

5-
<FilterProvider>
6-
@if (IsHeaderRow)
7-
{
5+
@if (IsHeaderRow)
6+
{
87

9-
}
10-
else
11-
{
12-
<div class="bb-multi-filter" id="@Id">
13-
@if (ShowSearch)
14-
{
15-
<BootstrapInput UseInputEvent="true" class="bb-multi-filter-search"
16-
Value="@_searchText" bind-value:event="oninput" IsAutoFocus="true"
17-
PlaceHolder="@SearchPlaceHolderText" IsSelectAllTextOnFocus="true"
18-
OnValueChanged="OnSearchValueChanged" ShowLabel="false" SkipValidate="true"></BootstrapInput>
19-
}
20-
<div class="bb-multi-filter-list">
21-
<div class="bb-multi-filter-header">
22-
<Checkbox Value="GetAllState()" ShowAfterLabel="true" ShowLabel="false" SkipValidate="true"
23-
DisplayText="@SelectAllText" OnStateChanged="@OnStateChanged" State="_selectAllState" />
24-
</div>
25-
<div class="bb-multi-filter-body scroll">
26-
@foreach (var item in GetItems())
27-
{
28-
<div class="bb-multi-filter-body-item">
29-
<Checkbox @bind-Value="@item.Active" ShowAfterLabel="true"
30-
ShowLabel="false" SkipValidate="true" DisplayText="@item.Text" />
31-
</div>
32-
}
33-
</div>
8+
}
9+
else
10+
{
11+
<div class="bb-multi-filter" id="@Id">
12+
@if (ShowSearch)
13+
{
14+
<BootstrapInput UseInputEvent="true" class="bb-multi-filter-search"
15+
Value="@_searchText" bind-value:event="oninput" IsAutoFocus="true"
16+
PlaceHolder="@SearchPlaceHolderText" IsSelectAllTextOnFocus="true"
17+
OnValueChanged="OnSearchValueChanged" ShowLabel="false" SkipValidate="true"></BootstrapInput>
18+
}
19+
<div class="bb-multi-filter-list">
20+
<div class="bb-multi-filter-header">
21+
<Checkbox Value="GetAllState()" ShowAfterLabel="true" ShowLabel="false" SkipValidate="true"
22+
DisplayText="@SelectAllText" OnStateChanged="@OnStateChanged" State="_selectAllState" />
23+
</div>
24+
<div class="bb-multi-filter-body scroll">
25+
@foreach (var item in GetItems())
26+
{
27+
<div class="bb-multi-filter-body-item">
28+
<Checkbox @bind-Value="@item.Active" ShowAfterLabel="true"
29+
ShowLabel="false" SkipValidate="true" DisplayText="@item.Text" />
30+
</div>
31+
}
3432
</div>
35-
@if (_source == null)
36-
{
37-
<div class="bb-multi-filter-loading">
38-
@if (LoadingTemplate != null)
39-
{
40-
@LoadingTemplate
41-
}
42-
else
43-
{
44-
<Spinner Color="Color.Primary" />
45-
}
46-
</div>
47-
}
4833
</div>
49-
}
50-
</FilterProvider>
34+
@if (_source == null)
35+
{
36+
<div class="bb-multi-filter-loading">
37+
@if (LoadingTemplate != null)
38+
{
39+
@LoadingTemplate
40+
}
41+
else
42+
{
43+
<Spinner Color="Color.Primary" />
44+
}
45+
</div>
46+
}
47+
</div>
48+
}

0 commit comments

Comments
 (0)