Skip to content

fix(Table): remove ShowExtendEditButton/ShowExtendDeleteButton check condition #6090

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 3 commits into from
May 25, 2025
Merged

fix(Table): remove ShowExtendEditButton/ShowExtendDeleteButton check condition #6090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce771a6
fix: 移除 ShowExtendEditButton ShowExtendDeleteButton 判断条件
ArgoZhang May 25, 2025
9518374
test: 更新单元测试
ArgoZhang May 25, 2025
a2935f2
chore: bump version 9.6.5-beta02
ArgoZhang May 25, 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
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.6.5-beta01</Version>
<Version>9.6.5-beta02</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 3 additions & 4 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 @@ -545,6 +545,7 @@ public async Task EditAsync()
if (SelectedRows.Count == 1)
{
// 检查是否选中了不可编辑行（行内无编辑按钮），同时检查按钮禁用状态（禁用时不可编辑）
// ShowExtendEditButton 不参与逻辑，不显示扩展编辑按钮时用户可能自定义按钮调用 EditAsync 方法
if (ProhibitEdit())
{
// 提示不可编辑
Expand Down Expand Up @@ -1004,12 +1005,10 @@ protected async Task<bool> ConfirmDelete()
}

private bool ProhibitEdit() => (ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0]))
|| !ShowExtendEditButton
|| (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0]))
|| DisableExtendEditButton;
|| (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0]))
|| DisableExtendEditButton;

private bool ProhibitDelete() => (ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i)))
|| !ShowExtendDeleteButton
|| (DisableExtendDeleteButtonCallback != null && SelectedRows.Any(x => DisableExtendDeleteButtonCallback(x)))
|| DisableExtendDeleteButton;

Expand Down
6 changes: 4 additions & 2 deletions test/UnitTest/Components/TableTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8679,8 +8679,10 @@ public void Modify_Ok()
pb.Add(a => a.ShowExtendEditButton, false);
pb.Add(a => a.ShowExtendDeleteButton, false);
});
Assert.True(ProhibitEdit(cut.Instance));
Assert.True(ProhibitDelete(cut.Instance));

// 不显示编辑删除按钮不参与是否可编辑删除判断，用户可能自定义按钮编辑或者删除当前行
Assert.False(ProhibitEdit(cut.Instance));
Assert.False(ProhibitDelete(cut.Instance));

cut.SetParametersAndRender(pb =>
{
Expand Down