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 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; diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index 5f379e286f1..fc437e11b90 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -560,9 +560,12 @@ 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-template"); + cut.Contains("table-toolbar-template-content"); } [Fact]