From 25c027f3d8e9bb59fef1d419406efadf19c71017 Mon Sep 17 00:00:00 2001
From: Kven <2955163637@qq.com>
Date: Mon, 23 Jun 2025 21:25:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(@vben/web-antd):=20=E4=BC=98=E5=8C=96w?=
 =?UTF-8?q?ord=E6=A8=A1=E5=9D=97=E7=B1=BB=E5=9E=8B=E6=8E=A8=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-修复了一些类型定义和数据结构的问题
---
 apps/web-antd/package.json                    |  3 ++
 apps/web-antd/src/api/core/chatflow.ts        | 49 ++++++++++++++----
 .../views/word/components/word-list-view.vue  | 21 +++++---
 .../views/word/components/word-work-view.vue  | 29 +++++------
 apps/web-antd/src/views/word/index.vue        | 38 ++++++++------
 apps/web-antd/src/views/word/typing.ts        | 51 ++++++++++++++++---
 .../src/views/workflow/modules/form.vue       | 12 ++---
 apps/web-antd/src/views/workflow/typing.ts    | 15 ++++++
 pnpm-lock.yaml                                | 22 ++++++++
 9 files changed, 176 insertions(+), 64 deletions(-)
 create mode 100644 apps/web-antd/src/views/workflow/typing.ts

diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
index e74c3af..d2ec890 100644
--- a/apps/web-antd/package.json
+++ b/apps/web-antd/package.json
@@ -52,5 +52,8 @@
     "pinia": "catalog:",
     "vue": "catalog:",
     "vue-router": "catalog:"
+  },
+  "devDependencies": {
+    "@types/markdown-it": "^14.1.2"
   }
 }
diff --git a/apps/web-antd/src/api/core/chatflow.ts b/apps/web-antd/src/api/core/chatflow.ts
index e26edd1..172ee2f 100644
--- a/apps/web-antd/src/api/core/chatflow.ts
+++ b/apps/web-antd/src/api/core/chatflow.ts
@@ -24,15 +24,21 @@ export namespace ChatflowApi {
   }
 
   export interface ChatListResult {
-    id: string;
-    name: string;
-    inputs: {
-      [key: string]: any;
-    };
-    status: string;
-    introduction: string;
-    createAt: string;
-    updatedAt: string;
+    data: [
+      {
+        createAt: string;
+        id: string;
+        inputs: {
+          [key: string]: any;
+        };
+        introduction: string;
+        name: string;
+        status: string;
+        updatedAt: string;
+      },
+    ];
+    limit: number;
+    hasMore: boolean;
   }
 
   export interface deleteParams {
@@ -47,6 +53,24 @@ export namespace ChatflowApi {
     firstId: string;
     limit: string;
   }
+
+  export interface ChatMessageResult {
+    data: [
+      {
+        answer: string;
+        conversationId: string;
+        createdAt: string;
+        id: string;
+        inputs: {
+          [key: string]: any;
+        };
+        messageFiles: [];
+        query: string;
+      },
+    ];
+    limit: number;
+    hasMore: boolean;
+  }
 }
 
 // 聊天流
@@ -69,7 +93,7 @@ export async function getChatList(
   const url = params.appid
     ? `/v1/chat/conversations/${params.appid}`
     : '/v1/chat/conversations/';
-  return requestClient.request<ChatflowApi.ChatListResult[]>(url, {
+  return requestClient.request<ChatflowApi.ChatListResult>(url, {
     data,
     method: 'POST',
   });
@@ -95,5 +119,8 @@ export function getChatflowMessage(
   appId: string,
   data: ChatflowApi.ChatMessageParams,
 ) {
-  return requestClient.post(`/v1/chat/messages/${appId}`, data);
+  return requestClient.post<ChatflowApi.ChatMessageResult>(
+    `/v1/chat/messages/${appId}`,
+    data,
+  );
 }
diff --git a/apps/web-antd/src/views/word/components/word-list-view.vue b/apps/web-antd/src/views/word/components/word-list-view.vue
index 8441d78..f381b3b 100644
--- a/apps/web-antd/src/views/word/components/word-list-view.vue
+++ b/apps/web-antd/src/views/word/components/word-list-view.vue
@@ -1,12 +1,11 @@
 <script setup lang="ts">
 import type { ConversationsProps } from 'ant-design-x-vue';
 
-import type { PropsHistory } from '../typing';
+import type { AppListResult, ModeListResult, PropsHistory } from '../typing';
 
 import { computed, h, ref, watch } from 'vue';
 
 import { DeleteOutlined } from '@ant-design/icons-vue';
-// import { Card, CardContent, CardHeader, CardTitle } from '@vben-core/shadcn-ui';
 import { Menu } from 'ant-design-vue';
 import { Conversations } from 'ant-design-x-vue';
 
@@ -31,17 +30,23 @@ const conversationsItems = ref(defaultConversationsItems);
 const activeKey = ref(defaultConversationsItems.value[0]?.key);
 // 将 props.items 映射为 key=id, label=name, title=name 的结构
 const transformItems = computed(() => {
-  return props.temp.map((item) => ({
+  return props.temp.map((item: AppListResult) => ({
     key: item.id,
     label: item.name,
     title: item.name,
   }));
 });
 
-const itemsData = ref();
+const itemsData = ref<ModeListResult[]>([
+  {
+    title: '',
+    label: '',
+    key: '',
+  },
+]);
 
-const handleMenuClick = (item: { key: string }) => {
-  const selectedItem = itemsData.value.find((i) => i.key === item.key);
+const handleMenuClick = (info: any) => {
+  const selectedItem = itemsData.value.find((i) => i.key === info.key);
   if (selectedItem) {
     // 转换字段：title -> name, key -> id
     const transformedItem = {
@@ -75,7 +80,7 @@ const menuConfig: ConversationsProps['menu'] = (conversation) => ({
   },
 });
 
-const selectedKeys = ref([]);
+const selectedKeys = ref<string[]>([]);
 const openKeys = ref([]);
 
 // 监听 transformItems 变化，更新 itemsData
@@ -90,7 +95,7 @@ watch(
 watch(
   () => itemsData.value,
   (newVal) => {
-    if (newVal && newVal.length > 0) {
+    if (newVal.length > 0 && newVal[0]) {
       selectedKeys.value = [newVal[0].key];
       handleMenuClick(newVal[0]);
     }
diff --git a/apps/web-antd/src/views/word/components/word-work-view.vue b/apps/web-antd/src/views/word/components/word-work-view.vue
index 92b4d94..c314846 100644
--- a/apps/web-antd/src/views/word/components/word-work-view.vue
+++ b/apps/web-antd/src/views/word/components/word-work-view.vue
@@ -7,20 +7,14 @@ import type {
 
 import type { DrawerPlacement } from '@vben/common-ui';
 
-import type { Props, ResultItem } from '../typing';
+import type { Props, ResultItem, WordTempItem } from '../typing';
 
 import { computed, h, ref, watch } from 'vue';
 
 import { useVbenDrawer } from '@vben/common-ui';
 import { useUserStore } from '@vben/stores';
 
-import {
-  EditOutlined,
-  // CloudUploadOutlined,
-  // PaperClipOutlined,
-  UserOutlined,
-} from '@ant-design/icons-vue';
-// import type { VNode } from 'vue';
+import { EditOutlined, UserOutlined } from '@ant-design/icons-vue';
 import {
   Badge,
   Button,
@@ -41,38 +35,41 @@ import {
   Sender,
   Welcome,
 } from 'ant-design-x-vue';
-import markdownit from 'markdown-it';
+import markdownIt from 'markdown-it';
 
 import WordPreview from './word-preview.vue';
 
 defineOptions({ name: 'WordWorkView' });
 
 const props = withDefaults(defineProps<Props>(), {
-  item: () => null,
+  item: {
+    id: '',
+    name: '',
+  } as WordTempItem,
   itemMessage: Array,
-  paramsData: () => null,
-  runChatflow: () => async () => ({
+  paramsData: Array,
+  runChatFlow: () => async () => ({
     data: {
       outputs: {
         result: '',
       },
     },
   }),
-  projectInfo: () => ({
+  projectInfo: {
     projectName: '',
     projectContext: '',
     projectKeyAvoidTechOrKeyword: '',
     userInitialInnovationPoint: '',
-  }),
+  },
 });
 
 const emit = defineEmits(['history']);
 
 // 初始化 markdown 解析器
-const md = markdownit({ html: true, breaks: true });
+const md = markdownIt({ html: true, breaks: true });
 
 const renderMarkdown: BubbleListProps['roles'][string]['messageRender'] = (
-  content,
+  content: string,
 ) => {
   return h(Typography, [
     h('div', {
diff --git a/apps/web-antd/src/views/word/index.vue b/apps/web-antd/src/views/word/index.vue
index 0c47414..6c8900c 100644
--- a/apps/web-antd/src/views/word/index.vue
+++ b/apps/web-antd/src/views/word/index.vue
@@ -1,7 +1,10 @@
 <script lang="ts" setup>
-import type { ResultItem, WordTempItem } from './typing';
-
-import type { PPTTempItem } from '#/views/ppt/typing';
+import type {
+  AppListResult,
+  ChatListResult,
+  ResultItem,
+  WordTempItem,
+} from './typing';
 
 import { onMounted, ref } from 'vue';
 
@@ -20,11 +23,11 @@ import {
 
 import { WordListView, WordWorkView } from './components';
 
-const temp = ref([]);
+const temp = ref<AppListResult[]>([]);
 
-const hitsory = ref([]);
+const history = ref<ChatListResult[]>([]);
 const loading = ref(true);
-const params = ref({});
+const params = ref([]);
 const projectInfo = ref({});
 const userStore = useUserStore();
 
@@ -41,7 +44,7 @@ const getLogs = async (appid: string) => {
       limit: '9',
     },
   );
-  hitsory.value = res.data;
+  history.value = res.data;
 
   loading.value = false;
 };
@@ -54,7 +57,10 @@ const getTemp = async () => {
   }
 };
 
-const currentTemp = ref<null | PPTTempItem>(null);
+const currentTemp = ref<AppListResult>({
+  id: '',
+  name: '',
+});
 const activeKey = ref('');
 
 function handleClickMode(item: WordTempItem) {
@@ -74,13 +80,13 @@ async function changeLogs(id: string) {
       appid: id,
     },
     {
-      userId: '1562',
+      userId: userStore.userInfo?.userId || '',
       lastId: '',
       sortBy: '',
       limit: '9',
     },
   );
-  hitsory.value = res.data;
+  history.value = res.data;
   activeKey.value = res.data[0].id;
 }
 
@@ -101,9 +107,9 @@ const itemMessage = ref<ResultItem[]>([]);
 
 async function deleteLog(item: any) {
   const res = await deleteChatflow({
-    appId: currentTemp.value.id,
+    appId: currentTemp.value.id || '',
     conversationId: item,
-    userId: '1562',
+    userId: userStore.userInfo?.userId || '',
   });
   if (res.message === '删除成功') {
     message.success('删除成功');
@@ -121,7 +127,7 @@ async function getParameters(id: string) {
 
 async function handleClick(item: string) {
   const res = await getChatflowMessage(currentTemp.value.id, {
-    userId: '1562',
+    userId: userStore.userInfo?.userId || '',
     firstId: '',
     conversationId: item,
     limit: '',
@@ -135,7 +141,7 @@ async function handleClick(item: string) {
           key: itemMessage.value.length + 1,
           role: 'user', // 'user' or 'ai'
           content: msg.inputs.projectName,
-          footer: msg.footer,
+          // footer: msg.footer,
         });
       }
       if (msg.answer) {
@@ -161,7 +167,7 @@ onMounted(() => {
       <WordListView
         title="选择模板"
         :temp="temp"
-        :items="hitsory"
+        :items="history"
         :loading="loading"
         :key="activeKey"
         @click-mode="handleClickMode"
@@ -173,7 +179,7 @@ onMounted(() => {
     <WordWorkView
       :item="currentTemp"
       :params-data="params"
-      :run-chatflow="sendWord"
+      :run-chat-flow="sendWord"
       :item-message="itemMessage"
       :project-info="projectInfo"
       @history="changeLogs"
diff --git a/apps/web-antd/src/views/word/typing.ts b/apps/web-antd/src/views/word/typing.ts
index c7d39d9..de795d6 100644
--- a/apps/web-antd/src/views/word/typing.ts
+++ b/apps/web-antd/src/views/word/typing.ts
@@ -18,7 +18,7 @@ interface WordHistoryItem {
 interface ResultItem {
   key: number;
   role: 'ai' | 'user';
-  content: string;
+  content: any;
   footer?: any;
 }
 
@@ -48,21 +48,58 @@ interface WorkflowResult {
 }
 interface Props {
   itemMessage?: ResultItem[];
-  item?: WordTempItem;
-  paramsData?: object;
-  runChatflow?: (
+  item?: null | WordTempItem;
+  paramsData?: string[];
+  runChatFlow?: (
     appId: any,
     context: WorkflowContext,
   ) => Promise<WorkflowResult>;
-  projectInfo: object;
+  projectInfo: {
+    projectContext: string;
+    projectKeyAvoidTechOrKeyword: string;
+    projectName: string;
+    userInitialInnovationPoint: string;
+  };
+}
+
+interface AppListResult {
+  id: string;
+  name: string;
 }
 
 interface PropsHistory {
   temp: any;
-  items?: WordHistoryItem[];
+  items?: AppListResult[];
   key?: string;
   title: string;
   loading: boolean;
 }
 
-export type { Props, PropsHistory, ResultItem, WordHistoryItem, WordTempItem };
+interface ChatListResult {
+  id: string;
+  name: string;
+  inputs: {
+    [key: string]: any;
+  };
+  status: string;
+  introduction: string;
+  createAt: string;
+  updatedAt: string;
+}
+
+interface ModeListResult {
+  title: string;
+  label: string;
+  key: string;
+}
+
+export type {
+  AppListResult,
+  ChatListResult,
+  ModeListResult,
+  Props,
+  PropsHistory,
+  ResultItem,
+  WordHistoryItem,
+  WordTempItem,
+};
diff --git a/apps/web-antd/src/views/workflow/modules/form.vue b/apps/web-antd/src/views/workflow/modules/form.vue
index a78b3a3..42fed21 100644
--- a/apps/web-antd/src/views/workflow/modules/form.vue
+++ b/apps/web-antd/src/views/workflow/modules/form.vue
@@ -3,6 +3,8 @@ import type { DataNode } from 'ant-design-vue/es/tree';
 
 import type { Recordable } from '@vben/types';
 
+import type { Dept, DeptList } from '#/views/workflow/typing';
+
 import { ref } from 'vue';
 
 import { useVbenModal, VbenTree } from '@vben/common-ui';
@@ -18,7 +20,7 @@ const emits = defineEmits(['success']);
 const workflowId = ref();
 const deptData = ref<DataNode[]>([]);
 
-function convertToTreeNode(item: any): DataNode {
+function convertToTreeNode(item: Dept): DataNode {
   return {
     key: item.id,
     title: item.name,
@@ -29,7 +31,7 @@ function convertToTreeNode(item: any): DataNode {
 
 async function getDeptList() {
   const res = await getAllDeptTree(0);
-  deptData.value = res.map((item) => convertToTreeNode(item));
+  deptData.value = res.map((item: Dept) => convertToTreeNode(item));
 }
 
 const [Form, formApi] = useVbenForm({
@@ -39,8 +41,6 @@ const [Form, formApi] = useVbenForm({
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    // const values = await formApi;
-    if (!formApi.form.values.deptIds) return;
     const deptIds = formApi.form.values.deptIds;
     modalApi.lock();
     try {
@@ -52,7 +52,7 @@ const [Modal, modalApi] = useVbenModal({
         message: '操作成功',
       });
       emits('success');
-      modalApi.close();
+      await modalApi.close();
     } finally {
       modalApi.lock(false);
     }
@@ -61,7 +61,7 @@ const [Modal, modalApi] = useVbenModal({
     if (isOpen) {
       workflowId.value = modalApi.getData().id;
       const res = await linkDetail(workflowId.value);
-      const deptIds = res.map((item) => item.deptId);
+      const deptIds = res.map((item: DeptList) => item.deptId);
       await getDeptList();
       // 设置表单字段的值为过滤出的 deptIds
       formApi.form.setValues({
diff --git a/apps/web-antd/src/views/workflow/typing.ts b/apps/web-antd/src/views/workflow/typing.ts
new file mode 100644
index 0000000..81dc115
--- /dev/null
+++ b/apps/web-antd/src/views/workflow/typing.ts
@@ -0,0 +1,15 @@
+interface Dept {
+  id: number;
+  pid?: number;
+  createTime: string;
+  name: string;
+  enabled: string;
+  children: Dept[];
+}
+
+interface DeptList {
+  workflowId: string;
+  deptId: number;
+}
+
+export type { Dept, DeptList };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 887ba89..95044a7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -673,6 +673,10 @@ importers:
       vue-router:
         specifier: 'catalog:'
         version: 4.5.1(vue@3.5.13(typescript@5.8.3))
+    devDependencies:
+      '@types/markdown-it':
+        specifier: ^14.1.2
+        version: 14.1.2
 
   internal/lint-configs/commitlint-config:
     dependencies:
@@ -3889,6 +3893,9 @@ packages:
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
+  '@types/linkify-it@5.0.0':
+    resolution: {integrity: sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==}
+
   '@types/lodash.clonedeep@4.5.9':
     resolution: {integrity: sha512-19429mWC+FyaAhOLzsS8kZUsI+/GmBAQ0HFiCPsKGU+7pBXOQWhyrY6xNNDwUSX8SMZMJvuFVMF9O5dQOlQK9Q==}
 
@@ -3904,6 +3911,12 @@ packages:
   '@types/lodash@4.17.16':
     resolution: {integrity: sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==}
 
+  '@types/markdown-it@14.1.2':
+    resolution: {integrity: sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==}
+
+  '@types/mdurl@2.0.0':
+    resolution: {integrity: sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==}
+
   '@types/minimatch@3.0.5':
     resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==}
 
@@ -12784,6 +12797,8 @@ snapshots:
 
   '@types/json-schema@7.0.15': {}
 
+  '@types/linkify-it@5.0.0': {}
+
   '@types/lodash.clonedeep@4.5.9':
     dependencies:
       '@types/lodash': 4.17.16
@@ -12802,6 +12817,13 @@ snapshots:
 
   '@types/lodash@4.17.16': {}
 
+  '@types/markdown-it@14.1.2':
+    dependencies:
+      '@types/linkify-it': 5.0.0
+      '@types/mdurl': 2.0.0
+
+  '@types/mdurl@2.0.0': {}
+
   '@types/minimatch@3.0.5': {}
 
   '@types/node@12.20.55': {}