From f1e92c87a9cc40003faeae87a780270fcfff33c0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 11 Apr 2025 10:43:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Table/Table.razor.Localization.cs | 7 +++++++ .../Components/Table/Table.razor.Toolbar.cs | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs index 0da172217ef..c0f87a941bd 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs @@ -302,6 +302,13 @@ public partial class Table [NotNull] public string? SaveButtonToastResultContent { get; set; } + /// + /// Gets or sets the toast delay in milliseconds. Default is 4000ms. + /// + [Parameter] + [NotNull] + public int ToastDelay { get; set; } = 4000; + /// /// 获得/设置 保存成功文字 /// diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index 01369ba40cc..76573d9ae85 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -1153,11 +1153,19 @@ private async Task ExecuteExportAsync(Func> callback) } } - private ToastOption GetToastOption(string title) => new() + private ToastOption GetToastOption(string title) { - Title = title, - Delay = Options.CurrentValue.ToastDelay - }; + var option = new ToastOption() + { + Title = title, + Delay = Options.CurrentValue.ToastDelay + }; + if (option.Delay == 0) + { + option.Delay = Math.Max(1000, ToastDelay); + } + return option; + } private Task ExportAsync() => ExecuteExportAsync(() => OnExportAsync != null ? OnExportAsync(new TableExportDataContext(TableExportType.Unknown, Rows, GetVisibleColumns(), BuildQueryPageOptions())) From 4c8956720c460aea9315ebff452790ca3ef49de4 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 11 Apr 2025 10:56:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=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/TableDialogTest.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/UnitTest/Components/TableDialogTest.cs b/test/UnitTest/Components/TableDialogTest.cs index 4b6f6cc0828..1cd314aa05a 100644 --- a/test/UnitTest/Components/TableDialogTest.cs +++ b/test/UnitTest/Components/TableDialogTest.cs @@ -6,6 +6,7 @@ using AngleSharp.Dom; using Microsoft.AspNetCore.Components.Web; using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Options; using System.Reflection; namespace UnitTest.Components; @@ -15,12 +16,15 @@ public class TableDialogTest : TableDialogTestBase [Fact] public async Task EditAsync_Ok() { + var options = Context.Services.GetRequiredService>(); + options.CurrentValue.ToastDelay = 0; var localizer = Context.Services.GetRequiredService>(); var items = Foo.GenerateFoo(localizer, 2); var cut = Context.RenderComponent(pb => { pb.AddChildContent>(pb => { + pb.Add(a => a.ToastDelay, 4000); pb.Add(a => a.RenderMode, TableRenderMode.Table); pb.Add(a => a.Items, items); pb.Add(a => a.EditDialogIsDraggable, true); From 9e10ab2e5bbe5c89b7ad1abd6a8a6a1c1ee43e87 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 11 Apr 2025 10:59:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Message/MessageService.cs | 2 +- src/BootstrapBlazor/Components/SweetAlert/SwalService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Components/Message/MessageService.cs b/src/BootstrapBlazor/Components/Message/MessageService.cs index 3b4d8047d4a..663ff3e9062 100644 --- a/src/BootstrapBlazor/Components/Message/MessageService.cs +++ b/src/BootstrapBlazor/Components/Message/MessageService.cs @@ -22,7 +22,7 @@ public async Task Show(MessageOption option, Message? message = null) { if (!option.ForceDelay) { - if (Options.MessageDelay != 0) + if (Options.MessageDelay > 0) { option.Delay = Options.MessageDelay; } diff --git a/src/BootstrapBlazor/Components/SweetAlert/SwalService.cs b/src/BootstrapBlazor/Components/SweetAlert/SwalService.cs index 04ad180549e..f1ef9f802bb 100644 --- a/src/BootstrapBlazor/Components/SweetAlert/SwalService.cs +++ b/src/BootstrapBlazor/Components/SweetAlert/SwalService.cs @@ -17,7 +17,7 @@ public class SwalService(IOptionsMonitor options) : Boot /// 指定弹窗组件 默认为 null 使用 组件内置弹窗组件 public async Task Show(SwalOption option, SweetAlert? swal = null) { - if (!option.ForceDelay && options.CurrentValue.SwalDelay != 0) + if (!option.ForceDelay && options.CurrentValue.SwalDelay > 0) { option.Delay = options.CurrentValue.SwalDelay; } From 07a6ae2ea222e6a5c109352834cdebfd6dad7553 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 11 Apr 2025 11:00:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Table/Table.razor.Localization.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs index c0f87a941bd..0da172217ef 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Localization.cs @@ -302,13 +302,6 @@ public partial class Table [NotNull] public string? SaveButtonToastResultContent { get; set; } - /// - /// Gets or sets the toast delay in milliseconds. Default is 4000ms. - /// - [Parameter] - [NotNull] - public int ToastDelay { get; set; } = 4000; - /// /// 获得/设置 保存成功文字 /// From 464c880b62ecb76171ac006b619d950dba609c3a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 11 Apr 2025 11:00:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20ToastDelay?= =?UTF-8?q?=20=E5=8F=96=E5=80=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index 76573d9ae85..125dd496f77 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -1158,11 +1158,10 @@ private ToastOption GetToastOption(string title) var option = new ToastOption() { Title = title, - Delay = Options.CurrentValue.ToastDelay }; - if (option.Delay == 0) + if (Options.CurrentValue.ToastDelay > 0) { - option.Delay = Math.Max(1000, ToastDelay); + option.Delay = Options.CurrentValue.ToastDelay; } return option; } From a5547386fa9bf220283a4d8ea1d643a8fa84e57f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 11 Apr 2025 11:00:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=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/TableDialogTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/UnitTest/Components/TableDialogTest.cs b/test/UnitTest/Components/TableDialogTest.cs index 1cd314aa05a..64869dfadad 100644 --- a/test/UnitTest/Components/TableDialogTest.cs +++ b/test/UnitTest/Components/TableDialogTest.cs @@ -24,7 +24,6 @@ public async Task EditAsync_Ok() { pb.AddChildContent>(pb => { - pb.Add(a => a.ToastDelay, 4000); pb.Add(a => a.RenderMode, TableRenderMode.Table); pb.Add(a => a.Items, items); pb.Add(a => a.EditDialogIsDraggable, true);