diff --git a/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs b/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs
index 34362f61906e89853ff920834a9fdaab68372e80..d58e301de00134da922965e990b3994e8d9185ba 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogCloseButton.cs
@@ -3,6 +3,7 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
 
 namespace BootstrapBlazor.Components;
 
@@ -11,9 +12,19 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class DialogCloseButton : Button
 {
+    /// <summary>
+    /// 获得/设置 按钮颜色
+    /// </summary>
+    [Parameter]
+    public override Color Color { get; set; } = Color.Secondary;
+
     [CascadingParameter]
     private Func<Task>? OnCloseAsync { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IStringLocalizer<ModalDialog>? Localizer { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -26,4 +37,15 @@ public partial class DialogCloseButton : Button
             OnClickWithoutRender = OnCloseAsync;
         }
     }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
+        ButtonIcon ??= "fa-solid fa-fw fa-xmark";
+        Text ??= Localizer[nameof(ModalDialog.CloseButtonText)];
+    }
 }
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogSaveButton.cs b/src/BootstrapBlazor/Components/Dialog/DialogSaveButton.cs
index 98e709656b2a1081c23129f27ed985bcec86be62..7fa8de5af854c3f395b53f6826f308d0be89abcc 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogSaveButton.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogSaveButton.cs
@@ -3,6 +3,7 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
 
 namespace BootstrapBlazor.Components;
 
@@ -11,6 +12,10 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 public partial class DialogSaveButton : Button
 {
+    [Inject]
+    [NotNull]
+    private IStringLocalizer<ModalDialog>? Localizer { get; set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -20,4 +25,15 @@ public partial class DialogSaveButton : Button
 
         ButtonType = ButtonType.Submit;
     }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
+        ButtonIcon ??= "fa-solid fa-floppy-disk";
+        Text ??= Localizer[nameof(ModalDialog.SaveButtonText)];
+    }
 }
diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
index 8a2b471c5c58d3ef45fdf0db5830f4fb74ee53ce..c333cdcf4117c34adef1dc2d6f3086b07ff38bc3 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
@@ -35,9 +35,11 @@
             </div>
         }
         <CascadingValue Name="BodyContext" Value="@BodyContext" IsFixed="true">
-            <div class="modal-body">
-                @RenderBodyTemplate()
-            </div>
+            <CascadingValue Value="OnClickClose" IsFixed="true">
+                <div class="modal-body">
+                    @RenderBodyTemplate()
+                </div>
+            </CascadingValue>
             @if (ShowFooter)
             {
                 <div class="modal-footer">
@@ -53,7 +55,12 @@
                     {
                         <Button Color="Color.Primary" Text="@SaveButtonText" Icon="fa-solid fa-fw fa-floppy-disk" OnClickWithoutRender="OnClickSave" />
                     }
-                    @FooterTemplate
+                    @if (FooterTemplate != null)
+                    {
+                        <CascadingValue Value="OnClickClose" IsFixed>
+                            @FooterTemplate
+                        </CascadingValue>
+                    }
                 </div>
             }
         </CascadingValue>