Skip to content

Commit 7759b98

Browse files
author
AiZhen
committed
增强编辑和删除操作的按钮状态检查
添加了对编辑按钮禁用状态的检查,确保在编辑时考虑行的可编辑性和按钮的可用性。同时,更新了删除操作的逻辑,增加了对删除按钮禁用状态的检查,以提高代码的健壮性。
1 parent d456d8c commit 7759b98

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,11 @@ public async Task EditAsync()
544544
{
545545
if (SelectedRows.Count == 1)
546546
{
547-
// 检查是否选中了不可编辑行(行内无编辑按钮)
548-
if (ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0]))
547+
// 检查是否选中了不可编辑行(行内无编辑按钮),同时检查按钮禁用状态(禁用时不可编辑)
548+
if ((ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0]))
549+
|| !ShowExtendEditButton
550+
|| (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0]))
551+
|| DisableExtendEditButton)
549552
{
550553
// 提示不可编辑
551554
await ShowToastAsync(EditButtonToastTitle, EditButtonToastReadonlyContent);
@@ -992,7 +995,10 @@ protected async Task<bool> ConfirmDelete()
992995
{
993996
await ShowDeleteToastAsync(DeleteButtonToastTitle, DeleteButtonToastContent);
994997
}
995-
else if (ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i)))
998+
else if ((ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i)))
999+
|| !ShowExtendDeleteButton
1000+
|| (DisableExtendDeleteButtonCallback != null && SelectedRows.Any(x => DisableExtendDeleteButtonCallback(x)))
1001+
|| DisableExtendDeleteButton)
9961002
{
9971003
await ShowDeleteToastAsync(DeleteButtonToastTitle, DeleteButtonToastCanNotDeleteContent);
9981004
}

0 commit comments

Comments
 (0)