diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs
index c33cc60a786..31c479fa6bb 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs
@@ -17,7 +17,9 @@ public partial class EditDialog<TModel>
     /// 获得/设置 保存回调委托
     /// </summary>
     [Parameter]
-    [NotNull]
+#if NET6_0_OR_GREATER
+    [EditorRequired]
+#endif
     public Func<EditContext, Task>? OnSaveAsync { get; set; }
 
     /// <summary>
@@ -85,11 +87,6 @@ protected override void OnParametersSet()
         SaveButtonText ??= Localizer[nameof(SaveButtonText)];
     }
 
-    private async Task OnClickClose()
-    {
-        if (OnCloseAsync != null) await OnCloseAsync();
-    }
-
     private async Task OnValidSubmitAsync(EditContext context)
     {
         if (OnSaveAsync != null)
@@ -117,21 +114,15 @@ public async ValueTask ToggleLoading(bool state)
     {
         if (FooterTemplate != null)
         {
-            builder.OpenComponent<CascadingValue<Func<Task>?>>(0);
-            builder.AddAttribute(1, nameof(CascadingValue<Func<Task>?>.Value), OnCloseAsync);
-            builder.AddAttribute(2, nameof(CascadingValue<Func<Task>?>.IsFixed), true);
-            builder.AddAttribute(3, nameof(CascadingValue<Func<Task>?>.ChildContent), FooterTemplate(Model));
-            builder.CloseComponent();
+            builder.AddContent(1, FooterTemplate(Model));
         }
         else
         {
             if (!IsTracking)
             {
-                builder.OpenComponent<Button>(20);
-                builder.AddAttribute(21, nameof(Button.Color), Color.Secondary);
-                builder.AddAttribute(22, nameof(Button.Icon), "fa-solid fa-xmark");
-                builder.AddAttribute(23, nameof(Button.Text), CloseButtonText);
-                builder.AddAttribute(24, nameof(Button.OnClickWithoutRender), OnClickClose);
+                builder.OpenComponent<DialogCloseButton>(20);
+                builder.AddAttribute(21, nameof(Button.Text), CloseButtonText);
+                builder.AddAttribute(22, nameof(Button.OnClickWithoutRender), OnCloseAsync);
                 builder.CloseComponent();
             }
             builder.OpenComponent<Button>(30);
diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
index 53851cdeea3..7338eb15a03 100644
--- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
@@ -66,10 +66,7 @@ public static async Task ShowEditDialog<TModel>(this DialogService service, Edit
             [nameof(EditDialog<TModel>.ShowLoading)] = option.ShowLoading,
             [nameof(EditDialog<TModel>.ShowLabel)] = option.ShowLabel,
             [nameof(EditDialog<TModel>.Items)] = option.Items ?? Utility.GenerateColumns<TModel>(item => item.Editable),
-            [nameof(EditDialog<TModel>.OnCloseAsync)] = new Func<Task>(async () =>
-            {
-                await option.Dialog.Close();
-            }),
+            [nameof(EditDialog<TModel>.OnCloseAsync)] = option.OnCloseAsync,
             [nameof(EditDialog<TModel>.OnSaveAsync)] = new Func<EditContext, Task>(async context =>
             {
                 if (option.OnEditAsync != null)