fix: delete loading

apps/web-antd/src/components/table-action/index.ts

@@ -1,2 +1,4 @@
 export { default as TableAction } from './table-action.vue';
+
+export const ACTION_KEY = 'action_key_msg';
 export * from './typing';

apps/web-antd/src/views/system/role/index.vue

@@ -11,7 +11,7 @@ import { Button, message } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteRole, exportRole, getRolePage } from '#/api/system/role';
 import { DocAlert } from '#/components/doc-alert';
-import { TableAction } from '#/components/table-action';
+import { ACTION_KEY, TableAction } from '#/components/table-action';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -58,20 +58,16 @@ function onCreate() {
 
 /** 删除角色 */
 async function onDelete(row: SystemRoleApi.Role) {
-  const hideLoading = message.loading({
+  message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
-    duration: 0,
-    key: 'action_process_msg',
+    key: ACTION_KEY,
   });
-  try {
-    await deleteRole(row.id as number);
-    // TODO @xingyu：是不是统一 finally hideLoading 比较好？
-    hideLoading();
-    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
-  } catch {
-    hideLoading();
-  }
+  await deleteRole(row.id as number);
+  message.success({
+    content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+    key: ACTION_KEY,
+  });
+  onRefresh();
 }
 
 /** 分配角色的数据权限 */

apps/web-antd/src/views/system/tenant/index.vue

@@ -15,6 +15,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteTenant, exportTenant, getTenantPage } from '#/api/system/tenant';
 import { getTenantPackageList } from '#/api/system/tenant-package';
 import { DocAlert } from '#/components/doc-alert';
+import { ACTION_KEY, TableAction } from '#/components/table-action';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -58,16 +59,16 @@ function onEdit(row: SystemTenantApi.Tenant) {
 
 /** 删除租户 */
 async function onDelete(row: SystemTenantApi.Tenant) {
-  try {
-    message.loading({
-      content: $t('ui.actionMessage.deleting', [row.name]),
-      duration: 2.5,
-    });
-    await deleteTenant(row.id as number);
-    onRefresh();
-  } finally {
-    message.error($t('ui.actionMessage.deleteFailed', [row.name]));
-  }
+  message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    key: ACTION_KEY,
+  });
+  await deleteTenant(row.id as number);
+  message.success({
+    content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+    key: ACTION_KEY,
+  });
+  onRefresh();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({

apps/web-antd/src/views/system/tenantPackage/index.vue

@@ -13,6 +13,7 @@ import {
   getTenantPackagePage,
 } from '#/api/system/tenant-package';
 import { DocAlert } from '#/components/doc-alert';
+import { ACTION_KEY, TableAction } from '#/components/table-action';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
@@ -40,18 +41,16 @@ function onEdit(row: SystemTenantPackageApi.TenantPackage) {
 
 /** 删除租户套餐 */
 async function onDelete(row: SystemTenantPackageApi.TenantPackage) {
-  const hideLoading = message.loading({
+  message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
-    duration: 0,
-    key: 'action_process_msg',
+    key: ACTION_KEY,
   });
-  try {
-    await deleteTenantPackage(row.id as number);
-    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
-  } catch {
-    hideLoading();
-  }
+  await deleteTenantPackage(row.id as number);
+  message.success({
+    content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+    key: ACTION_KEY,
+  });
+  onRefresh();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({

apps/web-antd/src/views/system/user/index.vue

@@ -19,7 +19,7 @@ import {
   updateUserStatus,
 } from '#/api/system/user';
 import { DocAlert } from '#/components/doc-alert';
-import { TableAction } from '#/components/table-action';
+import { ACTION_KEY, TableAction } from '#/components/table-action';
 import { $t } from '#/locales';
 import { DICT_TYPE, getDictLabel } from '#/utils';
 
@@ -85,18 +85,16 @@ function onEdit(row: SystemUserApi.User) {
 
 /** 删除用户 */
 async function onDelete(row: SystemUserApi.User) {
-  const hideLoading = message.loading({
+  message.loading({
     content: $t('ui.actionMessage.deleting', [row.username]),
-    duration: 0,
-    key: 'action_process_msg',
+    key: ACTION_KEY,
   });
-  try {
-    await deleteUser(row.id as number);
-    message.success($t('ui.actionMessage.deleteSuccess', [row.username]));
-    onRefresh();
-  } catch {
-    hideLoading();
-  }
+  await deleteUser(row.id as number);
+  message.success({
+    content: $t('ui.actionMessage.deleteSuccess', [row.username]),
+    key: ACTION_KEY,
+  });
+  onRefresh();
 }
 
 /** 重置密码 */