From 2926a8aa365b26097537465ce18f56867fd089fc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 24 Nov 2025 11:47:47 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90antd/ele=E3=80=91?=
 =?UTF-8?q?=E3=80=90mp=E3=80=91freePublish=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mp/draft/index.vue    |  4 +--
 .../src/views/mp/freePublish/index.vue        | 21 ++++++++++------
 apps/web-ele/src/views/mp/draft/index.vue     |  4 +--
 .../src/views/mp/freePublish/index.vue        | 25 +++++++++++--------
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/apps/web-antd/src/views/mp/draft/index.vue b/apps/web-antd/src/views/mp/draft/index.vue
index cce7fdddc..ea3a87094 100644
--- a/apps/web-antd/src/views/mp/draft/index.vue
+++ b/apps/web-antd/src/views/mp/draft/index.vue
@@ -72,12 +72,12 @@ async function handleDelete(row: MpDraftApi.DraftArticle) {
     return;
   }
   const hideLoading = message.loading({
-    content: '删除中...',
+    content: $t('ui.actionMessage.deleting'),
     duration: 0,
   });
   try {
     await deleteDraft(accountId, row.mediaId);
-    message.success('删除成功');
+    message.success($t('ui.actionMessage.deleteSuccess'));
     handleRefresh();
   } finally {
     hideLoading();
diff --git a/apps/web-antd/src/views/mp/freePublish/index.vue b/apps/web-antd/src/views/mp/freePublish/index.vue
index d2d033d9b..77c46e070 100644
--- a/apps/web-antd/src/views/mp/freePublish/index.vue
+++ b/apps/web-antd/src/views/mp/freePublish/index.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MpFreePublishApi } from '#/api/mp/freePublish';
 
-import { confirm, DocAlert, Page } from '@vben/common-ui';
+import { DocAlert, Page } from '@vben/common-ui';
 
 import { Image, message, Typography } from 'ant-design-vue';
 
@@ -11,6 +12,7 @@ import { $t } from '#/locales';
 import { WxAccountSelect } from '#/views/mp/components';
 
 import { useGridColumns, useGridFormSchema } from './data';
+
 /** 刷新表格 */
 function handleRefresh() {
   gridApi.query();
@@ -21,20 +23,22 @@ function handleAccountChange(accountId: number) {
   gridApi.formApi.setValues({ accountId });
   gridApi.formApi.submitForm();
 }
+
 /** 删除文章 */
 async function handleDelete(row: MpFreePublishApi.FreePublish) {
-  // 二次确认提示
-  await confirm($t('ui.actionMessage.deleteConfirm', ['文章']));
+  const formValues = await gridApi.formApi.getValues();
+  const accountId = formValues.accountId;
+  if (!accountId) {
+    message.warning('请先选择公众号');
+    return;
+  }
   const hideLoading = message.loading({
-    content: '删除中...',
+    content: $t('ui.actionMessage.deleting'),
     duration: 0,
   });
   try {
-    const formValues = await gridApi.formApi.getValues();
-    const accountId = formValues.accountId;
     await deleteFreePublish(accountId, row.articleId!);
-    message.success($t('ui.actionMessage.deleteSuccess', ['文章']));
-    // 刷新列表
+    message.success($t('ui.actionMessage.deleteSuccess'));
     handleRefresh();
   } finally {
     hideLoading();
@@ -73,6 +77,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               });
             }
           });
+          // TODO @jawe：Article 类型，报错；
           return {
             list: res.list as unknown as Article[],
             total: res.total,
diff --git a/apps/web-ele/src/views/mp/draft/index.vue b/apps/web-ele/src/views/mp/draft/index.vue
index 6449e7e05..e6bfa4fd8 100644
--- a/apps/web-ele/src/views/mp/draft/index.vue
+++ b/apps/web-ele/src/views/mp/draft/index.vue
@@ -72,11 +72,11 @@ async function handleDelete(row: MpDraftApi.DraftArticle) {
     return;
   }
   const hideLoading = ElLoading.service({
-    text: '删除中...',
+    text: $t('ui.actionMessage.deleting'),
   });
   try {
     await deleteDraft(accountId, row.mediaId);
-    ElMessage.success('删除成功');
+    ElMessage.success($t('ui.actionMessage.deleteSuccess'));
     handleRefresh();
   } finally {
     hideLoading.close();
diff --git a/apps/web-ele/src/views/mp/freePublish/index.vue b/apps/web-ele/src/views/mp/freePublish/index.vue
index 7a8cdbfa1..c126c7f01 100644
--- a/apps/web-ele/src/views/mp/freePublish/index.vue
+++ b/apps/web-ele/src/views/mp/freePublish/index.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MpFreePublishApi } from '#/api/mp/freePublish';
 
-import { confirm, DocAlert, Page } from '@vben/common-ui';
+import { DocAlert, Page } from '@vben/common-ui';
 
-import { ElImage, ElLink, ElLoading } from 'element-plus';
+import { ElImage, ElLink, ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteFreePublish, getFreePublishPage } from '#/api/mp/freePublish';
@@ -25,20 +26,21 @@ function handleAccountChange(accountId: number) {
 
 /** 删除文章 */
 async function handleDelete(row: MpFreePublishApi.FreePublish) {
-  // 二次确认提示
-  await confirm($t('ui.actionMessage.deleteConfirm', ['文章']));
-  const hideLoading = ElLoading.service({
-    text: '删除中...',
+  const formValues = await gridApi.formApi.getValues();
+  const accountId = formValues.accountId;
+  if (!accountId) {
+    ElMessage.warning('请先选择公众号');
+    return;
+  }
+  const loadingInstance = ElLoading.service({
+    text: $t('ui.actionMessage.deleting'),
   });
   try {
-    const formValues = await gridApi.formApi.getValues();
-    const accountId = formValues.accountId;
     await deleteFreePublish(accountId, row.articleId!);
-    message.success($t('ui.actionMessage.deleteSuccess', ['文章']));
-    // 刷新列表
+    ElMessage.success($t('ui.actionMessage.deleteSuccess'));
     handleRefresh();
   } finally {
-    hideLoading();
+    loadingInstance.close();
   }
 }
 
@@ -74,6 +76,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               });
             }
           });
+          // TODO @jawe：Article 类型，报错；
           return {
             list: res.list as unknown as Article[],
             total: res.total,