diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor
index df16854f3d2..62e2915e225 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor
@@ -107,6 +107,43 @@
     </Table>
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["TablesKeepAddingTitle"]" Introduction="@Localizer["TablesKeepAddingIntro"]" Name="KeepAdding">
+    <section ignore>
+        <p>@((MarkupString)Localizer["TablesKeepAddingDescription"].Value)</p>
+        <p>@((MarkupString)Localizer["TablesKeepAddingTips"].Value)</p>
+    </section>
+    <Table TItem="Foo" @bind-Items="KeepAddingItems" ShowKeepAddingButton="true"
+           IsStriped="true" IsBordered="true" IsMultipleSelect="true"
+           ShowToolbar="true" ShowExtendButtons="true" ShowSkeleton="true"
+           OnAddAsync="OnKeepAddAsync"
+           OnKeepAddingAsync="@OnKeepAddingAsync">
+        <TableColumns>
+            <TableColumn @bind-Field="@context.DateTime" Width="180" />
+            <TableColumn @bind-Field="@context.Name" />
+            <TableColumn @bind-Field="@context.Address" />
+            <TableColumn @bind-Field="@context.Count" />
+            <TableColumn @bind-Field="@context.Complete" />
+        </TableColumns>
+    </Table>
+
+    <section ignore>
+        <p>@((MarkupString)Localizer["TablesKeepAddingDrawerDescription"].Value)</p>
+    </section>
+    <Table TItem="Foo" @bind-Items="KeepAddingDrawerItems" ShowKeepAddingButton="true" EditMode="EditMode.Drawer"
+           IsStriped="true" IsBordered="true" IsMultipleSelect="true"
+           ShowToolbar="true" ShowExtendButtons="true" ShowSkeleton="true"
+           OnAddAsync="OnKeepAddAsync"
+           OnKeepAddingAsync="@OnKeepAddingAsync">
+        <TableColumns>
+            <TableColumn @bind-Field="@context.DateTime" Width="180" />
+            <TableColumn @bind-Field="@context.Name" />
+            <TableColumn @bind-Field="@context.Address" />
+            <TableColumn @bind-Field="@context.Count" />
+            <TableColumn @bind-Field="@context.Complete" />
+        </TableColumns>
+    </Table>
+</DemoBlock>
+
 <DemoBlock Title="@Localizer["TablesColumnEditTemplateTitle"]" Introduction="@Localizer["TablesColumnEditTemplateIntro"]" Name="ColumnEditTemplate">
     <section ignore>
         <div>@((MarkupString)Localizer["TablesColumnEditTemplateDescription1"].Value)</div>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor.cs
index e24d544beec..4754e75edfe 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor.cs
@@ -32,6 +32,12 @@ public partial class TablesEdit
     [NotNull]
     private IEnumerable<Foo>? BindItems { get; set; }
 
+    [NotNull]
+    private IEnumerable<Foo>? KeepAddingItems { get; set; }
+
+    [NotNull]
+    private IEnumerable<Foo>? KeepAddingDrawerItems { get; set; }
+
     private InsertRowMode InsertMode { get; set; } = InsertRowMode.Last;
 
     private string? PlaceHolderString { get; set; }
@@ -58,10 +64,44 @@ protected override void OnInitialized()
         CustomerDataService = new FooDataService<Foo>(FooLocalizer);
         BindItems = Foo.GenerateFoo(FooLocalizer).Take(5).ToList();
         PlaceHolderString ??= Localizer["TablesEditShowSearchPlaceHolderString"];
+
+        var keepAddingItems = Foo.GenerateFoo(FooLocalizer, 4);
+
+        // 数量列从 0 开始 便于观察连续新增时数量递增的效果
+        keepAddingItems.ForEach(i => i.Count = 0);
+        KeepAddingItems = keepAddingItems;
+
+        var keepAddingDrawerItems = Foo.GenerateFoo(FooLocalizer, 4);
+        keepAddingDrawerItems.ForEach(i => i.Count = 0);
+        KeepAddingDrawerItems = keepAddingDrawerItems;
     }
 
     private Task<Foo> OnAddAsync() => Task.FromResult(new Foo() { Id = GenerateId(), DateTime = DateTime.Now, Address = $"Custom address  {DateTime.Now.Second}" });
 
+    private Task<Foo> OnKeepAddAsync() => Task.FromResult(Foo.Generate(FooLocalizer));
+
+    /// <summary>
+    /// 点击「保存并新增」按钮时基于上一条已保存数据创建下一条模型 数量 +10
+    /// </summary>
+    /// <param name="lastModel">刚刚保存成功的模型实例</param>
+    private static async Task<Foo> OnKeepAddingAsync(Foo lastModel)
+    {
+        // 模拟延时
+        await Task.Delay(10);
+
+        return new Foo()
+        {
+            Id = lastModel.Id + 1,
+            DateTime = lastModel.DateTime,
+            Name = lastModel.Name,
+            Address = lastModel.Address,
+            Complete = lastModel.Complete,
+            Education = lastModel.Education,
+            Hobby = lastModel.Hobby,
+            Count = lastModel.Count + 10
+        };
+    }
+
     private int GenerateId()
     {
         var id = Items.Count;
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index 0ca7e2778b8..caba3e897cd 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -5066,6 +5066,11 @@
     "TablesEditTemplateIntro": "Set <code>ShowSearch</code> to show the query component",
     "TablesEditTemplateTitle": "Tables with single table maintenance",
     "TablesEditTitle": "Table",
+    "TablesKeepAddingDescription": "The next item is created by the <code>OnKeepAddingAsync</code> callback whose parameter is the model saved just now. In this example the <code>Count</code> of the new item is the <code>Count</code> of the previous item plus 10",
+    "TablesKeepAddingDrawerDescription": "The table below uses <code>EditMode.Drawer</code>, and keep adding behaves exactly the same as in dialog mode",
+    "TablesKeepAddingIntro": "Set <code>ShowKeepAddingButton</code> to show the <b>Save and Add</b> button in the <b>New</b> dialog/drawer footer. Clicking it saves the current item and keeps the UI open, and the next item is created by the <code>OnKeepAddingAsync</code> callback for continuous input",
+    "TablesKeepAddingTips": "Note: when the <code>OnKeepAddingAsync</code> callback is not set, the component falls back to the <code>OnAddAsync</code> callback, <code>CreateItemCallback</code> and the <code>AddAsync</code> method of the injected <code>IDataService</code> in order, which is the same as before, except that the <code>OnKeepAddingAsync</code> callback has the highest priority",
+    "TablesKeepAddingTitle": "Keep adding",
     "TablesReadonlyColumnDescription": "Corresponding database calculated columns, or model read-only attributes",
     "TablesReadonlyColumnIntro": "By setting <code>Field</code> and <code>FieldName</code>",
     "TablesReadonlyColumnTips1": "Do not write <code>@bind-Field</code>. Read-only columns cannot be entered when <b>Add</b> or <b>Edit</b>",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index 58547c207b0..2ad776c2d8d 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -5066,6 +5066,11 @@
     "TablesEditTemplateIntro": "通过设置 <code>EditTemplate</code> 自定义编辑弹窗，<code>10.0.1</code> 版本后支持联动功能",
     "TablesEditTemplateTitle": "具有单表维护功能的表格",
     "TablesEditTitle": "Table 表格",
+    "TablesKeepAddingDescription": "下一条数据由 <code>OnKeepAddingAsync</code> 回调创建，回调参数为刚刚保存成功的模型实例；本示例中新数据的 <code>Count</code> 为上一笔数据的 <code>Count</code> 加 10",
+    "TablesKeepAddingDrawerDescription": "下表中 <code>EditMode</code> 为 <code>Drawer</code>，连续新增在抽屉模式下具有与弹窗模式完全一致的行为",
+    "TablesKeepAddingIntro": "设置 <code>ShowKeepAddingButton</code> 在 <b>新建</b> 弹窗/抽屉 Footer 中显示 <b>保存并新增</b> 按钮，点击后先保存当前数据并保持界面打开，下一条数据由 <code>OnKeepAddingAsync</code> 回调创建以便连续录入",
+    "TablesKeepAddingTips": "注意：未设置 <code>OnKeepAddingAsync</code> 回调时，组件依次回落调用 <code>OnAddAsync</code>、<code>CreateItemCallback</code> 以及注入服务 <code>IDataService</code> 的 <code>AddAsync</code> 方法，此处知识点与以前一致，仅优先执行 <code>OnKeepAddingAsync</code> 回调",
+    "TablesKeepAddingTitle": "连续新增",
     "TablesReadonlyColumnDescription": "对应数据库计算列，或者模型只读属性",
     "TablesReadonlyColumnIntro": "通过设置 <code>Field</code> 与 <code>FieldName</code> 即可",
     "TablesReadonlyColumnTips1": "不要写 <code>@bind-Field</code> 只读列在 <b>新建</b> 或者 <b>编辑</b> 时均无法录入",
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 00d482fedc4..6903cd84772 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>11.0.1-beta02</Version>
+    <Version>11.0.1-beta03</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
index 4591eee23fa..f59eb24c7e5 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
@@ -3,14 +3,15 @@
 @inherits DialogBase<TModel>
 @attribute [BootstrapModuleAutoLoader("Dialog/EditDialog.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)]
 
-<ValidateForm Model="@Model" OnValidSubmit="@OnValidSubmitAsync" LabelWidth="@LabelWidth"
+<ValidateForm Model="@_currentModel" OnValidSubmit="@OnValidSubmitAsync"
+              OnInvalidSubmit="@OnInvalidSubmitAsync" LabelWidth="@LabelWidth"
               OnFieldValueChanged="OnFieldValueChanged"
               DisableAutoSubmitFormByEnter="@DisableAutoSubmitFormByEnter">
     <CascadingValue Value="ItemChangedType" IsFixed="true">
         @if (BodyTemplate != null)
         {
             <div class="form-body">
-                @BodyTemplate(Model)
+                @BodyTemplate(_currentModel)
             </div>
             <div class="form-footer">
                 @RenderFooter
@@ -32,3 +33,34 @@
         </div>
     </CascadingValue>
 </ValidateForm>
+
+@code {
+    /// <summary>
+    /// <para lang="zh">获得 编辑弹窗 Footer 内容</para>
+    /// <para lang="en">Gets the Footer content of the edit dialog</para>
+    /// </summary>
+    private RenderFragment RenderFooter => @<text>
+        @if (FooterTemplate != null)
+        {
+            @FooterTemplate(_currentModel)
+        }
+        else
+        {
+            @if (!IsTracking)
+            {
+                <DialogCloseButton Icon="@CloseButtonIcon" Text="@CloseButtonText" OnClickWithoutRender="OnCloseAsync" />
+            }
+
+            @* 「保存并新增」先于主保存按钮渲染 作为表单默认按钮 未禁用回车提交时按「保存并新增」处理 *@
+            @if (IsKeepAdding)
+            {
+                <Button Color="@KeepAddingButtonColor" Icon="@KeepAddingButtonIcon" Text="@KeepAddingButtonText"
+                        ButtonType="ButtonType.Submit" IsAsync="true" OnClick="OnKeepAddingClick" />
+            }
+
+            @* 主保存按钮 逻辑与原有保存按钮一致 保存成功后关闭弹窗 *@
+            <Button Color="Color.Primary" Icon="@SaveButtonIcon" Text="@SaveButtonText"
+                    ButtonType="ButtonType.Submit" IsAsync="true" OnClick="@OnSaveClick" />
+        }
+    </text>;
+}
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs
index 8a5b2038403..1a5d49470e0 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor.cs
@@ -12,7 +12,7 @@ namespace BootstrapBlazor.Components;
 /// <para lang="zh">编辑弹窗组件</para>
 /// <para lang="en">Edit Dialog Component</para>
 /// </summary>
-public partial class EditDialog<TModel>
+public partial class EditDialog<TModel> where TModel : class
 {
     /// <summary>
     /// <para lang="zh">获得/设置 查询时是否显示正在加载中动画 默认为 false</para>
@@ -47,6 +47,10 @@ public partial class EditDialog<TModel>
     /// <para lang="en">Gets or sets Save Button Text</para>
     /// <para><version>10.3.3</version></para>
     /// </summary>
+    /// <remarks>
+    /// <para lang="zh">未赋值时读取资源文件 默认文本为「保存」 <see cref="ShowKeepAddingButton"/> 为 true 时默认为「保存并关闭」</para>
+    /// <para lang="en">Read from resource file when not set. The default text is "Save", or "Save and Close" when <see cref="ShowKeepAddingButton"/> is true</para>
+    /// </remarks>
     [Parameter]
     public string? SaveButtonText { get; set; }
 
@@ -74,6 +78,60 @@ public partial class EditDialog<TModel>
     [EditorRequired]
     public Func<EditContext, Task<bool>>? OnSaveAsync { get; set; }
 
+    /// <summary>
+    /// <para lang="zh">获得/设置 是否在 Footer 中显示「保存并新增」按钮 默认为 false</para>
+    /// <para lang="en">Gets or sets whether to show the "Save and Add" button in the Footer. Default is false</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    /// <remarks>
+    /// <para lang="zh">点击「保存并新增」按钮时先保存当前编辑模型，保存成功后调用 <see cref="OnKeepAddingAsync"/> 创建下一条数据模型并重新绑定表单，弹窗/抽屉保持打开状态以便连续录入</para>
+    /// <para lang="en">Clicking the "Save and Add" button saves the current edit model first, then calls <see cref="OnKeepAddingAsync"/> to create the next model and rebinds the form while keeping the dialog/drawer open for continuous input</para>
+    /// <para lang="zh">未设置 <see cref="OnKeepAddingAsync"/> 时点击该按钮等同于点击主保存按钮 保存成功后直接关闭弹窗/抽屉</para>
+    /// <para lang="en">When <see cref="OnKeepAddingAsync"/> is not set, clicking this button behaves the same as the main save button and the dialog/drawer is closed after saving successfully</para>
+    /// <para lang="zh">「保存并新增」按钮位于主保存按钮之前 并作为表单默认按钮 因此在未禁用回车提交（<see cref="DisableAutoSubmitFormByEnter"/>）时 输入框内回车提交等价于点击「保存并新增」</para>
+    /// <para lang="en">The "Save and Add" button is rendered before the main save button as the form default button, so pressing Enter inside an input equals clicking "Save and Add" unless Enter submission is disabled by <see cref="DisableAutoSubmitFormByEnter"/></para>
+    /// </remarks>
+    [Parameter]
+    public bool ShowKeepAddingButton { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮文本 默认 null 读取资源文件设置文本</para>
+    /// <para lang="en">Gets or sets the "Save and Add" button text. Default is null (Read from resource file)</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    [Parameter]
+    public string? KeepAddingButtonText { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮图标 默认 null 使用当前主题图标</para>
+    /// <para lang="en">Gets or sets the "Save and Add" button icon. Default is null (Use current theme icon)</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    [Parameter]
+    public string? KeepAddingButtonIcon { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮颜色 默认 <see cref="Color.Info"/></para>
+    /// <para lang="en">Gets or sets the "Save and Add" button color. Default is <see cref="Color.Info"/></para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    [Parameter]
+    public Color KeepAddingButtonColor { get; set; } = Color.Info;
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 点击「保存并新增」按钮保存成功后创建下一个编辑模型的回调方法 参数为刚刚保存成功的模型实例</para>
+    /// <para lang="en">Gets or sets the callback which creates the next edit model after the "Save and Add" button saved successfully. The parameter is the model saved just now</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    /// <remarks>
+    /// <para lang="zh">参数为刚刚保存成功的模型实例，如需修改请克隆或者新建实例，避免直接修改该实例以免影响已保存的数据</para>
+    /// <para lang="en">The parameter is the model saved just now. Please clone it or create a new instance if you want to modify it, in case the saved data is affected</para>
+    /// <para lang="zh">回调必须返回非空模型实例，返回 null 时表单内容将被清空</para>
+    /// <para lang="en">The callback must return a non-null model, otherwise the form content is cleared</para>
+    /// </remarks>
+    [Parameter]
+    public Func<TModel, Task<TModel>>? OnKeepAddingAsync { get; set; }
+
     /// <summary>
     /// <para lang="zh">获得/设置 关闭按钮图标</para>
     /// <para lang="en">Gets or sets Close Button Icon</para>
@@ -147,6 +205,16 @@ public partial class EditDialog<TModel>
 
     private bool _hasFieldValueChanged;
 
+    private bool _isSubmitting;
+
+    private bool _isDisposed;
+
+    private bool _keepAddingRequested;
+
+    private TModel? _parameterModel;
+
+    private TModel _currentModel = default!;
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -170,11 +238,25 @@ protected override void OnParametersSet()
             throw new InvalidOperationException($"参数 {nameof(Model)} 未赋值; {nameof(Model)} can not be null.");
         }
 
+        if (_parameterModel != Model)
+        {
+            // 父层重渲染会反复下发 Model 参数 仅在 Model 真正变化时重新绑定
+            // 避免把「保存并新增」已经切换的下一条模型打回旧值
+            _parameterModel = Model;
+            _currentModel = Model;
+            _hasFieldValueChanged = false;
+        }
+
         CloseButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.DialogCloseButtonIcon);
         SaveButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.DialogSaveButtonIcon);
+        KeepAddingButtonIcon ??= IconTheme.GetIconByKey(ComponentIcons.DialogKeepAddingButtonIcon);
 
         CloseButtonText ??= Localizer[nameof(CloseButtonText)];
-        SaveButtonText ??= Localizer[nameof(SaveButtonText)];
+
+        // 连续新增模式下主保存按钮语义为「保存并关闭」 其它情况保持原有「保存」文本
+        SaveButtonText ??= ShowKeepAddingButton ? Localizer["SaveAndCloseButtonText"] : Localizer[nameof(SaveButtonText)];
+
+        KeepAddingButtonText ??= Localizer[nameof(KeepAddingButtonText)];
 
         CloseConfirmTitle ??= Localizer[nameof(CloseConfirmTitle)];
         CloseConfirmContent ??= Localizer[nameof(CloseConfirmContent)];
@@ -204,24 +286,75 @@ private async Task<bool> OnClosingCallback()
 
     private async Task OnValidSubmitAsync(EditContext context)
     {
-        if (OnSaveAsync != null)
+        if (_isDisposed || _isSubmitting || OnSaveAsync == null)
+        {
+            return;
+        }
+
+        // 记录本次提交是否为「保存并新增」 并立即复位防止下次提交沿用
+        var keepAdding = _keepAddingRequested;
+        _keepAddingRequested = false;
+        _isSubmitting = true;
+        try
         {
             await ToggleLoading(true);
             var save = await OnSaveAsync(context);
             await ToggleLoading(false);
 
-            if (save)
+            if (!save)
+            {
+                // 保存失败时保持弹窗打开状态
+                return;
+            }
+
+            _hasFieldValueChanged = false;
+            if (keepAdding && OnKeepAddingAsync != null)
             {
-                _hasFieldValueChanged = false;
+                _currentModel = await OnKeepAddingAsync(_currentModel);
+                return;
             }
 
-            if (save && CloseAsync != null)
+            // 非「保存并新增」提交 保存成功后关闭弹窗
+            if (CloseAsync != null)
             {
                 await CloseAsync();
             }
         }
+        finally
+        {
+            _isSubmitting = false;
+            if (!_isDisposed)
+            {
+                await InvokeAsync(StateHasChanged);
+            }
+        }
     }
 
+    private Task OnInvalidSubmitAsync(EditContext context)
+    {
+        // 验证失败时复位「保存并新增」标记
+        _keepAddingRequested = false;
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// <para lang="zh">点击「保存并新增」按钮时置位「保存并新增」标记 本次提交保存成功后将保持弹窗打开并创建下一条数据模型</para>
+    /// <para lang="en">Sets the "Save and Add" flag when the "Save and Add" button is clicked. After this submission is saved successfully the dialog stays open and the next data model is created</para>
+    /// </summary>
+    private void OnKeepAddingClick() => _keepAddingRequested = true;
+
+    /// <summary>
+    /// <para lang="zh">点击主保存按钮时复位「保存并新增」标记 确保主保存按钮始终按「保存并关闭」处理 不受上一次点击残留标记的影响</para>
+    /// <para lang="en">Resets the "Save and Add" flag when the main save button is clicked so that the main save button always behaves as "Save and Close", unaffected by a leftover flag from the previous click</para>
+    /// </summary>
+    private void OnSaveClick() => _keepAddingRequested = false;
+
+    /// <summary>
+    /// <para lang="zh">获得 是否显示「保存并新增」按钮 <see cref="ShowKeepAddingButton"/> 为 true 且非 Tracking 模式时为 true</para>
+    /// <para lang="en">Gets whether to show the "Save and Add" button. It is true when <see cref="ShowKeepAddingButton"/> is true and <see cref="IsTracking"/> is false</para>
+    /// </summary>
+    private bool IsKeepAdding => ShowKeepAddingButton && !IsTracking;
+
     private void OnFieldValueChanged(string fieldName, object? value)
     {
         _hasFieldValueChanged = true;
@@ -240,32 +373,6 @@ public async ValueTask ToggleLoading(bool state)
         }
     }
 
-    private RenderFragment RenderFooter => builder =>
-    {
-        if (FooterTemplate != null)
-        {
-            builder.AddContent(1, FooterTemplate(Model));
-        }
-        else
-        {
-            if (!IsTracking)
-            {
-                builder.OpenComponent<DialogCloseButton>(20);
-                builder.AddAttribute(21, nameof(Button.Icon), CloseButtonIcon);
-                builder.AddAttribute(22, nameof(Button.Text), CloseButtonText);
-                builder.AddAttribute(23, nameof(Button.OnClickWithoutRender), OnCloseAsync);
-                builder.CloseComponent();
-            }
-            builder.OpenComponent<Button>(30);
-            builder.AddAttribute(31, nameof(Button.Color), Color.Primary);
-            builder.AddAttribute(32, nameof(Button.Icon), SaveButtonIcon);
-            builder.AddAttribute(33, nameof(Button.Text), SaveButtonText);
-            builder.AddAttribute(34, nameof(Button.ButtonType), ButtonType.Submit);
-            builder.AddAttribute(35, nameof(Button.IsAsync), true);
-            builder.CloseComponent();
-        }
-    };
-
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -274,6 +381,7 @@ protected override async ValueTask DisposeAsync(bool disposing)
     {
         if (disposing)
         {
+            _isDisposed = true;
             Modal?.UnRegisterOnClosingCallback(OnClosingCallback);
         }
 
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs b/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs
index afd43ad536d..0ff774820a6 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialogOption.cs
@@ -98,6 +98,36 @@ public EditDialogOption()
     /// </summary>
     public Func<EditContext, Task<bool>>? OnEditAsync { get; set; }
 
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.ShowKeepAddingButton"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public bool ShowKeepAddingButton { get; set; }
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.KeepAddingButtonText"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public string? KeepAddingButtonText { get; set; }
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.KeepAddingButtonIcon"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public string? KeepAddingButtonIcon { get; set; }
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.KeepAddingButtonColor"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public Color KeepAddingButtonColor { get; set; } = Color.Info;
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.OnKeepAddingAsync"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public Func<TModel, Task<TModel>>? OnKeepAddingAsync { get; set; }
+
     /// <summary>
     /// <inheritdoc cref="ITableEditDialogOption{TModel}.ShowConfirmCloseSwal"/>
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs b/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs
index 023838a3ff6..16ad3ac4586 100644
--- a/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs
+++ b/src/BootstrapBlazor/Components/Table/ITableEditDialogOption.cs
@@ -91,6 +91,41 @@ public interface ITableEditDialogOption<TModel>
     /// </summary>
     string? SaveButtonIcon { get; set; }
 
+    /// <summary>
+    /// <para lang="zh">获得/设置 是否在 Footer 中显示「保存并新增」按钮 默认为 false</para>
+    /// <para lang="en">Gets or sets whether to show the "Save and Add" button in the Footer. Default is false</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    bool ShowKeepAddingButton { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮文本</para>
+    /// <para lang="en">Gets or sets the "Save and Add" button text</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    string? KeepAddingButtonText { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮图标 默认 null 使用当前主题图标</para>
+    /// <para lang="en">Gets or sets the "Save and Add" button icon. Default is null, using the current theme icon</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    string? KeepAddingButtonIcon { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮颜色 默认 <see cref="Color.Info"/></para>
+    /// <para lang="en">Gets or sets the "Save and Add" button color. Default is <see cref="Color.Info"/></para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    Color KeepAddingButtonColor { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 点击「保存并新增」按钮保存成功后创建下一个编辑模型的回调方法 参数为刚刚保存成功的模型实例</para>
+    /// <para lang="en">Gets or sets the callback which creates the next edit model after the "Save and Add" button saved successfully. The parameter is the model saved just now</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    Func<TModel, Task<TModel>>? OnKeepAddingAsync { get; set; }
+
     /// <summary>
     /// <para lang="zh">获得/设置 关闭按钮文本</para>
     /// <para lang="en">Gets or sets close button text</para>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
index c19cd8ef620..54946a2072a 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -38,6 +38,60 @@ public partial class Table<TItem>
     [Parameter]
     public bool ShowAddButton { get; set; } = true;
 
+    /// <summary>
+    /// <para lang="zh">获得/设置 是否显示「保存并新增」按钮 默认为 false 仅在 <see cref="EditMode.Popup"/> 弹窗与 <see cref="EditMode.Drawer"/> 抽屉模式下的新建界面中生效</para>
+    /// <para lang="en">Gets or sets whether to show the "Save and Add" button. Default false. Only works for the add dialog/drawer in <see cref="EditMode.Popup"/> and <see cref="EditMode.Drawer"/> modes</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    /// <remarks>
+    /// <para lang="zh">开启后新建编辑弹窗/抽屉的 Footer 中会显示「保存并新增」按钮，点击时先保存当前数据，保存成功后保持编辑界面打开并调用 <see cref="OnKeepAddingAsync"/> 创建下一条数据继续录入</para>
+    /// <para lang="en">When enabled, a "Save and Add" button is shown in the Footer of the add edit dialog/drawer. Clicking it saves the current item, keeps the edit UI open and calls <see cref="OnKeepAddingAsync"/> to create the next item for continuous input</para>
+    /// <para lang="zh">未设置 <see cref="OnKeepAddingAsync"/> 时使用 <see cref="OnAddAsync"/> 创建下一条数据</para>
+    /// <para lang="en">Use <see cref="OnAddAsync"/> to create the next item when <see cref="OnKeepAddingAsync"/> is not set</para>
+    /// </remarks>
+    [Parameter]
+    public bool ShowKeepAddingButton { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮文本 默认 null 读取资源文件设置文本</para>
+    /// <para lang="en">Gets or sets the "Save and Add" button text. Default null (Read from resource file)</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    [Parameter]
+    public string? KeepAddingButtonText { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮图标 默认 null 使用当前主题图标</para>
+    /// <para lang="en">Gets or sets the "Save and Add" button icon. Default null (Use current theme icon)</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    [Parameter]
+    public string? KeepAddingButtonIcon { get; set; }
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 「保存并新增」按钮颜色 默认 <see cref="Color.Info"/></para>
+    /// <para lang="en">Gets or sets the "Save and Add" button color. Default is <see cref="Color.Info"/></para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    [Parameter]
+    public Color KeepAddingButtonColor { get; set; } = Color.Info;
+
+    /// <summary>
+    /// <para lang="zh">获得/设置 连续新增时创建下一个编辑模型的回调方法 参数为刚刚保存成功的模型实例 默认 null 未设置时使用 <see cref="OnAddAsync"/> 创建</para>
+    /// <para lang="en">Gets or sets the callback which creates the next edit model when keep adding. The parameter is the model saved just now. Default null, use <see cref="OnAddAsync"/> when it is not set</para>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    /// <remarks>
+    /// <para lang="zh">仅在 <see cref="ShowKeepAddingButton"/> 为 true 时生效，可基于上一条已保存数据预填下一条数据，例如数量递增、沿用上一次的类别等</para>
+    /// <para lang="en">Only works when <see cref="ShowKeepAddingButton"/> is true. It can prefill the next item from the saved one, such as increasing the count or reusing the previous category</para>
+    /// <para lang="zh">参数为刚刚保存成功的模型实例，如需修改请克隆或者新建实例，避免直接修改该实例以免影响已保存的数据</para>
+    /// <para lang="en">The parameter is the model saved just now. Please clone it or create a new instance if you want to modify it, in case the saved data is affected</para>
+    /// <para lang="zh">回调必须返回非空模型实例，返回 null 时表单内容将被清空</para>
+    /// <para lang="en">The callback must return a non-null model, otherwise the form content is cleared</para>
+    /// </remarks>
+    [Parameter]
+    public Func<TItem, Task<TItem>>? OnKeepAddingAsync { get; set; }
+
     /// <summary>
     /// <para lang="zh">获得/设置 是否显示编辑按钮 默认为 true 行内是否显示请使用 <see cref="ShowExtendEditButton"/> 与 <see cref="ShowExtendEditButtonCallback" /></para>
     /// <para lang="en">Gets or sets Whether to show Edit Button. Default true. Use <see cref="ShowExtendEditButton"/> and <see cref="ShowExtendEditButtonCallback" /> for in-row display</para>
@@ -992,9 +1046,70 @@ protected async Task ShowEditDialog(ItemChangedType changedType)
             }
         };
         AppendOptions(option, changedType);
+
+        AppendKeepAddingOptions(option, changedType, () =>
+        {
+            saved = false;
+            triggerFromSave = false;
+        });
         await DialogService.ShowEditDialog(option, EditDialog);
     }
 
+    /// <summary>
+    /// <para lang="zh">追加「保存并新增」相关配置 仅在新建弹窗/抽屉中生效</para>
+    /// <para lang="en">Appends the "Save and Add" related options. Only works for the add dialog/drawer</para>
+    /// </summary>
+    /// <param name="option">
+    ///   <para lang="zh">编辑配置类实例</para>
+    ///   <para lang="en">Edit option instance</para>
+    /// </param>
+    /// <param name="changedType">
+    ///   <para lang="zh">编辑类型</para>
+    ///   <para lang="en">Item changed type</para>
+    /// </param>
+    /// <param name="notifyKeepAdding">
+    ///   <para lang="zh">创建下一条数据之前的回调方法 用于复位是否已保存标记</para>
+    ///   <para lang="en">Callback invoked before the next item is created, used to reset the saved flag</para>
+    /// </param>
+    private void AppendKeepAddingOptions(ITableEditDialogOption<TItem> option, ItemChangedType changedType, Action notifyKeepAdding)
+    {
+        option.ShowKeepAddingButton = ShowKeepAddingButton && changedType == ItemChangedType.Add;
+        if (option.ShowKeepAddingButton)
+        {
+            option.KeepAddingButtonText = KeepAddingButtonText;
+            option.KeepAddingButtonIcon = KeepAddingButtonIcon;
+            option.KeepAddingButtonColor = KeepAddingButtonColor;
+            option.OnKeepAddingAsync = async lastModel =>
+            {
+                notifyKeepAdding();
+                return await CreateNextEditModelAsync(lastModel);
+            };
+        }
+    }
+
+    /// <summary>
+    /// <para lang="zh">连续新增时创建下一条编辑模型 未设置 <see cref="OnKeepAddingAsync"/> 时回退使用 <see cref="OnAddAsync"/> 回调创建</para>
+    /// <para lang="en">Creates the next edit model for keep adding. Falls back to the <see cref="OnAddAsync"/> callback when <see cref="OnKeepAddingAsync"/> is not set</para>
+    /// </summary>
+    /// <param name="lastModel">上一条已保存成功的模型实例</param>
+    private async Task<TItem> CreateNextEditModelAsync(TItem lastModel)
+    {
+        var model = default(TItem);
+        if (OnKeepAddingAsync != null)
+        {
+            SelectedRows.Clear();
+            model = await OnKeepAddingAsync(lastModel);
+        }
+        else
+        {
+            await InternalOnAddAsync();
+            model = EditModel ?? throw new InvalidOperationException($"{nameof(OnAddAsync)} must return a non-null model.");
+        }
+
+        await OnSelectedRowsChanged();
+        return model;
+    }
+
     /// <summary>
     /// <para lang="zh">弹出编辑抽屉方法</para>
     /// <para lang="en">Show Edit Drawer Method</para>
@@ -1023,6 +1138,8 @@ protected async Task ShowEditDrawer(ItemChangedType changedType)
         };
         AppendOptions(editOption, changedType);
 
+        AppendKeepAddingOptions(editOption, changedType, () => saved = false);
+
         var option = new DrawerOption()
         {
             Class = "drawer-table-edit",
diff --git a/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs b/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs
index 9eba8849cb3..38489d6cd31 100644
--- a/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs
+++ b/src/BootstrapBlazor/Components/Table/TableEditDrawerOption.cs
@@ -113,6 +113,36 @@ public class TableEditDrawerOption<TModel> : ITableEditDialogOption<TModel>
     /// </summary>
     public Func<EditContext, Task<bool>>? OnEditAsync { get; set; }
 
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.ShowKeepAddingButton"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public bool ShowKeepAddingButton { get; set; }
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.KeepAddingButtonText"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public string? KeepAddingButtonText { get; set; }
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.KeepAddingButtonIcon"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public string? KeepAddingButtonIcon { get; set; }
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.KeepAddingButtonColor"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public Color KeepAddingButtonColor { get; set; } = Color.Info;
+
+    /// <summary>
+    /// <inheritdoc cref="ITableEditDialogOption{TModel}.OnKeepAddingAsync"/>
+    /// <para>v<version>11.0.1</version></para>
+    /// </summary>
+    public Func<TModel, Task<TModel>>? OnKeepAddingAsync { get; set; }
+
     /// <summary>
     /// <inheritdoc cref="ITableEditDialogOption{TModel}.ShowConfirmCloseSwal"/>
     /// </summary>
diff --git a/src/BootstrapBlazor/Enums/ComponentIcons.cs b/src/BootstrapBlazor/Enums/ComponentIcons.cs
index 54e3ff03c10..71b52f925b7 100644
--- a/src/BootstrapBlazor/Enums/ComponentIcons.cs
+++ b/src/BootstrapBlazor/Enums/ComponentIcons.cs
@@ -251,6 +251,12 @@ public enum ComponentIcons
     /// </summary>
     DialogSaveButtonIcon,
 
+    /// <summary>
+    /// <para lang="zh">Dialog 组件 KeepAddingButtonIcon 属性图标</para>
+    /// <para lang="en">Dialog Component Keep Adding Button Icon</para>
+    /// </summary>
+    DialogKeepAddingButtonIcon,
+
     /// <summary>
     /// <para lang="zh">Dialog 组件 MaximizeIcon 属性图标</para>
     /// <para lang="en">Dialog Component Maximize Icon</para>
diff --git a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
index 0332e832a2e..aabf6a7fd5c 100644
--- a/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/DialogServiceExtensions.cs
@@ -114,7 +114,7 @@ public static async Task ShowSearchDialog<TModel>(this DialogService service, Se
     ///   <para lang="zh">指定弹窗组件 默认为 null 使用 <see cref="BootstrapBlazorRoot"/> 组件内置弹窗组件</para>
     ///   <para lang="en">Specify the dialog component, default is null, use <see cref="BootstrapBlazorRoot"/> built-in dialog component</para>
     /// </param>
-    public static async Task ShowEditDialog<TModel>(this DialogService service, EditDialogOption<TModel> option, Dialog? dialog = null)
+    public static async Task ShowEditDialog<TModel>(this DialogService service, EditDialogOption<TModel> option, Dialog? dialog = null) where TModel : class
     {
         option.Component = BootstrapDynamicComponent.CreateComponent<EditDialog<TModel>>(option.ToParameter());
         await service.Show(option, dialog);
diff --git a/src/BootstrapBlazor/Extensions/DrawerExtensions.cs b/src/BootstrapBlazor/Extensions/DrawerExtensions.cs
index 11a0fab2037..d3dfe2400b7 100644
--- a/src/BootstrapBlazor/Extensions/DrawerExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/DrawerExtensions.cs
@@ -27,7 +27,7 @@ public static class DrawerExtensions
     ///   <para lang="zh"><see cref="DrawerOption"/> 配置类实例</para>
     ///   <para lang="en"><see cref="DrawerOption"/> option instance</para>
     /// </param>
-    public static async Task ShowEditDrawer<TModel>(this DrawerService service, TableEditDrawerOption<TModel> editDialogOption, DrawerOption option)
+    public static async Task ShowEditDrawer<TModel>(this DrawerService service, TableEditDrawerOption<TModel> editDialogOption, DrawerOption option) where TModel : class
     {
         var parameters = editDialogOption.ToParameter();
         parameters.Add(nameof(EditDialog<TModel>.OnCloseAsync), editDialogOption.OnCloseAsync);
diff --git a/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs b/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs
index e3d26237da4..d825a390e7d 100644
--- a/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs
+++ b/src/BootstrapBlazor/Extensions/TableEditDialogOptionExtensions.cs
@@ -19,7 +19,7 @@ public static class TableEditDialogOptionExtensions
     /// </summary>
     /// <typeparam name="TModel"></typeparam>
     /// <param name="option"></param>
-    public static Dictionary<string, object?> ToParameter<TModel>(this ITableEditDialogOption<TModel> option) => new()
+    public static Dictionary<string, object?> ToParameter<TModel>(this ITableEditDialogOption<TModel> option) where TModel : class => new()
     {
         [nameof(EditDialog<TModel>.ShowUnsetGroupItemsOnTop)] = option.ShowUnsetGroupItemsOnTop,
         [nameof(EditDialog<TModel>.ShowLoading)] = option.ShowLoading,
@@ -34,6 +34,11 @@ public static class TableEditDialogOptionExtensions
         [nameof(EditDialog<TModel>.CloseButtonIcon)] = option.CloseButtonIcon,
         [nameof(EditDialog<TModel>.SaveButtonText)] = option.SaveButtonText,
         [nameof(EditDialog<TModel>.SaveButtonIcon)] = option.SaveButtonIcon,
+        [nameof(EditDialog<TModel>.ShowKeepAddingButton)] = option.ShowKeepAddingButton,
+        [nameof(EditDialog<TModel>.KeepAddingButtonText)] = option.KeepAddingButtonText,
+        [nameof(EditDialog<TModel>.KeepAddingButtonIcon)] = option.KeepAddingButtonIcon,
+        [nameof(EditDialog<TModel>.KeepAddingButtonColor)] = option.KeepAddingButtonColor,
+        [nameof(EditDialog<TModel>.OnKeepAddingAsync)] = option.OnKeepAddingAsync,
         [nameof(EditDialog<TModel>.ShowCloseConfirm)] = option.ShowConfirmCloseSwal,
         [nameof(EditDialog<TModel>.CloseConfirmTitle)] = option.CloseConfirmTitle,
         [nameof(EditDialog<TModel>.CloseConfirmContent)] = option.CloseConfirmContent,
diff --git a/src/BootstrapBlazor/Icons/BootstrapIcons.cs b/src/BootstrapBlazor/Icons/BootstrapIcons.cs
index df56db0f572..192eb15eea7 100644
--- a/src/BootstrapBlazor/Icons/BootstrapIcons.cs
+++ b/src/BootstrapBlazor/Icons/BootstrapIcons.cs
@@ -43,6 +43,7 @@ internal static class BootstrapIcons
 
         { ComponentIcons.DialogCloseButtonIcon, "bi bi-x" },
         { ComponentIcons.DialogSaveButtonIcon, "bi bi-check" },
+        { ComponentIcons.DialogKeepAddingButtonIcon, "bi bi-plus-lg" },
         { ComponentIcons.DialogMaximizeWindowIcon, "bi bi-window" },
         { ComponentIcons.DialogRestoreWindowIcon, "bi bi-window-stack" },
 
diff --git a/src/BootstrapBlazor/Icons/FontAwesomeIcons.cs b/src/BootstrapBlazor/Icons/FontAwesomeIcons.cs
index 60f54fbd195..638514b447a 100644
--- a/src/BootstrapBlazor/Icons/FontAwesomeIcons.cs
+++ b/src/BootstrapBlazor/Icons/FontAwesomeIcons.cs
@@ -43,6 +43,7 @@ internal static class FontAwesomeIcons
 
         { ComponentIcons.DialogCloseButtonIcon, "fa-solid fa-xmark" },
         { ComponentIcons.DialogSaveButtonIcon, "fa-solid fa-floppy-disk" },
+        { ComponentIcons.DialogKeepAddingButtonIcon, "fa-solid fa-plus" },
         { ComponentIcons.DialogMaximizeWindowIcon, "fa-regular fa-window-maximize" },
         { ComponentIcons.DialogRestoreWindowIcon, "fa-regular fa-window-restore" },
 
diff --git a/src/BootstrapBlazor/Icons/MaterialDesignIcons.cs b/src/BootstrapBlazor/Icons/MaterialDesignIcons.cs
index e9a906513ad..97abee65ee6 100644
--- a/src/BootstrapBlazor/Icons/MaterialDesignIcons.cs
+++ b/src/BootstrapBlazor/Icons/MaterialDesignIcons.cs
@@ -43,6 +43,7 @@ internal static class MaterialDesignIcons
 
         { ComponentIcons.DialogCloseButtonIcon, "mdi mdi-close" },
         { ComponentIcons.DialogSaveButtonIcon, "mdi mdi-content-save" },
+        { ComponentIcons.DialogKeepAddingButtonIcon, "mdi mdi-plus" },
         { ComponentIcons.DialogMaximizeWindowIcon, "mdi mdi-window-maximize" },
         { ComponentIcons.DialogRestoreWindowIcon, "mdi mdi-window-restore" },
 
diff --git a/src/BootstrapBlazor/Locales/en.json b/src/BootstrapBlazor/Locales/en.json
index bba7c671b16..c111fa388b4 100644
--- a/src/BootstrapBlazor/Locales/en.json
+++ b/src/BootstrapBlazor/Locales/en.json
@@ -265,6 +265,8 @@
   "BootstrapBlazor.Components.EditDialog": {
     "CloseButtonText": "Close",
     "SaveButtonText": "Save",
+    "SaveAndCloseButtonText": "Save and Close",
+    "KeepAddingButtonText": "Save and Add",
     "CloseConfirmTitle": "Warning",
     "CloseConfirmContent": "The form has been changed. Are you sure you continue to close it?"
   },
diff --git a/src/BootstrapBlazor/Locales/zh.json b/src/BootstrapBlazor/Locales/zh.json
index 8b70a11853e..30f022a0dfc 100644
--- a/src/BootstrapBlazor/Locales/zh.json
+++ b/src/BootstrapBlazor/Locales/zh.json
@@ -265,6 +265,8 @@
   "BootstrapBlazor.Components.EditDialog": {
     "CloseButtonText": "关闭",
     "SaveButtonText": "保存",
+    "SaveAndCloseButtonText": "保存并关闭",
+    "KeepAddingButtonText": "保存并新增",
     "CloseConfirmTitle": "请注意",
     "CloseConfirmContent": "表单内容已更改，确定要继续关闭吗？"
   },
diff --git a/test/UnitTest/Components/EditDialogTest.cs b/test/UnitTest/Components/EditDialogTest.cs
index 1b25a7ac2aa..2959aa2413e 100644
--- a/test/UnitTest/Components/EditDialogTest.cs
+++ b/test/UnitTest/Components/EditDialogTest.cs
@@ -3,6 +3,9 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
+using Microsoft.AspNetCore.Components.Forms;
+using System.Reflection;
+
 namespace UnitTest.Components;
 
 public class EditDialogTest : BootstrapBlazorTestBase
@@ -18,4 +21,67 @@ public void Items_Ok()
 
         cut.Contains("bb-editor");
     }
+
+    /// <summary>
+    /// <para lang="zh">OnValidSubmitAsync 方法提交守卫单元测试 未设置 OnSaveAsync 提交中重入 组件已释放三种场景</para>
+    /// <para lang="en">Unit test for the submit guard of the OnValidSubmitAsync method, covering the three scenarios: OnSaveAsync not set, reentrant submit and component disposed</para>
+    /// </summary>
+    [Fact]
+    public async Task OnValidSubmitAsync_Guard_Ok()
+    {
+        var methodInfo = typeof(EditDialog<Foo>).GetMethod("OnValidSubmitAsync", BindingFlags.Instance | BindingFlags.NonPublic);
+        var disposedField = typeof(EditDialog<Foo>).GetField("_isDisposed", BindingFlags.Instance | BindingFlags.NonPublic);
+        Assert.NotNull(methodInfo);
+        Assert.NotNull(disposedField);
+
+        // 未设置 OnSaveAsync 时提交直接返回 不保存也不关闭
+        var model1 = new Foo();
+        var closeCount = 0;
+        var cut1 = Context.Render<EditDialog<Foo>>(pb =>
+        {
+            pb.AddCascadingValue(new Func<Task>(() =>
+            {
+                closeCount++;
+                return Task.CompletedTask;
+            }));
+            pb.Add(a => a.Model, model1);
+        });
+        await (Task)methodInfo.Invoke(cut1.Instance, [new EditContext(model1)])!;
+        Assert.Equal(0, closeCount);
+
+        // 上一次提交未完成时再次提交 直接返回不重复保存
+        var model2 = new Foo();
+        var source = new TaskCompletionSource();
+        var saveCount = 0;
+        var cut2 = Context.Render<EditDialog<Foo>>(pb =>
+        {
+            pb.Add(a => a.Model, model2);
+            pb.Add(a => a.OnSaveAsync, async context =>
+            {
+                saveCount++;
+                await source.Task;
+                return true;
+            });
+        });
+
+        var saving = (Task)methodInfo.Invoke(cut2.Instance, [new EditContext(model2)])!;
+        Assert.Equal(1, saveCount);
+        Assert.False(saving.IsCompleted);
+
+        await (Task)methodInfo.Invoke(cut2.Instance, [new EditContext(model2)])!;
+        Assert.Equal(1, saveCount);
+
+        source.SetResult();
+        await saving;
+        Assert.Equal(1, saveCount);
+
+        // 组件已释放时提交直接返回
+        var model3 = new Foo();
+        var cut3 = Context.Render<EditDialog<Foo>>(pb => pb.Add(a => a.Model, model3));
+        var dialog = cut3.Instance;
+        await ((IAsyncDisposable)dialog).DisposeAsync();
+        Assert.True((bool)disposedField.GetValue(dialog)!);
+
+        await (Task)methodInfo.Invoke(dialog, [new EditContext(model3)])!;
+    }
 }
diff --git a/test/UnitTest/Components/TableKeepAddingTest.cs b/test/UnitTest/Components/TableKeepAddingTest.cs
new file mode 100644
index 00000000000..f54f71ba509
--- /dev/null
+++ b/test/UnitTest/Components/TableKeepAddingTest.cs
@@ -0,0 +1,372 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+
+using Microsoft.Extensions.Localization;
+
+namespace UnitTest.Components;
+
+/// <summary>
+/// <para lang="zh">Table 组件「保存并新增」功能单元测试</para>
+/// <para lang="en">Unit test for the Table "Save and Add" feature</para>
+/// </summary>
+public class TableKeepAddingTest : TableDialogTestBase
+{
+    /// <summary>
+    /// <para lang="zh">弹窗模式测试</para>
+    /// <para lang="en">Test for the popup mode</para>
+    /// </summary>
+    [Fact]
+    public async Task Popup_Ok()
+    {
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
+        var items = Foo.GenerateFoo(localizer, 2);
+        items.ForEach(i => i.Count = 0);
+
+        var lastModel = default(Foo);
+        var savedModel = default(Foo);
+        var closedResult = default(bool?);
+        var addCount = 0;
+
+        var cut = Context.Render<BootstrapBlazorRoot>(pb =>
+        {
+            pb.AddChildContent<Table<Foo>>(pb =>
+            {
+                pb.Add(a => a.RenderMode, TableRenderMode.Table);
+                pb.Add(a => a.Items, items);
+                pb.Add(a => a.ShowToolbar, true);
+                pb.Add(a => a.IsMultipleSelect, true);
+                pb.Add(a => a.ShowKeepAddingButton, true);
+                pb.Add(a => a.KeepAddingButtonText, "test-keep-adding");
+                pb.Add(a => a.KeepAddingButtonIcon, "test-keep-adding-icon");
+                pb.Add(a => a.KeepAddingButtonColor, Color.Danger);
+                pb.Add(a => a.TableColumns, foo => builder =>
+                {
+                    builder.OpenComponent<TableColumn<Foo, string>>(0);
+                    builder.AddAttribute(1, "Field", "Name");
+                    builder.AddAttribute(2, "FieldExpression", Utility.GenerateValueExpression(foo, "Name", typeof(string)));
+                    builder.CloseComponent();
+                });
+                pb.Add(a => a.OnAddAsync, () =>
+                {
+                    addCount++;
+                    var foo = Foo.Generate(localizer);
+                    foo.Name = $"add-{addCount}";
+                    foo.Count = 0;
+                    return Task.FromResult(foo);
+                });
+                pb.Add(a => a.OnSaveAsync, (Foo foo, ItemChangedType itemType) =>
+                {
+                    savedModel = foo;
+                    return Task.FromResult(true);
+                });
+                pb.Add(a => a.OnKeepAddingAsync, new Func<Foo, Task<Foo>>(last =>
+                {
+                    lastModel = last;
+                    var foo = Foo.Generate(localizer);
+                    foo.Name = "next-name";
+                    foo.Count = last.Count + 10;
+                    return Task.FromResult(foo);
+                }));
+                pb.Add(a => a.EditDialogCloseAsync, (model, saved) =>
+                {
+                    closedResult = saved;
+                    return Task.CompletedTask;
+                });
+            });
+        });
+
+        var table = cut.FindComponent<Table<Foo>>();
+        await cut.InvokeAsync(() => table.Instance.AddAsync());
+
+        // 新建弹窗中的「保存并新增」按钮参数已透传
+        var editDialog = cut.FindComponent<EditDialog<Foo>>();
+        Assert.True(editDialog.Instance.ShowKeepAddingButton);
+        Assert.Equal("test-keep-adding", editDialog.Instance.KeepAddingButtonText);
+        Assert.Equal("test-keep-adding-icon", editDialog.Instance.KeepAddingButtonIcon);
+        Assert.Equal(Color.Danger, editDialog.Instance.KeepAddingButtonColor);
+
+        var editDialogLocalizer = Context.Services.GetRequiredService<IStringLocalizer<EditDialog<Foo>>>();
+        var saveAndCloseText = editDialogLocalizer["SaveAndCloseButtonText"].Value;
+
+        // 「保存并新增」按钮已渲染 主保存按钮文本为「保存并关闭」
+        var keepAddingButton = cut.Find(".bb-editor-footer .btn-danger");
+        Assert.Contains("test-keep-adding", keepAddingButton.TextContent);
+        Assert.Contains("test-keep-adding-icon", keepAddingButton.InnerHtml);
+        Assert.Contains(saveAndCloseText, cut.Find(".bb-editor-footer .btn-primary").TextContent);
+
+        // 点击「保存并新增」按钮
+        var hideCount = Context.JSInterop.Invocations.Count(i => i.Arguments.Any(a => a?.ToString() == "hide"));
+        await cut.InvokeAsync(() => keepAddingButton.Click());
+        cut.WaitForAssertion(() => Assert.Equal(3, table.Instance.Rows.Count));
+
+        // 当前数据已保存 且保存的数据即回调参数
+        Assert.Same(savedModel, lastModel);
+
+        // 弹窗未关闭
+        Assert.Equal(hideCount, Context.JSInterop.Invocations.Count(i => i.Arguments.Any(a => a?.ToString() == "hide")));
+
+        // 表单已重新绑定到下一条数据模型
+        cut.WaitForAssertion(() => Assert.Equal("next-name", cut.FindComponent<EditorForm<Foo>>().Instance.Model!.Name));
+        Assert.Equal(10, cut.FindComponent<EditorForm<Foo>>().Instance.Model!.Count);
+
+        // 下一条数据尚未保存 关闭弹窗时 saved 为 false
+        var modal = cut.FindComponent<Modal>();
+        await cut.InvokeAsync(() => modal.Instance.CloseCallback());
+        Assert.Equal(false, closedResult);
+
+        // 再次打开新建弹窗 点击主保存按钮提交 数据保存并关闭弹窗
+        await cut.InvokeAsync(() => table.Instance.AddAsync());
+        hideCount = Context.JSInterop.Invocations.Count(i => i.Arguments.Any(a => a?.ToString() == "hide"));
+        await cut.InvokeAsync(() => cut.Find(".bb-editor-footer .btn-primary").Click());
+        cut.WaitForAssertion(() => Assert.Equal(4, table.Instance.Rows.Count));
+        cut.WaitForAssertion(() => Assert.Equal(hideCount + 1, Context.JSInterop.Invocations.Count(i => i.Arguments.Any(a => a?.ToString() == "hide"))));
+
+        // 数据已保存 关闭弹窗时 saved 为 true
+        await cut.InvokeAsync(() => modal.Instance.CloseCallback());
+        Assert.Equal(true, closedResult);
+
+        // 编辑弹窗不显示「保存并新增」按钮
+        var checkbox = cut.FindComponents<Checkbox<Foo>>()[1];
+        await cut.InvokeAsync(checkbox.Instance.OnToggleClick);
+        await cut.InvokeAsync(() => table.Instance.EditAsync());
+        Assert.False(cut.FindComponent<EditDialog<Foo>>().Instance.ShowKeepAddingButton);
+        Assert.Empty(cut.FindAll(".bb-editor-footer .btn-danger"));
+        await cut.InvokeAsync(() => modal.Instance.CloseCallback());
+
+        // 未设置 OnKeepAddingAsync 时回落使用 OnAddAsync 创建下一条数据
+        table.Render(pb => pb.Add(a => a.OnKeepAddingAsync, (Func<Foo, Task<Foo>>?)null));
+        await cut.InvokeAsync(() => table.Instance.AddAsync());
+        Assert.Equal(3, addCount);
+
+        await cut.InvokeAsync(() => cut.Find(".bb-editor-footer .btn-danger").Click());
+        cut.WaitForAssertion(() => Assert.Equal(5, table.Instance.Rows.Count));
+        Assert.Equal(4, addCount);
+        cut.WaitForAssertion(() => Assert.Equal("add-4", cut.FindComponent<EditorForm<Foo>>().Instance.Model!.Name));
+    }
+
+    /// <summary>
+    /// <para lang="zh">抽屉模式测试</para>
+    /// <para lang="en">Test for the drawer mode</para>
+    /// </summary>
+    [Fact]
+    public async Task Drawer_Ok()
+    {
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
+        var items = Foo.GenerateFoo(localizer, 2);
+        items.ForEach(i => i.Count = 0);
+
+        var lastModel = default(Foo);
+        var savedModel = default(Foo);
+        var closedResult = default(bool?);
+
+        var cut = Context.Render<BootstrapBlazorRoot>(pb =>
+        {
+            pb.AddChildContent<Table<Foo>>(pb =>
+            {
+                pb.Add(a => a.RenderMode, TableRenderMode.Table);
+                pb.Add(a => a.EditMode, EditMode.Drawer);
+                pb.Add(a => a.Items, items);
+                pb.Add(a => a.ShowToolbar, true);
+                pb.Add(a => a.ShowKeepAddingButton, true);
+                pb.Add(a => a.TableColumns, foo => builder =>
+                {
+                    builder.OpenComponent<TableColumn<Foo, string>>(0);
+                    builder.AddAttribute(1, "Field", "Name");
+                    builder.AddAttribute(2, "FieldExpression", Utility.GenerateValueExpression(foo, "Name", typeof(string)));
+                    builder.CloseComponent();
+                });
+                pb.Add(a => a.OnAddAsync, () =>
+                {
+                    var foo = Foo.Generate(localizer);
+                    foo.Name = "add-name";
+                    foo.Count = 0;
+                    return Task.FromResult(foo);
+                });
+                pb.Add(a => a.OnSaveAsync, (Foo foo, ItemChangedType itemType) =>
+                {
+                    savedModel = foo;
+                    return Task.FromResult(true);
+                });
+                pb.Add(a => a.OnKeepAddingAsync, new Func<Foo, Task<Foo>>(last =>
+                {
+                    lastModel = last;
+                    var foo = Foo.Generate(localizer);
+                    foo.Name = "next-name";
+                    foo.Count = last.Count + 10;
+                    return Task.FromResult(foo);
+                }));
+                pb.Add(a => a.EditDialogCloseAsync, (model, saved) =>
+                {
+                    closedResult = saved;
+                    return Task.CompletedTask;
+                });
+            });
+        });
+
+        var table = cut.FindComponent<Table<Foo>>();
+        await cut.InvokeAsync(() => table.Instance.AddAsync());
+
+        // 抽屉已打开 且渲染出「保存并新增」按钮
+        Assert.True(cut.FindComponent<Drawer>().Instance.IsOpen);
+        Assert.Contains("保存并新增", cut.Find(".bb-editor-footer .btn-info").TextContent);
+
+        // 点击「保存并新增」按钮
+        await cut.InvokeAsync(() => cut.Find(".bb-editor-footer .btn-info").Click());
+        cut.WaitForAssertion(() => Assert.Equal(3, table.Instance.Rows.Count));
+
+        // 抽屉保持打开状态
+        Assert.True(cut.FindComponent<Drawer>().Instance.IsOpen);
+
+        // 当前数据已保存 且保存的数据即回调参数
+        Assert.Same(savedModel, lastModel);
+
+        // 表单已重新绑定到下一条数据模型
+        cut.WaitForAssertion(() => Assert.Equal("next-name", cut.FindComponent<EditorForm<Foo>>().Instance.Model!.Name));
+        Assert.Equal(10, cut.FindComponent<EditorForm<Foo>>().Instance.Model!.Count);
+
+        // 点击关闭按钮关闭抽屉 下一条数据尚未保存 saved 为 false
+        await cut.InvokeAsync(() => cut.Find(".bb-editor-footer .btn-secondary").Click());
+        cut.WaitForAssertion(() => Assert.Empty(cut.FindComponents<Drawer>()));
+        Assert.Equal(false, closedResult);
+
+        // 再次打开抽屉 点击主保存按钮提交 抽屉关闭
+        await cut.InvokeAsync(() => table.Instance.AddAsync());
+        Assert.True(cut.FindComponent<Drawer>().Instance.IsOpen);
+
+        await cut.InvokeAsync(() => cut.Find(".bb-editor-footer .btn-primary").Click());
+        cut.WaitForAssertion(() => Assert.Equal(4, table.Instance.Rows.Count));
+        cut.WaitForAssertion(() => Assert.Empty(cut.FindComponents<Drawer>()));
+    }
+
+    /// <summary>
+    /// <para lang="zh">EditDialog 组件单元测试</para>
+    /// <para lang="en">Unit test for the EditDialog component</para>
+    /// </summary>
+    [Fact]
+    public async Task EditDialog_Ok()
+    {
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<EditDialog<Foo>>>();
+        var model = new Foo();
+        var nextModel = new Foo() { Name = "second-name" };
+
+        var closeCount = 0;
+        var saveCount = 0;
+        var lastModel = default(Foo);
+        var saveResult = true;
+
+        var cut = Context.Render<EditDialog<Foo>>(pb =>
+        {
+            pb.AddCascadingValue(new Func<Task>(() =>
+            {
+                closeCount++;
+                return Task.CompletedTask;
+            }));
+            pb.Add(a => a.Model, model);
+            pb.Add(a => a.ShowKeepAddingButton, true);
+            pb.Add(a => a.BodyTemplate, new RenderFragment<Foo>(m => builder => builder.AddContent(0, $"MODEL:{m.Name}")));
+            pb.Add(a => a.OnSaveAsync, context =>
+            {
+                saveCount++;
+                return Task.FromResult(saveResult);
+            });
+            pb.Add(a => a.OnKeepAddingAsync, new Func<Foo, Task<Foo>>(last =>
+            {
+                lastModel = last;
+                return Task.FromResult(nextModel);
+            }));
+        });
+
+        // 默认文本与默认颜色
+        cut.Contains(localizer["KeepAddingButtonText"].Value);
+        cut.Contains(localizer["SaveAndCloseButtonText"].Value);
+        cut.Contains("btn-info");
+        cut.Contains("MODEL:");
+
+        // 点击「保存并新增」按钮 保存成功 表单绑定到下一条模型 且不关闭
+        await cut.InvokeAsync(() => cut.Find("button.btn-info").Click());
+        cut.WaitForAssertion(() => Assert.Equal(1, saveCount));
+
+        Assert.Same(model, lastModel);
+        Assert.Equal(0, closeCount);
+        cut.WaitForAssertion(() => cut.Contains("MODEL:second-name"));
+
+        // 点击主保存按钮 保存成功并关闭
+        await cut.InvokeAsync(() => cut.Find("button.btn-primary").Click());
+        cut.WaitForAssertion(() => Assert.Equal(2, saveCount));
+        cut.WaitForAssertion(() => Assert.Equal(1, closeCount));
+
+        // 保存失败时保持打开状态 且不创建下一条数据模型
+        saveResult = false;
+        await cut.InvokeAsync(() => cut.Find("button.btn-primary").Click());
+        cut.WaitForAssertion(() => Assert.Equal(3, saveCount));
+
+        Assert.Equal(1, closeCount);
+        cut.Contains("MODEL:second-name");
+
+        // 点击「保存并新增」按钮后随即点击主保存按钮 本次提交按「保存并关闭」处理
+        saveResult = true;
+        var buttons = cut.FindComponents<Button>();
+        var keepAddingButton = buttons.First(i => i.Instance.Text == localizer["KeepAddingButtonText"].Value);
+        var saveButton = buttons.First(i => i.Instance.Text == localizer["SaveAndCloseButtonText"].Value);
+        await cut.InvokeAsync(() => keepAddingButton.Instance.OnClick.InvokeAsync());
+        await cut.InvokeAsync(() => saveButton.Instance.OnClick.InvokeAsync());
+        await cut.InvokeAsync(() => cut.Find("form").Submit());
+        cut.WaitForAssertion(() => Assert.Equal(4, saveCount));
+
+        Assert.Equal(2, closeCount);
+
+        // 未设置 OnKeepAddingAsync 时点击「保存并新增」按钮等同主保存按钮
+        cut.Render(pb => pb.Add(a => a.OnKeepAddingAsync, (Func<Foo, Task<Foo>>?)null));
+        await cut.InvokeAsync(() => cut.Find("button.btn-info").Click());
+        cut.WaitForAssertion(() => Assert.Equal(5, saveCount));
+
+        Assert.Equal(3, closeCount);
+
+        // Tracking 模式不显示「保存并新增」按钮
+        cut.Render(pb => pb.Add(a => a.IsTracking, true));
+        Assert.Empty(cut.FindAll("button.btn-info"));
+        cut.Contains(localizer["SaveButtonText"].Value);
+    }
+
+    /// <summary>
+    /// <para lang="zh">未设置 OnKeepAddingAsync 时回退使用 OnAddAsync 创建下一条数据 回调返回空对象时抛出异常</para>
+    /// <para lang="en">Falls back to the OnAddAsync callback to create the next item when OnKeepAddingAsync is not set. An exception is thrown when a null model is returned</para>
+    /// </summary>
+    [Fact]
+    public async Task OnAddAsync_ReturnNull_Error()
+    {
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
+        var items = Foo.GenerateFoo(localizer, 2);
+
+        var cut = Context.Render<Table<Foo>>(pb =>
+        {
+            pb.Add(a => a.RenderMode, TableRenderMode.Table);
+            pb.Add(a => a.Items, items);
+            pb.Add(a => a.ShowKeepAddingButton, true);
+            pb.Add(a => a.TableColumns, foo => builder =>
+            {
+                builder.OpenComponent<TableColumn<Foo, string>>(0);
+                builder.AddAttribute(1, "Field", "Name");
+                builder.AddAttribute(2, "FieldExpression", Utility.GenerateValueExpression(foo, "Name", typeof(string)));
+                builder.CloseComponent();
+            });
+            pb.Add(a => a.OnAddAsync, () => Task.FromResult<Foo>(null!));
+        });
+
+        var table = cut.Instance;
+
+        // 触发连续新增时创建下一条数据 反射调用私有方法以便直接断言异常
+        var methodInfo = typeof(Table<Foo>).GetMethod("CreateNextEditModelAsync", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+        Assert.NotNull(methodInfo);
+        var task = (Task<Foo>)methodInfo.Invoke(table, [items[0]])!;
+
+        // OnAddAsync 返回空对象时抛出异常
+        var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => task);
+        Assert.Contains(nameof(Table<Foo>.OnAddAsync), ex.Message);
+
+        // 空对象已赋值到 EditModel
+        Assert.Null(table.EditModel);
+    }
+}