From 06aa58612695f4698df1952cd93df4a1bb121bdf Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 3 May 2025 16:08:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20ToolbarTemplat?= =?UTF-8?q?e=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor | 6 ++++++ .../Components/Table/Table.razor.Toolbar.cs | 6 ++++++ src/BootstrapBlazor/Components/Table/Table.razor.scss | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index fa641db7af3..79cec98698d 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -69,6 +69,12 @@ @TableToolbarTemplate } + @if (ToolbarTemplate != null) + { +
+ @ToolbarTemplate +
+ }
@if (TableExtensionToolbarBeforeTemplate != null) { diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index 125dd496f77..8025456bf44 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -15,6 +15,12 @@ public partial class Table [Parameter] public bool ShowToolbar { get; set; } + /// + /// Gets or sets the template of table toolbar. Default is null. + /// + [Parameter] + public RenderFragment? ToolbarTemplate { get; set; } + /// /// 获得/设置 首次加载是否显示加载骨架屏 默认 false 不显示 使用 参数值 /// diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.scss b/src/BootstrapBlazor/Components/Table/Table.razor.scss index dc20b7798bc..d454ffb5ad3 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.scss +++ b/src/BootstrapBlazor/Components/Table/Table.razor.scss @@ -711,6 +711,15 @@ form .table .table-cell > textarea { } } +.table-toolbar-template { + margin-block-end: .5rem; + min-height: 35px; + display: flex; + flex-wrap: nowrap; + align-items: center; + justify-content: flex-start; +} + @media (min-width: 576px) { .table-search .card-header .card-title { display: initial; From 7e974713aecfb6191361f7471ef615be6697ed54 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 3 May 2025 16:09:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/TableTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 5f379e286f1..0289a9ea0dd 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -560,9 +560,11 @@ public void ShowToolbar_Ok() builder.AddAttribute(2, "FieldExpression", Utility.GenerateValueExpression(foo, "Name", typeof(string))); builder.CloseComponent(); }); + pb.Add(a => a.ToolbarTemplate, builder => builder.AddContent(0, "table-toolbar-template-content")); }); }); cut.Contains("float-end table-toolbar-button"); + cut.Contains("float-start table-toolbar-button"); } [Fact] From 8a3cfa1f3d46f585c2b94db329a1e4af66d27cce Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 3 May 2025 16:13:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/TableTest.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 0289a9ea0dd..fc437e11b90 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -564,7 +564,8 @@ public void ShowToolbar_Ok() }); }); cut.Contains("float-end table-toolbar-button"); - cut.Contains("float-start table-toolbar-button"); + cut.Contains("float-start table-toolbar-template"); + cut.Contains("table-toolbar-template-content"); } [Fact] From fb738aceda7b3c34078af9b652893564112d9bdb Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 3 May 2025 16:14:56 +0800 Subject: [PATCH 4/4] chore: bump version 9.6.1-beta01 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 1a7f7ef8660..0e6eb0e364b 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta02 + 9.6.1-beta01