From e8e3e69a062536ffe1952eb3ba823f7581042e0f Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 2 May 2025 18:59:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20FooterContentT?=
 =?UTF-8?q?emplate=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Modal/ModalDialog.razor    | 6 ++++++
 src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
index fdad76028ed..657e49dd6d3 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor
@@ -50,6 +50,12 @@
                     @if (ShowFooter)
                     {
                         <div class="modal-footer">
+                            @if (FooterContentTemplate != null)
+                            {
+                                <div class="modal-footer-content">
+                                    @FooterContentTemplate
+                                </div>
+                            }
                             @if (ShowCloseButton)
                             {
                                 <Button Color="Color.Secondary" Text="@CloseButtonText" Icon="@CloseButtonIcon" OnClickWithoutRender="OnClickCloseAsync"></Button>
diff --git a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
index 4ea305c09c1..2839abf2664 100644
--- a/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Modal/ModalDialog.razor.cs
@@ -200,6 +200,12 @@ public partial class ModalDialog : IHandlerException
     [Parameter]
     public RenderFragment? FooterTemplate { get; set; }
 
+    /// <summary>
+    /// Gets or sets the footer content template. Default is null.
+    /// </summary>
+    [Parameter]
+    public RenderFragment? FooterContentTemplate { get; set; }
+
     /// <summary>
     /// 获得/设置 ModalHeader 组件
     /// </summary>

From 7e9dcb9e677e8a8868b23795d4fbd900a8915a9c Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Fri, 2 May 2025 19:06:25 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style:=20=E5=A2=9E=E5=8A=A0=20modal-footer-?=
 =?UTF-8?q?content=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Modal/Modal.razor.scss                | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.scss b/src/BootstrapBlazor/Components/Modal/Modal.razor.scss
index 2e90fc7a1be..1e3ff7866ed 100644
--- a/src/BootstrapBlazor/Components/Modal/Modal.razor.scss
+++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.scss
@@ -21,6 +21,18 @@
 
 .modal-footer {
     padding: 0.5rem 1rem;
+
+    .modal-footer-content {
+        flex-grow: 1;
+        min-width: 0;
+        width: 1%;
+        white-space: nowrap;
+        overflow: hidden;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        margin-inline-end: 1rem;
+    }
 }
 
 .modal-footer > * {

From c80ed5c516195a8e722324a11435710ae5aa33fd Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sat, 3 May 2025 09:43:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/ModalDialogTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/UnitTest/Components/ModalDialogTest.cs b/test/UnitTest/Components/ModalDialogTest.cs
index 2ac2ea49c7c..6049051833d 100644
--- a/test/UnitTest/Components/ModalDialogTest.cs
+++ b/test/UnitTest/Components/ModalDialogTest.cs
@@ -166,6 +166,7 @@ public void BodyContext_Ok()
             {
                 pb.AddChildContent<ModalDialog>(pb =>
                 {
+                    pb.Add(d => d.FooterContentTemplate, builder => builder.AddContent(0, "footer-content-template"));
                     pb.Add(d => d.BodyContext, new Foo() { Name = "Test_BodyContext" });
                     pb.Add(d => d.BodyTemplate, BootstrapDynamicComponent.CreateComponent<MockModalDialogContentComponent>().Render());
                 });
@@ -174,6 +175,7 @@ public void BodyContext_Ok()
         var content = cut.FindComponent<MockModalDialogContentComponent>().Instance;
         var f = content.Context as Foo;
         Assert.Equal("Test_BodyContext", f!.Name);
+        cut.Contains("footer-content-template");
     }
 
     [Fact]

From bb8d08c15495a26dcd1167fbceb96f32aa8551ec Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sat, 3 May 2025 10:14:39 +0800
Subject: [PATCH 4/4] chore: bump version 9.6.1-beta01

Co-Authored-By: FelixYe <131856535+hongfei-ye@users.noreply.github.com>
---
 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 1a7f7ef8660..0e6eb0e364b 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.1-beta02</Version>
+    <Version>9.6.1-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup>