From fa118f11b4240042a9a1d2ea4baee6c9bdbabe51 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sun, 20 Feb 2022 12:47:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=A4=9A=E7=BA=A7=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=8D=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Dialog/Dialog.razor    | 2 +-
 src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor b/src/BootstrapBlazor/Components/Dialog/Dialog.razor
index c667a65ff..fb801da09 100644
--- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor
@@ -4,6 +4,6 @@
 <Modal AdditionalAttributes="@AdditionalAttributes" @ref="ModalContainer" IsKeyboard="@IsKeyboard">
     @foreach (var parameter in DialogParameters)
     {
-        @Dialog.RenderDialog(parameter)
+        @RenderDialog(parameter)
     }
 </Modal>
diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
index 84a5e6b44..a8947d978 100644
--- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
@@ -126,10 +126,15 @@ public partial class Dialog : IDisposable
         return Task.CompletedTask;
     }
 
-    private static RenderFragment RenderDialog(IEnumerable<KeyValuePair<string, object>> parameter) => builder =>
+    private RenderFragment RenderDialog(IEnumerable<KeyValuePair<string, object>> parameter) => builder =>
     {
         builder.OpenComponent<ModalDialog>(0);
         builder.AddMultipleAttributes(1, parameter);
+        builder.AddComponentReferenceCapture(2, dialog =>
+        {
+            var modal = (ModalDialog)dialog;
+            ModalContainer.ShowDialog(modal);
+        });
         builder.CloseComponent();
     };
 
-- 
Gitee


From 0b43e2994a2f6d5c60f30e74fe630635721584b7 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sun, 20 Feb 2022 13:44:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=A4=9A=E4=B8=80=E4=B8=AA=20ModalDIalog=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/DialogTest.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/UnitTest/Components/DialogTest.cs b/test/UnitTest/Components/DialogTest.cs
index 76a352e1c..ffbcb2cc5 100644
--- a/test/UnitTest/Components/DialogTest.cs
+++ b/test/UnitTest/Components/DialogTest.cs
@@ -3,7 +3,6 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 using BootstrapBlazor.Shared;
-using UnitTest.Extensions;
 
 namespace UnitTest.Components;
 
@@ -162,7 +161,7 @@ public class DialogTest : BootstrapBlazorTestBase
         cut.InvokeAsync(() => item.SetParametersAsync(ParameterView.FromDictionary(parameters)));
         editOption.Items = new IEditorItem[]
         {
-                item
+            item
         };
         editOption.Model = model;
         cut.InvokeAsync(() => dialog.ShowEditDialog(editOption));
@@ -177,7 +176,8 @@ public class DialogTest : BootstrapBlazorTestBase
 
         // Modal is Null
         editOption.Model = null;
-        Assert.ThrowsAsync<InvalidOperationException>(() => dialog.ShowEditDialog(editOption));
+        Assert.ThrowsAsync<InvalidOperationException>(() => cut.InvokeAsync(() => dialog.ShowEditDialog(editOption)));
+        cut.InvokeAsync(() => cut.Find(".btn-close").Click());
         #endregion
 
         #region ShowModal
-- 
Gitee


From 55d7022ad49798088c9ba8f9804e566c61f0d7c0 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sun, 20 Feb 2022 13:47:04 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=20ShowLabel=20?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Dialog/EditDialog.razor   | 2 +-
 src/BootstrapBlazor/Components/Dialog/SearchDialog.razor | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
index 0af614166..3f90258e4 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
@@ -17,7 +17,7 @@
 	}
 	else
 	{
-		<EditorForm TModel="TModel" Items="Items" ItemChangedType="ItemChangedType" ItemsPerRow="ItemsPerRow" RowType="RowType" LabelAlign="LabelAlign">
+		<EditorForm TModel="TModel" Items="Items" ItemChangedType="ItemChangedType" ItemsPerRow="ItemsPerRow" RowType="RowType" LabelAlign="LabelAlign" ShowLabel="ShowLabel">
 			<Buttons>
 				@if (!IsTracking)
 				{
diff --git a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
index be50855d8..576efb507 100644
--- a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
@@ -14,7 +14,7 @@
 else
 {
     <CascadingValue Value="true" IsFixed="true" Name="IsSearch">
-        <EditorForm TModel="TModel" Model="Model" Items="Items" RowType="RowType" ItemsPerRow="ItemsPerRow" LabelAlign="LabelAlign">
+        <EditorForm TModel="TModel" Model="Model" Items="Items" RowType="RowType" ItemsPerRow="ItemsPerRow" LabelAlign="LabelAlign" ShowLabel="ShowLabel">
             <Buttons>
                 @RenderFooter
             </Buttons>
-- 
Gitee


From 64a5ed88835653596a6dfa456d2c5ca0463dd2de Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Sun, 20 Feb 2022 13:47:38 +0800
Subject: [PATCH 4/4] chore: bump version 6.3.2-beta03

---
 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 ace4bca9a..d01a2b21d 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.3.2-beta02</Version>
+    <Version>6.3.2-beta03</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee