diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json index c221d249d51ca05818b12259258a49003b083a4c..cf28cc8be57526c498404f3310a52e1685297dec 100644 --- a/src/BootstrapBlazor.Shared/Locales/en.json +++ b/src/BootstrapBlazor.Shared/Locales/en.json @@ -4010,6 +4010,7 @@ "Attr6": "Display the small floating arrow", "Attr7": "Data source", "Attr8": "Click the command button callback method", + "OnMenuClickAsyncAttr": "Click the command menu callback method", "Attr9": "Right button template", "ItemsText1": "Document", "Items1": "Task 1", diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json index 24e0fbce3607665835048b6bc8b1b246df14bbb2..0eb7664ac1a3393632f9cea65678af5fc8157d46 100644 --- a/src/BootstrapBlazor.Shared/Locales/zh.json +++ b/src/BootstrapBlazor.Shared/Locales/zh.json @@ -4009,6 +4009,7 @@ "Attr6": "是否显示悬浮小箭头", "Attr7": "数据源", "Attr8": "点击命令按钮回调方法", + "OnMenuClickAsyncAttr": "点击一级菜单回调方法", "Attr9": "右侧按钮模板", "ItemsText1": "文件", "Items1": "常规操作", diff --git a/src/BootstrapBlazor.Shared/Samples/RibbonTabs.razor.cs b/src/BootstrapBlazor.Shared/Samples/RibbonTabs.razor.cs index b80a31bd5bb09d6384a8bc1f2bad6119b560eac1..1daaad5d5e7a1464d921f41a4fb09295c80aed8e 100644 --- a/src/BootstrapBlazor.Shared/Samples/RibbonTabs.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/RibbonTabs.razor.cs @@ -60,9 +60,9 @@ public partial class RibbonTabs .AddClass("show", ActiveTabText == Localizer["ItemsText2"]) .Build(); - private Task OnMenuClickAsync(string text, string url) + private Task OnMenuClickAsync(RibbonTabItem item) { - ActiveTabText = text; + ActiveTabText = item.Text; StateHasChanged(); return Task.CompletedTask; } @@ -143,6 +143,14 @@ public partial class RibbonTabs DefaultValue = " — " }, new AttributeItem() + { + Name = nameof(RibbonTab.OnMenuClickAsync), + Description = Localizer["OnMenuClickAsyncAttr"], + Type = "Func", + ValueList = " — ", + DefaultValue = " — " + }, + new AttributeItem() { Name = nameof(RibbonTab.RightButtonsTemplate), Description = Localizer["Attr9"], diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index a7c35e58c7b96cfe2328c5c96aae59ede55fa4cc..13944d5745fc440d7428ea350af833d9e8057db1 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 7.0.9 + 7.0.10-beta03 diff --git a/src/BootstrapBlazor/Components/RibbonTab/RibbonTab.razor.cs b/src/BootstrapBlazor/Components/RibbonTab/RibbonTab.razor.cs index afc1e91200dcd9bc17ea404e129840920acd757d..1caccb8ac6a092047a352329b49b7933ecdf98e5 100644 --- a/src/BootstrapBlazor/Components/RibbonTab/RibbonTab.razor.cs +++ b/src/BootstrapBlazor/Components/RibbonTab/RibbonTab.razor.cs @@ -67,7 +67,7 @@ public partial class RibbonTab /// 获得/设置 点击标签 Menu 回调方法 /// [Parameter] - public Func? OnMenuClickAsync { get; set; } + public Func? OnMenuClickAsync { get; set; } /// /// 获得/设置 右侧按钮模板 @@ -126,14 +126,10 @@ public partial class RibbonTab private async Task OnClickTab(TabItem item) { + var tab = GetItems().First(i => i.Text == item.Text); if (OnMenuClickAsync != null) { - await OnMenuClickAsync(item.Text, item.Url); - } - if (OnItemClickAsync != null) - { - var tab = GetItems().First(i => i.Text == item.Text); - await OnItemClickAsync(tab); + await OnMenuClickAsync(tab); } if (IsFloat) { diff --git a/test/UnitTest/Components/RibbonTabTest.cs b/test/UnitTest/Components/RibbonTabTest.cs index f524ff3ac35fd7c456a2b4dfb6a8ea8534aa7094..db2a48f736dcc5f8a7209ea41584a5cb6b57b682 100644 --- a/test/UnitTest/Components/RibbonTabTest.cs +++ b/test/UnitTest/Components/RibbonTabTest.cs @@ -193,9 +193,9 @@ public class RibbonTabTest : BootstrapBlazorTestBase } } }); - pb.Add(a => a.OnMenuClickAsync, (text, url) => + pb.Add(a => a.OnMenuClickAsync, item => { - clickedText = text; + clickedText = item.Text; return Task.CompletedTask; }); });