Skip to content

Commit ddc61cd

Browse files
feat(Collapse): redesign HeaderTemplate function (#6467)
* refactor: 更改 HeaderTemplate 模板 * doc: 更新示例 * chore: bump version 9.8.2-beta04 Co-Authored-By: 逆流的鱼 <[email protected]> --------- Co-authored-by: 逆流的鱼 <[email protected]>
1 parent e862e75 commit ddc61cd

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

src/BootstrapBlazor.Server/Components/Samples/Collapses.razor

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,7 @@
145145
<CollapseItems>
146146
<CollapseItem Text="@Localizer["Consistency"]">
147147
<HeaderTemplate>
148-
<div class="p-2">
149-
<Select Items="Items" @bind-Value="Value" IsPopover="true"></Select>
150-
</div>
148+
<Select Items="Items" @bind-Value="Value" IsPopover="true"></Select>
151149
</HeaderTemplate>
152150
<ChildContent>
153151
<div>@Localizer["ConsistencyItem1"]</div>
@@ -157,7 +155,7 @@
157155
</CollapseItem>
158156
<CollapseItem Text="@Localizer["Feedback"]">
159157
<HeaderTemplate>
160-
<div class="p-2">Header-Test</div>
158+
Header-Test
161159
</HeaderTemplate>
162160
<ChildContent>
163161
<div>@Localizer["FeedbackItem1"]</div>
@@ -166,7 +164,7 @@
166164
</CollapseItem>
167165
<CollapseItem Text="@Localizer["Controllability"]">
168166
<HeaderTemplate>
169-
<div class="p-2">Header-Test</div>
167+
Header-Test
170168
</HeaderTemplate>
171169
<ChildContent>
172170
<div>@Localizer["ControllabilityItem1"]</div>

src/BootstrapBlazor/BootstrapBlazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.8.2-beta03</Version>
4+
<Version>9.8.2-beta04</Version>
55
</PropertyGroup>
66

77
<ItemGroup>

src/BootstrapBlazor/Components/Collapse/Collapse.razor

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,23 @@
1010
{
1111
<div @key="item" class="@GetItemClassString(item)">
1212
<div class="@GetHeaderClassString(item)">
13-
@if (item.HeaderTemplate != null)
14-
{
15-
<div class="accordion-header-body">
16-
@item.HeaderTemplate
17-
</div>
18-
}
1913
<div class="@GetHeaderButtonClassString(item)"
2014
data-bs-toggle="collapse" data-bs-target="@GetTargetIdString(item)"
2115
aria-expanded="@(item.IsCollapsed ? "false" : "true")" @onclick="() => OnClickItem(item)">
22-
@if(!string.IsNullOrEmpty(item.Icon))
16+
@if (item.HeaderTemplate != null)
17+
{
18+
<div class="accordion-header-body">
19+
@item.HeaderTemplate
20+
</div>
21+
}
22+
else if(!string.IsNullOrEmpty(item.Icon))
2323
{
2424
<i class="@GetItemIconString(item)"></i>
2525
}
26-
<span>@item.Text</span>
26+
else
27+
{
28+
<span>@item.Text</span>
29+
}
2730
</div>
2831
</div>
2932
<div class="@GetClassString(item.IsCollapsed)" id="@GetTargetId(item)" data-bs-parent="@ParentIdString">

0 commit comments

Comments
 (0)