From 6ab1466dd003e1ff6a5f37f06a017ae1b655b1ad Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Tue, 27 Sep 2022 20:33:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=20DateTimePicker?= =?UTF-8?q?=20AutoClose=20=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=20true?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/DateTimePicker/DateTimePicker.razor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs index d8259f64c..4791221e1 100644 --- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs +++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs @@ -131,10 +131,10 @@ public sealed partial class DateTimePicker public Func? OnDateTimeChanged { get; set; } /// - /// 获得/设置 是否点击日期后自动关闭弹窗 默认 false + /// 获得/设置 是否点击日期后自动关闭弹窗 默认 true /// [Parameter] - public bool AutoClose { get; set; } + public bool AutoClose { get; set; } = true; [Inject] [NotNull] -- Gitee From f64a3c327cb7a32161e8e472f9ae5da235d50878 Mon Sep 17 00:00:00 2001 From: Argo-Lenovo Date: Tue, 27 Sep 2022 20:45:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8D=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/BarcodeReaderTest.cs | 134 ------------------ .../UnitTest/Components/DateTimePickerTest.cs | 10 +- .../Components/PopConfirmButtonTest.cs | 2 +- test/UnitTest/Components/QRCodeTest.cs | 79 ----------- 4 files changed, 10 insertions(+), 215 deletions(-) delete mode 100644 test/UnitTest/Components/BarcodeReaderTest.cs delete mode 100644 test/UnitTest/Components/QRCodeTest.cs diff --git a/test/UnitTest/Components/BarcodeReaderTest.cs b/test/UnitTest/Components/BarcodeReaderTest.cs deleted file mode 100644 index 6017edafa..000000000 --- a/test/UnitTest/Components/BarcodeReaderTest.cs +++ /dev/null @@ -1,134 +0,0 @@ -// 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 BarcodeReaderTest : BootstrapBlazorTestBase -{ - [Fact] - public void InitDevices_Ok() - { - var init = false; - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.ScanType, ScanType.Camera); - pb.Add(a => a.OnInit, items => - { - init = true; - return Task.CompletedTask; - }); - }); - cut.InvokeAsync(() => cut.Instance.InitDevices(new DeviceItem[] - { - new DeviceItem { DeviceId = "TestId", Label = "Test" } - })); - Assert.True(init); - cut.InvokeAsync(() => cut.Instance.InitDevices(Array.Empty())); - } - - [Fact] - public void GetResult_Ok() - { - var init = false; - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.ScanType, ScanType.Camera); - pb.Add(a => a.OnResult, v => - { - init = true; - return Task.CompletedTask; - }); - }); - - cut.InvokeAsync(() => cut.Instance.GetResult("Test")); - Assert.True(init); - } - - [Fact] - public void GetError_Ok() - { - var init = false; - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.ScanType, ScanType.Camera); - pb.Add(a => a.OnError, v => - { - init = true; - return Task.CompletedTask; - }); - }); - - cut.InvokeAsync(() => cut.Instance.GetError("Test")); - Assert.True(init); - } - - [Fact] - public void Start_Ok() - { - var init = false; - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.ScanType, ScanType.Camera); - pb.Add(a => a.OnStart, () => - { - init = true; - return Task.CompletedTask; - }); - }); - - cut.InvokeAsync(() => cut.Instance.Start()); - Assert.True(init); - } - - [Fact] - public void Close_Ok() - { - var init = false; - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.ScanType, ScanType.Camera); - pb.Add(a => a.OnClose, () => - { - init = true; - return Task.CompletedTask; - }); - }); - - cut.InvokeAsync(() => cut.Instance.Stop()); - Assert.True(init); - } - - [Fact] - public void AutoStop_Ok() - { - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.ScanType, ScanType.Image); - pb.Add(a => a.AutoStop, true); - pb.Add(a => a.AutoStart, true); - }); - Assert.Contains("data-autostop=\"true\"", cut.Markup); - Assert.Contains("scanner-image", cut.Markup); - } - - [Fact] - public void OnDeviceChanged_Ok() - { - var changed = false; - var cut = Context.RenderComponent(pb => - { - pb.Add(a => a.OnDeviceChanged, item => - { - changed = true; - return Task.CompletedTask; - }); - }); - cut.InvokeAsync(() => cut.Instance.InitDevices(new DeviceItem[] - { - new DeviceItem { DeviceId = "TestId", Label = "Test" } - })); - cut.Find(".dropdown-item").Click(); - Assert.True(changed); - } -} diff --git a/test/UnitTest/Components/DateTimePickerTest.cs b/test/UnitTest/Components/DateTimePickerTest.cs index d389a5f9a..e841dfc9a 100644 --- a/test/UnitTest/Components/DateTimePickerTest.cs +++ b/test/UnitTest/Components/DateTimePickerTest.cs @@ -608,7 +608,7 @@ public class DateTimePickerTest : BootstrapBlazorTestBase var cut = Context.RenderComponent>(builder => { builder.Add(a => a.Value, DateTime.Today); - builder.Add(a => a.AutoClose, true); + builder.Add(a => a.AutoClose, false); builder.Add(a => a.OnDateTimeChanged, dt => { val = dt; @@ -619,6 +619,14 @@ public class DateTimePickerTest : BootstrapBlazorTestBase var button = cut.Find(".picker-panel-content .cell"); await cut.InvokeAsync(() => button.Click()); + Assert.Equal(val, DateTime.MinValue); + + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.AutoClose, true); + }); + button = cut.Find(".picker-panel-content .cell"); + await cut.InvokeAsync(() => button.Click()); Assert.NotEqual(val, DateTime.MinValue); } } diff --git a/test/UnitTest/Components/PopConfirmButtonTest.cs b/test/UnitTest/Components/PopConfirmButtonTest.cs index 82a32e559..7ae622348 100644 --- a/test/UnitTest/Components/PopConfirmButtonTest.cs +++ b/test/UnitTest/Components/PopConfirmButtonTest.cs @@ -111,6 +111,6 @@ public class PopConfirmButtonTest : PopoverTestBase { pb.Add(a => a.IsLink, true); }); - Assert.Contains("data-bs-toggle=\"confirm\"", popButton.Markup); + popButton.Contains(" a.ShowButtons, true); - }); - - Assert.Contains("Please input", cut.Markup); - } - - [Fact] - public void ClearButtonText() - { - var cut = Context.RenderComponent(builder => - { - builder.Add(a => a.ShowButtons, true); - builder.Add(a => a.ClearButtonText, "Clear"); - }); - - Assert.Contains("Clear", cut.Markup); - } - - [Fact] - public void GenerateButtonText() - { - var cut = Context.RenderComponent(builder => - { - builder.Add(a => a.ShowButtons, true); - builder.Add(a => a.GenerateButtonText, "Generate"); - }); - - Assert.Contains("Generate", cut.Markup); - } - - [Fact] - public void Content() - { - var cut = Context.RenderComponent(builder => - { - builder.Add(a => a.Content, "https://www.blazor.zone"); - }); - } - - [Fact] - public void OnGenerated() - { - var generated = false; - var cut = Context.RenderComponent(builder => - { - builder.Add(a => a.OnGenerated, () => { generated = true; return Task.CompletedTask; }); - builder.Add(a => a.ShowButtons, true); - }); - - cut.InvokeAsync(() => cut.Instance.Generated()); - Assert.True(generated); - } - - [Fact] - public void Clear() - { - var cut = Context.RenderComponent(builder => - { - builder.Add(a => a.ShowButtons, true); - }); - - var button = cut.FindComponents