Skip to content

feat(Collapse): redesign HeaderTemplate function #6467

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 4 commits into from
Jul 22, 2025
Merged

feat(Collapse): redesign HeaderTemplate function #6467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ca299c
refactor: 更改 HeaderTemplate 模板
ArgoZhang Jul 22, 2025
def8d0e
doc: 更新示例
ArgoZhang Jul 22, 2025
10f3c5c
chore: bump version 9.8.2-beta04
ArgoZhang Jul 22, 2025
b590220
Merge remote-tracking branch 'gitee.com/chore-collapse' into fix-coll…
ArgoZhang Jul 22, 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
8 changes: 3 additions & 5 deletions src/BootstrapBlazor.Server/Components/Samples/Collapses.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@
<CollapseItems>
<CollapseItem Text="@Localizer["Consistency"]">
<HeaderTemplate>
<div class="p-2">
<Select Items="Items" @bind-Value="Value" IsPopover="true"></Select>
</div>
<Select Items="Items" @bind-Value="Value" IsPopover="true"></Select>
</HeaderTemplate>
<ChildContent>
<div>@Localizer["ConsistencyItem1"]</div>
Expand All @@ -157,7 +155,7 @@
</CollapseItem>
<CollapseItem Text="@Localizer["Feedback"]">
<HeaderTemplate>
<div class="p-2">Header-Test</div>
Header-Test
</HeaderTemplate>
<ChildContent>
<div>@Localizer["FeedbackItem1"]</div>
Expand All @@ -166,7 +164,7 @@
</CollapseItem>
<CollapseItem Text="@Localizer["Controllability"]">
<HeaderTemplate>
<div class="p-2">Header-Test</div>
Header-Test
</HeaderTemplate>
<ChildContent>
<div>@Localizer["ControllabilityItem1"]</div>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.8.2-beta03</Version>
<Version>9.8.2-beta04</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
19 changes: 11 additions & 8 deletions src/BootstrapBlazor/Components/Collapse/Collapse.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@
{
<div @key="item" class="@GetItemClassString(item)">
<div class="@GetHeaderClassString(item)">
@if (item.HeaderTemplate != null)
{
<div class="accordion-header-body">
@item.HeaderTemplate
</div>
}
<div class="@GetHeaderButtonClassString(item)"
data-bs-toggle="collapse" data-bs-target="@GetTargetIdString(item)"
aria-expanded="@(item.IsCollapsed ? "false" : "true")" @onclick="() => OnClickItem(item)">
@if(!string.IsNullOrEmpty(item.Icon))
@if (item.HeaderTemplate != null)
{
<div class="accordion-header-body">
@item.HeaderTemplate
</div>
}
else if(!string.IsNullOrEmpty(item.Icon))
{
<i class="@GetItemIconString(item)"></i>
}
<span>@item.Text</span>
else
{
<span>@item.Text</span>
}
</div>
</div>
<div class="@GetClassString(item.IsCollapsed)" id="@GetTargetId(item)" data-bs-parent="@ParentIdString">
Expand Down
Loading