From ff5358da4b4ca6411fdc00f5d5093a334968bb7e Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Thu, 15 May 2025 14:37:02 +0800
Subject: [PATCH] feat: popConfirm button

---
 apps/web-antd/src/views/system/role/index.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/system/role/index.vue b/apps/web-antd/src/views/system/role/index.vue
index 9d6b2c54..80338f3e 100644
--- a/apps/web-antd/src/views/system/role/index.vue
+++ b/apps/web-antd/src/views/system/role/index.vue
@@ -57,7 +57,6 @@ function onCreate() {
 }
 
 /** 删除角色 */
-// TODO @xingyu：删除这个二次确认，有啥好的办法么？
 async function onDelete(row: SystemRoleApi.Role) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
@@ -66,6 +65,7 @@ async function onDelete(row: SystemRoleApi.Role) {
   });
   try {
     await deleteRole(row.id as number);
+    hideLoading();
     message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
     onRefresh();
   } catch {
@@ -162,20 +162,23 @@ const [Grid, gridApi] = useVbenVxeGrid({
               danger: true,
               icon: 'ant-design:delete-outlined',
               auth: ['system:role:delete'],
-              onClick: onDelete.bind(null, row),
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: onDelete.bind(null, row),
+              },
             },
           ]"
           :drop-down-actions="[
             {
               label: '数据权限',
               type: 'link',
-              auth: ['system:role:update'],
+              auth: ['system:permission:assign-role-data-scope'],
               onClick: onAssignDataPermission.bind(null, row),
             },
             {
               label: '菜单权限',
               type: 'link',
-              auth: ['system:role:update'],
+              auth: ['system:permission:assign-role-menu'],
               onClick: onAssignMenu.bind(null, row),
             },
           ]"