From db9568fb1d8d679a91cddd8fa2b854d4dcd026a1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 7 May 2025 10:22:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20Show=20?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B=E6=89=A9=E5=B1=95=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extensions/DialogServiceExtensions.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs index 38468f9d57a..e3b59f957a1 100644 --- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs +++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs @@ -12,6 +12,25 @@ namespace BootstrapBlazor.Components; /// public static class DialogServiceExtensions { + /// + /// 弹出带结果的对话框 + /// + /// DialogService 服务实例 + /// 对话框标题，优先级高于 + /// TCom 组件所需要的参数集合 + /// 指定弹窗组件 默认为 null 使用 组件内置弹窗组件 + public static Task Show(this DialogService service, string title, IDictionary? parameters = null, Dialog? dialog = null) where TComponent : IComponent + { + var option = new DialogOption(); + if (!string.IsNullOrEmpty(title)) + { + option.Title = title; + } + option.ShowFooter = false; + option.Component = BootstrapDynamicComponent.CreateComponent(parameters); + return service.Show(option, dialog); + } + /// /// 弹出搜索对话框 /// From c0fdc933616982ecfc6305441d7c52443e961b27 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 7 May 2025 10:24:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=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/DialogTest.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/UnitTest/Components/DialogTest.cs b/test/UnitTest/Components/DialogTest.cs index b38c748d94a..29c4c60c4ff 100644 --- a/test/UnitTest/Components/DialogTest.cs +++ b/test/UnitTest/Components/DialogTest.cs @@ -573,6 +573,11 @@ await cut.InvokeAsync(() => dialog.ShowCloseDialog("Clos })); await cut.InvokeAsync(() => modal.Instance.CloseCallback()); #endregion + + #region Show Extensions Method + await cut.InvokeAsync(() => dialog.Show("Test Title")); + await cut.InvokeAsync(() => modal.Instance.CloseCallback()); + #endregion } private class MockValidateFormDialog : ComponentBase From 7c09542817ae15b73c09f8eb04d85f953afc371e Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 7 May 2025 10:56:18 +0800 Subject: [PATCH 3/5] chore: bump version 9.6.1-beta03 Co-Authored-By: WarriorBlue <15247822+warriorblue@users.noreply.github.com> --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 1a7f7ef8660..d7b84e4d7b4 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@  - 9.6.1-beta02 + 9.6.1-beta03 From b1fc4f1cdb3152ef1b0d79c3ea598599e8404720 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 7 May 2025 10:59:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs index e3b59f957a1..db7562cbb9b 100644 --- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs +++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs @@ -8,12 +8,12 @@ namespace BootstrapBlazor.Components; /// -/// DialogService 扩展方法 +/// DialogService extensions method /// public static class DialogServiceExtensions { /// - /// 弹出带结果的对话框 + /// Show dialog with generic type. /// /// DialogService 服务实例 /// 对话框标题，优先级高于 From 63470752493b61635ce92c8af85c738e8b539319 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 7 May 2025 11:01:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs index db7562cbb9b..999edeef743 100644 --- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs +++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs @@ -17,7 +17,7 @@ public static class DialogServiceExtensions /// /// DialogService 服务实例 /// 对话框标题，优先级高于 - /// TCom 组件所需要的参数集合 + /// TComponent 组件所需要的参数集合 /// 指定弹窗组件 默认为 null 使用 组件内置弹窗组件 public static Task Show(this DialogService service, string title, IDictionary? parameters = null, Dialog? dialog = null) where TComponent : IComponent {