feat(Table): add OnAfterCancelSaveAsync parameter

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.0.2-beta04</Version>
+    <Version>9.0.2-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs

@@ -88,6 +88,12 @@ public partial class Table<TItem>
     [Parameter]
     public Func<TItem, string?>? SetRowClassFormatter { get; set; }
 
+    /// <summary>
+    /// 获得/设置 取消保存后回调委托方法
+    /// </summary>
+    [Parameter]
+    public Func<Task>? OnAfterCancelSaveAsync { get; set; }
+
     /// <summary>
     /// 获得/设置 保存后回调委托方法
     /// </summary>

src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs

@@ -850,6 +850,7 @@ private void AppendOptions(ITableEditDialogOption<TItem> option, ItemChangedType
     protected async Task ShowEditDialog(ItemChangedType changedType)
     {
         var saved = false;
+        var triggerFromSave = false;
         var option = new EditDialogOption<TItem>()
         {
             Class = "modal-dialog-table",
@@ -860,10 +861,18 @@ protected async Task ShowEditDialog(ItemChangedType changedType)
             IsDraggable = EditDialogIsDraggable,
             ShowMaximizeButton = EditDialogShowMaximizeButton,
             FullScreenSize = EditDialogFullScreenSize,
-            OnCloseAsync = () => OnCloseEditDialogCallbackAsync(saved),
+            OnCloseAsync = async () =>
+            {
+                if (triggerFromSave == false && OnAfterCancelSaveAsync != null)
+                {
+                    await OnAfterCancelSaveAsync();
+                }
+                await OnCloseEditDialogCallbackAsync(saved);
+            },
             OnEditAsync = async context =>
             {
                 saved = await OnSaveEditCallbackAsync(context, changedType);
+                triggerFromSave = true;
                 return saved;
             }
         };
@@ -879,7 +888,14 @@ protected async Task ShowEditDrawer(ItemChangedType changedType)
         var saved = false;
         var editOption = new TableEditDrawerOption<TItem>()
         {
-            OnCloseAsync = () => OnCloseEditDialogCallbackAsync(saved),
+            OnCloseAsync = async () =>
+            {
+                if (OnAfterCancelSaveAsync != null)
+                {
+                    await OnAfterCancelSaveAsync();
+                }
+                await OnCloseEditDialogCallbackAsync(saved);
+            },
             OnEditAsync = async context =>
             {
                 saved = await OnSaveEditCallbackAsync(context, changedType);

test/UnitTest/Components/TableTest.cs

@@ -5505,6 +5505,106 @@ public async Task OnSaveAsync_Ok()
         Assert.True(afterModify);
     }
 
+    [Fact]
+    public async Task OnAfterCancelSaveAsync_Popup()
+    {
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
+        var items = Foo.GenerateFoo(localizer, 2);
+        var afterCancelSave = false;
+        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
+        {
+            pb.AddChildContent<Table<Foo>>(pb =>
+            {
+                pb.Add(a => a.RenderMode, TableRenderMode.Table);
+                pb.Add(a => a.Items, items);
+                pb.Add(a => a.IsMultipleSelect, true);
+                pb.Add(a => a.ShowToolbar, true);
+                pb.Add(a => a.ShowExtendButtons, true);
+                pb.Add(a => a.EditMode, EditMode.Popup);
+                pb.Add(a => a.OnAfterCancelSaveAsync, () =>
+                {
+                    afterCancelSave = true;
+                    return Task.CompletedTask;
+                });
+                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();
+                });
+            });
+        });
+
+        // test edit button
+        var button = cut.FindAll("tbody tr button");
+        await cut.InvokeAsync(() => button[0].Click());
+
+        // 保存按钮
+        var saveButton = cut.Find(".bb-editor-footer .btn-primary");
+        await cut.InvokeAsync(() => saveButton.Click());
+        Assert.False(afterCancelSave);
+
+        var modal = cut.FindComponent<Modal>();
+        await cut.InvokeAsync(modal.Instance.CloseCallback);
+
+        await cut.InvokeAsync(() => button[0].Click());
+        var cancelButton = cut.Find(".bb-editor-footer .btn");
+
+        // 取消按钮
+        await cut.InvokeAsync(() => cancelButton.Click());
+        Assert.True(afterCancelSave);
+    }
+
+    [Fact]
+    public async Task OnAfterCancelSaveAsync_Drawer()
+    {
+        var localizer = Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
+        var items = Foo.GenerateFoo(localizer, 2);
+        var afterCancelSave = false;
+        var cut = Context.RenderComponent<BootstrapBlazorRoot>(pb =>
+        {
+            pb.AddChildContent<Table<Foo>>(pb =>
+            {
+                pb.Add(a => a.RenderMode, TableRenderMode.Table);
+                pb.Add(a => a.Items, items);
+                pb.Add(a => a.IsMultipleSelect, true);
+                pb.Add(a => a.ShowToolbar, true);
+                pb.Add(a => a.ShowExtendButtons, true);
+                pb.Add(a => a.EditMode, EditMode.Drawer);
+                pb.Add(a => a.OnAfterCancelSaveAsync, () =>
+                {
+                    afterCancelSave = true;
+                    return Task.CompletedTask;
+                });
+                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();
+                });
+            });
+        });
+
+        // test edit button
+        var button = cut.FindAll("tbody tr button");
+        await cut.InvokeAsync(() => button[0].Click());
+
+        // 保存按钮
+        var saveButton = cut.Find(".bb-editor-footer .btn-primary");
+        await cut.InvokeAsync(() => saveButton.Click());
+        Assert.False(afterCancelSave);
+
+        // 取消按钮
+        button = cut.FindAll("tbody tr button");
+        await cut.InvokeAsync(() => button[0].Click());
+
+        var cancelButton = cut.Find(".bb-editor-footer .btn");
+        await cut.InvokeAsync(() => cancelButton.Click());
+        Assert.True(afterCancelSave);
+    }
+
     [Theory]
     [InlineData(EditMode.EditForm)]
     [InlineData(EditMode.InCell)]