Skip to content

feat(Table): add ShowColorWhenToolbarButtonsCollapsed parameter #6251

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 3 commits into from
Jun 18, 2025
Merged

feat(Table): add ShowColorWhenToolbarButtonsCollapsed parameter #6251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef3e379
feat(Table): add 'ShowColorWhenToolbarButtonsCollapsed' attribute in …
momijijin Jun 18, 2025
95182a5
chore: bump version 9.7.4-beta08
ArgoZhang Jun 18, 2025
ffb4a08
test: 增加单元测试
ArgoZhang Jun 18, 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
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.7.4-beta07</Version>
<Version>9.7.4-beta08</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Table/Table.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
@if (ShowToolbar)
{
<div class="table-toolbar">
<TableToolbar GearIcon="@GearIcon" OnGetSelectedRows="@GetSelectedRows" IsAutoCollapsedToolbarButton="IsAutoCollapsedToolbarButton">
<TableToolbar GearIcon="@GearIcon" OnGetSelectedRows="@GetSelectedRows" IsAutoCollapsedToolbarButton="IsAutoCollapsedToolbarButton" ShowColorWhenToolbarButtonsCollapsed="ShowColorWhenToolbarButtonsCollapsed">
@if (TableToolbarBeforeTemplate != null)
{
@TableToolbarBeforeTemplate
Expand Down
6 changes: 6 additions & 0 deletions src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ public partial class Table<TItem>
[Parameter]
public bool IsAutoCollapsedToolbarButton { get; set; } = true;

/// <summary>
/// 获得/设置 工具栏按钮收缩后是否继承原先按钮的颜色样式和中空化 默认 false
/// </summary>
[Parameter]
public bool ShowColorWhenToolbarButtonsCollapsed { get; set; }

/// <summary>
/// 获得/设置 工具栏移动端按钮图标
/// </summary>
Expand Down
40 changes: 40 additions & 0 deletions src/BootstrapBlazor/Components/Table/Table.razor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,46 @@
}
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-primary {
background-color: var(--bs-primary);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-secondary {
background-color: var(--bs-secondary);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-success {
background-color: var(--bs-success);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-danger {
background-color: var(--bs-danger);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-warning {
background-color: var(--bs-warning);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-info {
background-color: var(--bs-info);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-dark {
background-color: var(--bs-dark);
color: #fff;
}

.table-toolbar-button .btn-gear .dropdown-menu .dropdown-item-btn-light {
background-color: var(--bs-light);
color: #212529;
}

.btn-gear .dropdown-menu .dropdown-item:not(:first-child) {
border-inline-start: solid 1px #aeb2b7;
}
Expand Down
11 changes: 11 additions & 0 deletions src/BootstrapBlazor/Components/Table/TableToolbar.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public partial class TableToolbar<TItem> : ComponentBase
[Parameter]
public bool IsAutoCollapsedToolbarButton { get; set; } = true;

/// <summary>
/// 获得/设置 工具栏按钮收缩后是否继承原先按钮的颜色样式 默认 false
/// </summary>
[Parameter]
public bool ShowColorWhenToolbarButtonsCollapsed { get; set; }

/// <summary>
/// 获得/设置 移动端按钮图标
/// </summary>
Expand All @@ -53,6 +59,11 @@ public partial class TableToolbar<TItem> : ComponentBase

private string? GetItemClass(ButtonBase button) => CssBuilder.Default("dropdown-item")
.AddClass("disabled", GetDisabled(button))
.AddClass($"dropdown-item-btn-{button.Color.ToDescriptionString()}",
ShowColorWhenToolbarButtonsCollapsed &&
!button.IsOutline &&
button.Color != Color.None &&
button.Color != Color.Link)
.Build();

private async Task OnToolbarButtonClick(TableToolbarButton<TItem> button)
Expand Down
1 change: 1 addition & 0 deletions test/UnitTest/Components/TableTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ public void ResetVisibleColumns_Ok()
{
pb.Add(a => a.RenderMode, TableRenderMode.Table);
pb.Add(a => a.ShowToolbar, true);
pb.Add(a => a.ShowColorWhenToolbarButtonsCollapsed, true);
pb.Add(a => a.ShowColumnList, true);
pb.Add(a => a.Items, Foo.GenerateFoo(localizer, 2));
pb.Add(a => a.TableColumns, foo => builder =>
Expand Down