From 44a4481254b8b581c17ad818f2ed72f218a39caf Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Sat, 3 Dec 2022 16:13:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20DialogResult=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=20Unset=20=E6=9E=9A=E4=B8=BE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Dialog/DialogResult.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/BootstrapBlazor/Components/Dialog/DialogResult.cs b/src/BootstrapBlazor/Components/Dialog/DialogResult.cs
index e0eaaa33c..e1cdcf60c 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogResult.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogResult.cs
@@ -9,6 +9,11 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public enum DialogResult
 {
+    /// <summary>
+    /// 未设置
+    /// </summary>
+    Unset,
+
     /// <summary>
     /// 是
     /// </summary>
-- 
Gitee


From 472f8e399851f731599823e6fe8dac525001c9cd Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Sat, 3 Dec 2022 16:14:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=80=81?=
 =?UTF-8?q?=E7=AA=97=E5=AF=BC=E8=87=B4=E5=85=B3=E7=AA=97=E6=AD=BB=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/DialogServiceExtensions.cs           | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
index 4d11a7ffc..53851cdee 100644
--- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
@@ -109,7 +109,7 @@ public static class DialogServiceExtensions
         where TDialog : IComponent, IResultDialog
     {
         IResultDialog? resultDialog = null;
-        var result = DialogResult.Close;
+        var result = DialogResult.Unset;
 
         option.BodyTemplate = builder =>
         {
@@ -170,10 +170,15 @@ public static class DialogServiceExtensions
                     await closeCallback();
                 }
 
-                // Modal 与 ModalDialog 的 OnClose 事件陷入死循环
-                // option.OnClose -> Modal.Close -> ModalDialog.Close -> ModalDialog.OnClose -> option.OnClose
                 option.OnCloseAsync = null;
-                await option.Dialog.Close();
+                if (result == DialogResult.Unset)
+                {
+                    result = DialogResult.Close;
+                }
+                else
+                {
+                    await option.Dialog.Close();
+                }
                 option.ReturnTask.SetResult(result);
             }
             else
-- 
Gitee


From 5214832b17883057ccf639258657ffc8e036f97d Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Sat, 3 Dec 2022 16:14:47 +0800
Subject: [PATCH 3/3] chore: bump version 7.1.1-beta01

---
 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 3e47f53fa..43c71baf3 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.1.0</Version>
+    <Version>7.1.1-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee