fix: todo修复

2025-11-21 18:19:42 +08:00
parent 0251dc2f3b
commit 8d7d3d5fe1
86 changed files with 963 additions and 1195 deletions
--- a/apps/web-ele/src/views/mp/draft/index.vue
+++ b/apps/web-ele/src/views/mp/draft/index.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
-import type { Article } from './modules/types';
-
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MpDraftApi } from '#/api/mp/draft';

 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';

@@ -9,7 +8,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus';

 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteDraft, getDraftPage } from '#/api/mp/draft';
-import * as MpFreePublishApi from '#/api/mp/freePublish';
+import { submitFreePublish } from '#/api/mp/freePublish';
 import { WxAccountSelect } from '#/views/mp/components';
 import { createEmptyNewsItem } from '#/views/mp/draft/modules/types';

@@ -19,11 +18,6 @@ import Form from './modules/form.vue';

 defineOptions({ name: 'MpDraft' });

-const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: Form,
-  destroyOnClose: true,
-});
-
 /** 刷新表格 */
 function handleRefresh() {
  gridApi.query();
@@ -35,7 +29,91 @@ function handleAccountChange(accountId: number) {
  gridApi.formApi.submitForm();
 }

-// TODO @hw：代码风格，要和对应的 antd index.vue 一致，类似方法的顺序，注释等。原因是，这样后续两端迭代，会方便很多。
+/** 新增草稿 */
+async function handleCreate() {
+  const formValues = await gridApi.formApi.getValues();
+  const accountId = formValues.accountId;
+  if (!accountId) {
+    ElMessage.warning('请先选择公众号');
+    return;
+  }
+  formModalApi
+    .setData({
+      isCreating: true,
+      accountId,
+      newsList: [createEmptyNewsItem()],
+    })
+    .open();
+}
+
+/** 修改草稿 */
+async function handleEdit(row: MpDraftApi.DraftArticle) {
+  const formValues = await gridApi.formApi.getValues();
+  const accountId = formValues.accountId;
+  if (!accountId) {
+    ElMessage.warning('请先选择公众号');
+    return;
+  }
+  formModalApi
+    .setData({
+      isCreating: false,
+      accountId,
+      mediaId: row.mediaId,
+      newsList: row.content.newsItem,
+    })
+    .open();
+}
+
+/** 删除草稿 */
+async function handleDelete(row: MpDraftApi.DraftArticle) {
+  const formValues = await gridApi.formApi.getValues();
+  const accountId = formValues.accountId;
+  if (!accountId) {
+    ElMessage.warning('请先选择公众号');
+    return;
+  }
+  await ElMessageBox.confirm('此操作将永久删除该草稿, 是否继续?');
+  const hideLoading = ElLoading.service({
+    text: '删除中...',
+  });
+  try {
+    await deleteDraft(accountId, row.mediaId);
+    ElMessage.success('删除成功');
+    handleRefresh();
+  } finally {
+    hideLoading.close();
+  }
+}
+
+/** 发布草稿 */
+async function handlePublish(row: MpDraftApi.DraftArticle) {
+  const formValues = await gridApi.formApi.getValues();
+  const accountId = formValues.accountId;
+  if (!accountId) {
+    ElMessage.warning('请先选择公众号');
+    return;
+  }
+  await ElMessageBox.confirm(
+    '你正在通过发布的方式发表内容。 发布不占用群发次数，一天可多次发布。' +
+      '已发布内容不会推送给用户，也不会展示在公众号主页中。 ' +
+      '发布后，你可以前往发表记录获取链接，也可以将发布内容添加到自定义菜单、自动回复、话题和页面模板中。',
+  );
+  const hideLoading = ElLoading.service({
+    text: '发布中...',
+  });
+  try {
+    await submitFreePublish(accountId, row.mediaId);
+    ElMessage.success('发布成功');
+    handleRefresh();
+  } finally {
+    hideLoading.close();
+  }
+}
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});

 const [Grid, gridApi] = useVbenVxeGrid({
  formOptions: {
@@ -48,6 +126,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
    proxyConfig: {
      ajax: {
        query: async ({ page }, formValues) => {
+          // 调试用：跳过请求，直接返回模拟数据
          const drafts = await getDraftPage({
            pageNo: page.currentPage,
            pageSize: page.pageSize,
@@ -62,9 +141,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
              });
            }
          });
+
+          // 模拟数据
+          // const mockList = [
+
          return {
-            list: drafts.list as unknown as Article[],
-            total: drafts.total,
+            list: drafts.list,
+            total: drafts.total, // 模拟总数
          };
        },
      },
@@ -78,101 +161,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
      refresh: true,
      search: true,
    },
-  } as VxeTableGridOptions<Article>,
+  } as VxeTableGridOptions<MpDraftApi.DraftArticle>,
 });
-
-/** 新增按钮操作 */
-async function handleCreate() {
-  const formValues = await gridApi.formApi.getValues();
-  const accountId = formValues.accountId;
-  if (!accountId || accountId === -1) {
-    ElMessage.warning('请先选择公众号');
-    return;
-  }
-
-  formModalApi
-    .setData({
-      isCreating: true,
-      accountId,
-      newsList: [createEmptyNewsItem()],
-    })
-    .open();
-}
-
-/** 修改按钮操作 */
-async function handleEdit(row: Article) {
-  const formValues = await gridApi.formApi.getValues();
-  const accountId = formValues.accountId;
-  if (!accountId || accountId === -1) {
-    ElMessage.warning('请先选择公众号');
-    return;
-  }
-
-  formModalApi
-    .setData({
-      isCreating: false,
-      accountId,
-      mediaId: row.mediaId,
-      newsList: row.content.newsItem,
-    })
-    .open();
-}
-
-/** 发布按钮操作 */
-async function handlePublish(row: Article) {
-  const formValues = await gridApi.formApi.getValues();
-  const accountId = formValues.accountId;
-  if (!accountId || accountId === -1) {
-    ElMessage.warning('请先选择公众号');
-    return;
-  }
-
-  const content =
-    '你正在通过发布的方式发表内容。 发布不占用群发次数，一天可多次发布。' +
-    '已发布内容不会推送给用户，也不会展示在公众号主页中。 ' +
-    '发布后，你可以前往发表记录获取链接，也可以将发布内容添加到自定义菜单、自动回复、话题和页面模板中。';
-  try {
-    await ElMessageBox.confirm(content);
-    const loadingInstance = ElLoading.service({
-      text: '发布中...',
-    });
-    try {
-      await MpFreePublishApi.submitFreePublish(accountId, row.mediaId);
-      ElMessage.success('发布成功');
-      await gridApi.query();
-    } finally {
-      loadingInstance.close();
-    }
-  } catch {
-    //
-  }
-}
-
-/** 删除按钮操作 */
-async function handleDelete(row: Article) {
-  const formValues = await gridApi.formApi.getValues();
-  const accountId = formValues.accountId;
-  if (!accountId) {
-    ElMessage.warning('请先选择公众号');
-    return;
-  }
-
-  try {
-    await ElMessageBox.confirm('此操作将永久删除该草稿, 是否继续?');
-    const loadingInstance = ElLoading.service({
-      text: '删除中...',
-    });
-    try {
-      await deleteDraft(accountId, row.mediaId);
-      ElMessage.success('删除成功');
-      handleRefresh();
-    } finally {
-      loadingInstance.close();
-    }
-  } catch {
-    //
-  }
-}
 </script>

 <template>