Skip to content

feat(Table): enhances the validation logic for edit and delete operations #5992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 8, 2025
Merged

feat(Table): enhances the validation logic for edit and delete operations #5992

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7759b98
增强编辑和删除操作的按钮状态检查
May 8, 2025
6f6eea3
Merge branch 'main' into Feat_Table
ArgoZhang May 8, 2025
956ddb1
refactor: 重构代码
ArgoZhang May 8, 2025
ab87080
test: 增加单元测试
ArgoZhang May 8, 2025
96e8e68
test: 更新单元测试
ArgoZhang May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,11 @@
{
if (SelectedRows.Count == 1)
{
// 检查是否选中了不可编辑行（行内无编辑按钮）
if (ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0]))
// 检查是否选中了不可编辑行（行内无编辑按钮），同时检查按钮禁用状态（禁用时不可编辑）
if ((ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0]))
|| !ShowExtendEditButton
|| (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0]))
|| DisableExtendEditButton)
{
// 提示不可编辑
await ShowToastAsync(EditButtonToastTitle, EditButtonToastReadonlyContent);
Expand Down Expand Up @@ -992,7 +995,10 @@
{
await ShowDeleteToastAsync(DeleteButtonToastTitle, DeleteButtonToastContent);
}
else if (ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i)))
else if ((ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i)))
|| !ShowExtendDeleteButton
|| (DisableExtendDeleteButtonCallback != null && SelectedRows.Any(x => DisableExtendDeleteButtonCallback(x)))

Check warning on line 1000 in src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs

View check run for this annotation

Codecov / codecov/patch

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

Added line #L1000 was not covered by tests
|| DisableExtendDeleteButton)
{
await ShowDeleteToastAsync(DeleteButtonToastTitle, DeleteButtonToastCanNotDeleteContent);
}
Expand Down