diff --git a/src/BootstrapBlazor.Shared/Samples/Dialogs.razor b/src/BootstrapBlazor.Shared/Samples/Dialogs.razor
index bbbd7c3569426de3308cc7aa34e0f0ecddbc443c..02cf1347c7784743cbccd716a8fd084c2b49ca9c 100644
--- a/src/BootstrapBlazor.Shared/Samples/Dialogs.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Dialogs.razor
@@ -130,6 +130,10 @@
     <Button OnClick="@OnPrintDialogClick">点击打开 Dialog</Button>
 </DemoBlock>
 
+<DemoBlock Title="全屏弹窗" Introduction="通过设置 <code>ShowMaximizeButton</code> 使 <code>Header</code> 上显示一个窗口最大化按钮" Name="PrintDialog">
+    <Button OnClick="@OnMaximizeDialogClick">点击打开 Dialog</Button>
+</DemoBlock>
+
 <DemoBlock Title="实战演练" Introduction="模拟一个邮件应用，弹窗选择收件人后填入下方的收件人框。" Name="Email">
     <p>功能介绍</p>
     <ul class="ul-demo">
diff --git a/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs b/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs
index 592c3fc1faab4fb769f515f7d5079fc7d00298e5..4bf9e26ad0bd219d3cbba88e8d4d02902afd2343 100644
--- a/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs
+++ b/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs
@@ -190,6 +190,19 @@ public sealed partial class Dialogs
         await DialogService.Show(op);
     }
 
+    private async Task OnMaximizeDialogClick()
+    {
+        await DialogService.Show(new DialogOption()
+        {
+            Title = $"可控制最大化弹窗",
+            ShowMaximizeButton = true,
+            BodyTemplate = builder =>
+            {
+                builder.AddContent(0, "点击 Header 中最大化按钮弹窗可全屏");
+            }
+        });
+    }
+
     private string? InputValue { get; set; }
 
     private IEnumerable<string> Emails { get; set; } = Array.Empty<string>();
@@ -380,6 +393,13 @@ public sealed partial class Dialogs
             Type = "string",
             ValueList = " — ",
             DefaultValue = "资源文件中设定值"
+        },
+        new AttributeItem() {
+            Name = nameof(DialogOption.ShowMaximizeButton),
+            Description = "是否显示最大化按钮",
+            Type = "boolean",
+            ValueList = "true|false",
+            DefaultValue = "false"
         }
     };
 }
diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor b/src/BootstrapBlazor/Components/Dialog/Dialog.razor
index fb801da093dcecfdf008cd9c245d9ca159782719..c667a65ff8f3acdaec09c273224141144c13f7fa 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)
     {
-        @RenderDialog(parameter)
+        @Dialog.RenderDialog(parameter)
     }
 </Modal>
diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
index d95fc48a67554180501cf6273b878d2a50eed767..84a5e6b443348f8a355dd2b64e37ec172646c8a4 100644
--- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
@@ -126,7 +126,7 @@ public partial class Dialog : IDisposable
         return Task.CompletedTask;
     }
 
-    private RenderFragment RenderDialog(IEnumerable<KeyValuePair<string, object>> parameter) => builder =>
+    private static RenderFragment RenderDialog(IEnumerable<KeyValuePair<string, object>> parameter) => builder =>
     {
         builder.OpenComponent<ModalDialog>(0);
         builder.AddMultipleAttributes(1, parameter);
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogOption.cs b/src/BootstrapBlazor/Components/Dialog/DialogOption.cs
index 1ea7eaf2369063ba22d710e2803e1333f3df3259..e33d5fdd4606ef5133d2d8db63be1368e1d65ea3 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogOption.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogOption.cs
@@ -37,6 +37,11 @@ public class DialogOption
     /// </summary>
     public FullScreenSize FullScreenSize { get; set; } = FullScreenSize.None;
 
+    /// <summary>
+    /// 获得/设置 是否显示最大化按钮 默认 false 不显示
+    /// </summary>
+    public bool ShowMaximizeButton { get; set; }
+
     /// <summary>
     /// 获得/设置 是否垂直居中 默认为 true
     /// </summary>
@@ -162,7 +167,8 @@ public class DialogOption
             [nameof(ShowPrintButtonInHeader)] = ShowPrintButtonInHeader,
             [nameof(IsKeyboard)] = IsKeyboard,
             [nameof(IsAutoCloseAfterSave)] = IsAutoCloseAfterSave,
-            [nameof(IsDraggable)] = IsDraggable
+            [nameof(IsDraggable)] = IsDraggable,
+            [nameof(ShowMaximizeButton)] = ShowMaximizeButton
         };
         if (!string.IsNullOrEmpty(PrintButtonText))
         {
diff --git a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
index 58a6c9aaed6ac3444746e1c81627192e194b9344..be50855d87d3de17f1289bc9d16fd5823dda517b 100644
--- a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
@@ -4,7 +4,7 @@
 
 @if (BodyTemplate != null)
 {
-    @BodyTemplate?.Invoke(Model)
+    @BodyTemplate.Invoke(Model)
     <div class="row mt-3">
         <div class="col-12">
             @RenderFooter
diff --git a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor.cs
index 10eb6cf0955574b59f5043283b02c4ad66c3e212..d65f7a25edda3beda4e6951e0b814346e9ff799a 100644
--- a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor.cs
@@ -55,15 +55,5 @@ public partial class SearchDialog<TModel>
 
         ResetButtonText ??= Localizer[nameof(ResetButtonText)];
         QueryButtonText ??= Localizer[nameof(QueryButtonText)];
-
-        if (OnSearchClick == null)
-        {
-            OnSearchClick = () => Task.CompletedTask;
-        }
-
-        if (OnResetSearchClick == null)
-        {
-            OnResetSearchClick = () => Task.CompletedTask;
-        }
     }
 }
diff --git a/test/UnitTest/Components/DialogTest.cs b/test/UnitTest/Components/DialogTest.cs
index ba539a0a63e7cc38474dc593d341c9a507f755c4..76a352e1c8c8d4ce71a91775ef8b14407cdcd897 100644
--- a/test/UnitTest/Components/DialogTest.cs
+++ b/test/UnitTest/Components/DialogTest.cs
@@ -26,6 +26,7 @@ public class DialogTest : BootstrapBlazorTestBase
             HeaderTemplate = builder => builder.AddContent(0, "Test-HeaderTemplate"),
             FooterTemplate = builder => builder.AddContent(0, "Test-FooterTemplate"),
             Class = "test-class",
+            ShowMaximizeButton = true,
             OnCloseAsync = () =>
             {
                 closed = true;
@@ -33,6 +34,9 @@ public class DialogTest : BootstrapBlazorTestBase
             }
         }));
 
+        // 全屏按钮
+        Assert.Contains("btn-maximize", cut.Markup);
+
         // 代码覆盖模板单元测试
         Assert.Contains("Test-BodyTemplate", cut.Markup);
         Assert.Contains("Test-HeaderTemplate", cut.Markup);
@@ -70,10 +74,22 @@ public class DialogTest : BootstrapBlazorTestBase
             Title = "Test-SearchDialogTitle",
             Model = new Foo(),
             ItemsPerRow = 2,
-            RowType = RowType.Inline
+            RowType = RowType.Inline,
+            LabelAlign = Alignment.Left,
+            ResetButtonText = null,
+            QueryButtonText = null,
+            Items = null
         };
         cut.InvokeAsync(() => dialog.ShowSearchDialog(option));
-        cut.InvokeAsync(() => modal.Instance.Close());
+
+        // 重置按钮委托为空 null
+        var button = cut.FindComponents<Button>().First(b => b.Instance.Text == "重置");
+        cut.InvokeAsync(() => button.Instance.OnClickWithoutRender!.Invoke());
+
+        // 搜索按钮委托为空
+        cut.InvokeAsync(() => dialog.ShowSearchDialog(option));
+        button = cut.FindComponents<Button>().First(b => b.Instance.Text == "查询");
+        cut.InvokeAsync(() => button.Instance.OnClickWithoutRender!.Invoke());
 
         // 重置按钮
         var reset = false;
@@ -83,10 +99,9 @@ public class DialogTest : BootstrapBlazorTestBase
             return Task.CompletedTask;
         };
         cut.InvokeAsync(() => dialog.ShowSearchDialog(option));
-        var button = cut.FindComponents<Button>().First(b => b.Instance.Text == "重置");
+        button = cut.FindComponents<Button>().First(b => b.Instance.Text == "重置");
         cut.InvokeAsync(() => button.Instance.OnClickWithoutRender!.Invoke());
         Assert.True(reset);
-        cut.InvokeAsync(() => modal.Instance.Close());
 
         // 搜索按钮
         var search = false;
@@ -108,7 +123,10 @@ public class DialogTest : BootstrapBlazorTestBase
         {
             Model = new Foo(),
             ItemsPerRow = 2,
-            RowType = RowType.Inline
+            RowType = RowType.Inline,
+            ItemChangedType = ItemChangedType.Add,
+            IsTracking = false,
+            LabelAlign = Alignment.Left
         };
         cut.InvokeAsync(() => dialog.ShowEditDialog(editOption));
         cut.InvokeAsync(() => modal.Instance.Close());
@@ -135,20 +153,12 @@ public class DialogTest : BootstrapBlazorTestBase
         };
 
         var model = new Foo() { Name = "Test" };
-#if NET5_0
-        var parameters = new Dictionary<string, object>()
-#else
         var parameters = new Dictionary<string, object?>()
-#endif
         {
             ["Field"] = "Name",
             ["FieldExpression"] = model.GenerateValueExpression()
         };
-#if NET5_0
-        var item = new EditorItem<string>();
-#else
         var item = new EditorItem<Foo, string>();
-#endif
         cut.InvokeAsync(() => item.SetParametersAsync(ParameterView.FromDictionary(parameters)));
         editOption.Items = new IEditorItem[]
         {
@@ -164,6 +174,10 @@ public class DialogTest : BootstrapBlazorTestBase
         editOption.DialogBodyTemplate = foo => builder => builder.AddContent(0, "test");
         cut.InvokeAsync(() => dialog.ShowEditDialog(editOption));
         form.Submit();
+
+        // Modal is Null
+        editOption.Model = null;
+        Assert.ThrowsAsync<InvalidOperationException>(() => dialog.ShowEditDialog(editOption));
         #endregion
 
         #region ShowModal