diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 8e9f8a95f3c..b92aeced2c8 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,11 +1,11 @@  - 9.11.5-beta09 + 9.11.5-beta10 - 10.0.0-rc.2.1.8 + 10.0.0-rc.2.1.9 diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor index 65fd1443dee..69f78c4a964 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor @@ -146,7 +146,7 @@ ShowRefreshToolbarButton="ShowRefreshToolbarButton" ShowFullscreenToolbarButton="ShowFullscreenToolbarButton" RefreshToolbarButtonIcon="@RefreshToolbarButtonIcon" FullscreenToolbarButtonIcon="@FullscreenToolbarButtonIcon" RefreshToolbarTooltipText="@RefreshToolbarTooltipText" FullscreenToolbarTooltipText="@FullscreenToolbarTooltipText" - OnToolbarRefreshCallback="OnToolbarRefreshCallback" TabHeader="TabHeader" + OnToolbarRefreshCallback="OnToolbarRefreshCallback" TabHeader="TabHeader" OnCloseTabItemAsync="OnCloseTabItemAsync" Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText" EnableErrorLogger="@EnableLogger" ErrorLoggerToastTitle="@ErrorLoggerToastTitle"> ; diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs index 32c498f9f52..b4848267606 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs @@ -78,6 +78,13 @@ public partial class Layout : IHandlerException, ITabHeader [Parameter] public Func? OnToolbarRefreshCallback { get; set; } + /// + /// 获得/设置 关闭标签页前回调方法 + /// + /// 返回 false 时不关闭 标签页 + [Parameter] + public Func>? OnCloseTabItemAsync { get; set; } + /// /// 获得/设置 侧边栏状态 /// diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs index d9fc9c962f8..d0a62fac361 100644 --- a/src/BootstrapBlazor/Components/Tab/Tab.razor.cs +++ b/src/BootstrapBlazor/Components/Tab/Tab.razor.cs @@ -123,7 +123,7 @@ public partial class Tab /// /// 关闭标签页回调方法 /// - /// 返回 false 时不关 标签页 + /// 返回 false 时不关闭 标签页 [Parameter] public Func>? OnCloseTabItemAsync { get; set; } diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs index 72682e31423..37dc4365049 100644 --- a/test/UnitTest/Components/LayoutTest.cs +++ b/test/UnitTest/Components/LayoutTest.cs @@ -25,6 +25,7 @@ public async Task TabStyle_Ok() pb.Add(a => a.OnToolbarRefreshCallback, () => Task.CompletedTask); pb.Add(a => a.RefreshToolbarTooltipText, "test-refresh-tooltip"); pb.Add(a => a.FullscreenToolbarTooltipText, "test-fullscreen-tooltip"); + pb.Add(a => a.OnCloseTabItemAsync, tab => Task.FromResult(true)); }); Assert.DoesNotContain("tabs-chrome", cut.Markup); Assert.DoesNotContain("tabs-capsule", cut.Markup); @@ -647,7 +648,7 @@ public void ErrorLogger_OnErrorHandleAsync_Button() var layout = cut.FindComponent(); layout.SetParametersAndRender(pb => { - pb.Add(a => a.OnErrorHandleAsync, null); + pb.Add(a => a.OnErrorHandleAsync, null); }); button = cut.Find("button"); @@ -727,6 +728,6 @@ protected override void OnInitialized() var b = 0; // 触发生命周期内异常 - var c = a / b; + var c = a / b; } }