From 7135bc4ce7a0a8f2f45a58716f557e851ae1bd7d Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 5 Jun 2022 11:19:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E5=8D=95=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/LinkButtonTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/UnitTest/Components/LinkButtonTest.cs b/test/UnitTest/Components/LinkButtonTest.cs index 583289823..eb1899bec 100644 --- a/test/UnitTest/Components/LinkButtonTest.cs +++ b/test/UnitTest/Components/LinkButtonTest.cs @@ -37,7 +37,7 @@ public class LinkButtonTest : BootstrapBlazorTestBase Assert.Contains("fa fa-fa", cut.Markup); - Assert.Contains("text-primary", cut.Markup); + Assert.Contains("link-primary", cut.Markup); } [Fact] @@ -45,13 +45,13 @@ public class LinkButtonTest : BootstrapBlazorTestBase { var cut = Context.RenderComponent(builder => builder.Add(s => s.Color, Color.None)); - Assert.DoesNotContain("text-primary", cut.Markup); + Assert.DoesNotContain("link-primary", cut.Markup); cut.SetParametersAndRender(pb => pb.Add(a => a.Color, Color.Danger)); - Assert.Contains("text-danger", cut.Markup); + Assert.Contains("link-danger", cut.Markup); cut.SetParametersAndRender(pb => pb.Add(a => a.IsDisabled, true)); - Assert.DoesNotContain("text-danger", cut.Markup); + Assert.DoesNotContain("link-danger", cut.Markup); } [Fact] -- Gitee From b078d6ed815d26e07c11aaf70d33ed006adfae87 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 5 Jun 2022 11:22:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=20ShowFloatButto?= =?UTF-8?q?n=20=E5=8D=95=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/RibbonTabTest.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 test/UnitTest/Components/RibbonTabTest.cs diff --git a/test/UnitTest/Components/RibbonTabTest.cs b/test/UnitTest/Components/RibbonTabTest.cs new file mode 100644 index 000000000..5e8edefe3 --- /dev/null +++ b/test/UnitTest/Components/RibbonTabTest.cs @@ -0,0 +1,21 @@ +// Copyright (c) Argo Zhang (argo@163.com). All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +// Website: https://www.blazor.zone or https://argozhang.github.io/ + +namespace UnitTest.Components; + +public class RibbonTabTest : BootstrapBlazorTestBase +{ + [Fact] + public void ShowFloatButton_Ok() + { + var cut = Context.RenderComponent(); + + Assert.DoesNotContain("ribbon-arrow", cut.Markup); + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.ShowFloatButton, true); + }); + Assert.DoesNotContain("ribbon-arrow", cut.Markup); + } +} -- Gitee From f2e9be46d1d65d5d9bee7fbac72447cbb7af480b Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 5 Jun 2022 11:27:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/UnitTest/Components/RibbonTabTest.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/UnitTest/Components/RibbonTabTest.cs b/test/UnitTest/Components/RibbonTabTest.cs index 5e8edefe3..045e6b191 100644 --- a/test/UnitTest/Components/RibbonTabTest.cs +++ b/test/UnitTest/Components/RibbonTabTest.cs @@ -7,15 +7,24 @@ namespace UnitTest.Components; public class RibbonTabTest : BootstrapBlazorTestBase { [Fact] - public void ShowFloatButton_Ok() + public async Task ShowFloatButton_Ok() { + var isFloat = false; var cut = Context.RenderComponent(); - Assert.DoesNotContain("ribbon-arrow", cut.Markup); cut.SetParametersAndRender(pb => { pb.Add(a => a.ShowFloatButton, true); + pb.Add(a => a.OnFloatChanged, floating => + { + isFloat = floating; + return Task.CompletedTask; + }); }); - Assert.DoesNotContain("ribbon-arrow", cut.Markup); + Assert.Contains("ribbon-arrow", cut.Markup); + + var i = cut.Find(".ribbon-arrow > i"); + await cut.InvokeAsync(() => i.Click()); + Assert.True(isFloat); } } -- Gitee From 582762d9ee2958c54d9c308755d0f0be9c4e7657 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 5 Jun 2022 11:49:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=20TabItem=20?= =?UTF-8?q?=E5=8D=95=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/RibbonTabTest.cs | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/UnitTest/Components/RibbonTabTest.cs b/test/UnitTest/Components/RibbonTabTest.cs index 045e6b191..31b1d5b76 100644 --- a/test/UnitTest/Components/RibbonTabTest.cs +++ b/test/UnitTest/Components/RibbonTabTest.cs @@ -10,11 +10,21 @@ public class RibbonTabTest : BootstrapBlazorTestBase public async Task ShowFloatButton_Ok() { var isFloat = false; + RibbonTabItem? tabItem = null; var cut = Context.RenderComponent(); Assert.DoesNotContain("ribbon-arrow", cut.Markup); cut.SetParametersAndRender(pb => { + pb.Add(a => a.Items, GetItems()); pb.Add(a => a.ShowFloatButton, true); + pb.Add(a => a.RibbonArrowUpIcon, "test-up"); + pb.Add(a => a.RibbonArrowDownIcon, "test-down"); + pb.Add(a => a.RibbonArrowPinIcon, "test-pin"); + pb.Add(a => a.OnTabItemClickAsync, item => + { + tabItem = item; + return Task.CompletedTask; + }); pb.Add(a => a.OnFloatChanged, floating => { isFloat = floating; @@ -22,9 +32,24 @@ public class RibbonTabTest : BootstrapBlazorTestBase }); }); Assert.Contains("ribbon-arrow", cut.Markup); + Assert.Contains("test-up", cut.Markup); var i = cut.Find(".ribbon-arrow > i"); await cut.InvokeAsync(() => i.Click()); Assert.True(isFloat); + Assert.Contains("test-down", cut.Markup); + + // 点击 Tab 显示 pin 图标 + var tab = cut.Find(".tabs-item"); + await cut.InvokeAsync(() => tab.Click()); + Assert.Contains("test-pin", cut.Markup); + + var linkButton = cut.FindComponent(); + await cut.InvokeAsync(() => linkButton.Instance.OnClick.InvokeAsync()); + Assert.NotNull(tabItem); + + await cut.InvokeAsync(() => i.Click()); + Assert.False(isFloat); + Assert.Contains("test-up", cut.Markup); } } -- Gitee From 855bf300197f76134aed6bfcdd0364dd85421c3c Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 5 Jun 2022 11:50:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=20SetExpand=20?= =?UTF-8?q?=E5=8D=95=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/RibbonTabTest.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/UnitTest/Components/RibbonTabTest.cs b/test/UnitTest/Components/RibbonTabTest.cs index 31b1d5b76..15ceb1640 100644 --- a/test/UnitTest/Components/RibbonTabTest.cs +++ b/test/UnitTest/Components/RibbonTabTest.cs @@ -52,4 +52,20 @@ public class RibbonTabTest : BootstrapBlazorTestBase Assert.False(isFloat); Assert.Contains("test-up", cut.Markup); } + + [Fact] + public async Task SetExpand_Ok() + { + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.ShowFloatButton, true); + }); + + var i = cut.Find(".ribbon-arrow > i"); + await cut.InvokeAsync(() => i.Click()); + Assert.Contains("fa-angle-down", cut.Markup); + + await cut.InvokeAsync(() => cut.Instance.SetExpand()); + Assert.Contains("fa-angle-down", cut.Markup); + } } -- Gitee From 6fc8e3ad8977d5ff7aeed4771f387fadb829c193 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Sun, 5 Jun 2022 11:50:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=8D=95=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/RibbonTabTest.cs | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/test/UnitTest/Components/RibbonTabTest.cs b/test/UnitTest/Components/RibbonTabTest.cs index 15ceb1640..fcb9cc490 100644 --- a/test/UnitTest/Components/RibbonTabTest.cs +++ b/test/UnitTest/Components/RibbonTabTest.cs @@ -68,4 +68,47 @@ public class RibbonTabTest : BootstrapBlazorTestBase await cut.InvokeAsync(() => cut.Instance.SetExpand()); Assert.Contains("fa-angle-down", cut.Markup); } + + [Fact] + public void RightButtonsTemplate_Ok() + { + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.RightButtonsTemplate, builder => + { + builder.AddContent(0, "test-content"); + }); + }); + Assert.Contains("test-content", cut.Markup); + } + + private static IEnumerable GetItems() => new List() + { + new() + { + Text = "文件", + Items = new List() + { + new() { Text = "常规操作", Icon = "fa fa-fa", GroupName = "操作组一" }, + new() { Text = "常规操作", Icon = "fa fa-fa", GroupName = "操作组一" }, + new() { Text = "常规操作", Icon = "fa fa-fa", GroupName = "操作组一" }, + new() { Text = "打开", Icon = "fa fa-fa", GroupName = "操作组二" }, + new() { Text = "保存", Icon = "fa fa-fa", GroupName = "操作组二" }, + new() { Text = "另存为", Icon = "fa fa-fa", GroupName = "操作组二" } + } + }, + new() + { + Text = "编辑", + Items = new List() + { + new() { Text = "打开", Icon = "fa fa-fa", GroupName = "操作组三" }, + new() { Text = "保存", Icon = "fa fa-fa", GroupName = "操作组三" }, + new() { Text = "另存为", Icon = "fa fa-fa", GroupName = "操作组三" }, + new() { Text = "常规操作", Icon = "fa fa-fa", GroupName = "操作组四" }, + new() { Text = "常规操作", Icon = "fa fa-fa", GroupName = "操作组四" }, + new() { Text = "常规操作", Icon = "fa fa-fa", GroupName = "操作组四" } + } + } + }; } -- Gitee