diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs index e7c15a394a0..968f51cbd38 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs +++ b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs @@ -545,7 +545,7 @@ public async Task EditAsync() if (SelectedRows.Count == 1) { // 检查是否选中了不可编辑行(行内无编辑按钮),同时检查按钮禁用状态(禁用时不可编辑) - if (CanEdit()) + if (ProhibitEdit()) { // 提示不可编辑 await ShowToastAsync(EditButtonToastTitle, EditButtonToastReadonlyContent); @@ -992,7 +992,7 @@ protected async Task ConfirmDelete() { await ShowDeleteToastAsync(DeleteButtonToastTitle, DeleteButtonToastContent); } - else if (CanDelete()) + else if (ProhibitDelete()) { await ShowDeleteToastAsync(DeleteButtonToastTitle, DeleteButtonToastCanNotDeleteContent); } @@ -1003,12 +1003,12 @@ protected async Task ConfirmDelete() return ret; } - private bool CanEdit() => (ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0])) + private bool ProhibitEdit() => (ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0])) || !ShowExtendEditButton || (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0])) || DisableExtendEditButton; - private bool CanDelete() => (ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i))) + private bool ProhibitDelete() => (ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i))) || !ShowExtendDeleteButton || (DisableExtendDeleteButtonCallback != null && SelectedRows.Any(x => DisableExtendDeleteButtonCallback(x))) || DisableExtendDeleteButton; diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs index b0641475681..15020509840 100644 --- a/test/UnitTest/Components/TableTest.cs +++ b/test/UnitTest/Components/TableTest.cs @@ -8651,8 +8651,8 @@ public void Modify_Ok() pb.Add(a => a.ShowExtendEditButton, false); pb.Add(a => a.ShowExtendDeleteButton, false); }); - Assert.True(CanEdit(cut.Instance)); - Assert.True(CanDelete(cut.Instance)); + Assert.True(ProhibitEdit(cut.Instance)); + Assert.True(ProhibitDelete(cut.Instance)); cut.SetParametersAndRender(pb => { @@ -8661,8 +8661,8 @@ public void Modify_Ok() pb.Add(a => a.DisableExtendEditButton, true); pb.Add(a => a.DisableExtendDeleteButton, true); }); - Assert.True(CanEdit(cut.Instance)); - Assert.True(CanDelete(cut.Instance)); + Assert.True(ProhibitEdit(cut.Instance)); + Assert.True(ProhibitDelete(cut.Instance)); cut.SetParametersAndRender(pb => { @@ -8680,14 +8680,14 @@ public void Modify_Ok() return true; }); }); - Assert.True(CanEdit(cut.Instance)); - Assert.True(CanDelete(cut.Instance)); + Assert.True(ProhibitEdit(cut.Instance)); + Assert.True(ProhibitDelete(cut.Instance)); } - static bool CanEdit(Table @this) + static bool ProhibitEdit(Table @this) { var ret = false; - var methodInfo = @this.GetType().GetMethod("CanEdit", BindingFlags.Instance | BindingFlags.NonPublic); + var methodInfo = @this.GetType().GetMethod("ProhibitEdit", BindingFlags.Instance | BindingFlags.NonPublic); if (methodInfo != null) { var result = methodInfo.Invoke(@this, null); @@ -8699,10 +8699,10 @@ static bool CanEdit(Table @this) return ret; } - static bool CanDelete(Table @this) + static bool ProhibitDelete(Table @this) { var ret = false; - var methodInfo = @this.GetType().GetMethod("CanDelete", BindingFlags.Instance | BindingFlags.NonPublic); + var methodInfo = @this.GetType().GetMethod("ProhibitDelete", BindingFlags.Instance | BindingFlags.NonPublic); if (methodInfo != null) { var result = methodInfo.Invoke(@this, null);