File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed
src/BootstrapBlazor/Components/Table Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff 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 }
You can’t perform that action at this time.
0 commit comments