diff --git a/apps/web-antd/src/api/core/workflow.ts b/apps/web-antd/src/api/core/workflow.ts index 72c2ca0..fb86d99 100644 --- a/apps/web-antd/src/api/core/workflow.ts +++ b/apps/web-antd/src/api/core/workflow.ts @@ -3,6 +3,12 @@ import { requestClient } from '#/api/request'; export namespace WorkflowApi { export interface WorkflowParams { appid: string; + conversationId: string; + userId: string; + inputs: { + [key: string]: any; + }; + files: []; } export interface WorkflowRunBody { conversationId: string; @@ -12,6 +18,13 @@ export namespace WorkflowApi { }; files: []; } + export interface WorkflowLogParams { + appid: string; + lastId?: string; + page?: number; + limit?: number; + keyword?: string; + } } // 工作流 @@ -34,6 +47,6 @@ export function sendWorkflow( // return requestClient.get('/v1/workflow/info', { data }); // }; // -// export function getWorkflowLog(data){ -// return requestClient.get('/v1/workflow/logs', { data }); -// }; +export function getWorkflowLog(params: WorkflowApi.WorkflowLogParams) { + return requestClient.post(`/v1/workflow/logs/${params.appid}`, { ...params }); +} diff --git a/apps/web-antd/src/views/ppt/index.vue b/apps/web-antd/src/views/ppt/index.vue index 2120508..803b3fa 100644 --- a/apps/web-antd/src/views/ppt/index.vue +++ b/apps/web-antd/src/views/ppt/index.vue @@ -1,615 +1,55 @@ - diff --git a/apps/web-antd/src/views/ppt/index2.vue b/apps/web-antd/src/views/ppt/index2.vue new file mode 100644 index 0000000..2120508 --- /dev/null +++ b/apps/web-antd/src/views/ppt/index2.vue @@ -0,0 +1,615 @@ + + + diff --git a/apps/web-antd/src/views/spider/index.vue b/apps/web-antd/src/views/spider/index.vue index 6c2533e..5aed1d4 100644 --- a/apps/web-antd/src/views/spider/index.vue +++ b/apps/web-antd/src/views/spider/index.vue @@ -11,7 +11,7 @@ const spiderList = ref([]); const loading = ref(true); const spider = ref(); -const getChatflowList = async () => { +const getFlowList = async () => { const res = await getAppList({}); if (res) { spiderList.value = res; @@ -24,7 +24,7 @@ function handleClick(item: SpiderItem) { } onMounted(() => { - getChatflowList(); + getFlowList(); }); diff --git a/apps/web-antd/src/views/spider/index2.vue b/apps/web-antd/src/views/spider/index2.vue deleted file mode 100644 index fb723e2..0000000 --- a/apps/web-antd/src/views/spider/index2.vue +++ /dev/null @@ -1,210 +0,0 @@ - - - diff --git a/apps/web-antd/src/views/word/index.vue b/apps/web-antd/src/views/word/index.vue index 8bd564c..5aed1d4 100644 --- a/apps/web-antd/src/views/word/index.vue +++ b/apps/web-antd/src/views/word/index.vue @@ -1,635 +1,51 @@ - diff --git a/apps/web-antd/src/views/word/index2.vue b/apps/web-antd/src/views/word/index2.vue new file mode 100644 index 0000000..8bd564c --- /dev/null +++ b/apps/web-antd/src/views/word/index2.vue @@ -0,0 +1,635 @@ + + + diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json index 325c619..a108af5 100644 --- a/packages/effects/common-ui/package.json +++ b/packages/effects/common-ui/package.json @@ -28,6 +28,7 @@ } }, "dependencies": { + "@ant-design/icons-vue": "^7.0.1", "@vben-core/form-ui": "workspace:*", "@vben-core/popup-ui": "workspace:*", "@vben-core/preferences": "workspace:*", @@ -41,6 +42,7 @@ "@vueuse/core": "catalog:", "@vueuse/integrations": "catalog:", "ant-design-vue": "catalog:", + "ant-design-x-vue": "^1.1.2", "qrcode": "catalog:", "tippy.js": "catalog:", "vue": "catalog:", diff --git a/packages/effects/common-ui/src/ui/index.ts b/packages/effects/common-ui/src/ui/index.ts index 1f8bc38..7fe5f36 100644 --- a/packages/effects/common-ui/src/ui/index.ts +++ b/packages/effects/common-ui/src/ui/index.ts @@ -3,4 +3,5 @@ export * from './authentication'; export * from './dashboard'; export * from './fallback'; export * from './home'; +export * from './ppt'; export * from './spider'; diff --git a/packages/effects/common-ui/src/ui/ppt/index.ts b/packages/effects/common-ui/src/ui/ppt/index.ts new file mode 100644 index 0000000..a63baff --- /dev/null +++ b/packages/effects/common-ui/src/ui/ppt/index.ts @@ -0,0 +1,4 @@ +export { default as PptHistoryView } from './ppt-history-view.vue'; +export { default as PptListView } from './ppt-list-view.vue'; +export { default as PptWorkView } from './ppt-work-view.vue'; +export type * from './typing'; diff --git a/packages/effects/common-ui/src/ui/ppt/ppt-history-view.vue b/packages/effects/common-ui/src/ui/ppt/ppt-history-view.vue new file mode 100644 index 0000000..e774cd1 --- /dev/null +++ b/packages/effects/common-ui/src/ui/ppt/ppt-history-view.vue @@ -0,0 +1,45 @@ + + + diff --git a/packages/effects/common-ui/src/ui/ppt/ppt-list-view.vue b/packages/effects/common-ui/src/ui/ppt/ppt-list-view.vue new file mode 100644 index 0000000..aa00937 --- /dev/null +++ b/packages/effects/common-ui/src/ui/ppt/ppt-list-view.vue @@ -0,0 +1,38 @@ + + + diff --git a/packages/effects/common-ui/src/ui/ppt/ppt-work-view.vue b/packages/effects/common-ui/src/ui/ppt/ppt-work-view.vue new file mode 100644 index 0000000..e227f93 --- /dev/null +++ b/packages/effects/common-ui/src/ui/ppt/ppt-work-view.vue @@ -0,0 +1,169 @@ + + + diff --git a/packages/effects/common-ui/src/ui/ppt/typing.ts b/packages/effects/common-ui/src/ui/ppt/typing.ts new file mode 100644 index 0000000..e2b1576 --- /dev/null +++ b/packages/effects/common-ui/src/ui/ppt/typing.ts @@ -0,0 +1,17 @@ +interface PPTTempItem { + id: string; + name: string; +} + +interface PptHistoryItem { + id: string; + workflowRun: { + id: string; + }; + createdByEndUser: { + id: string; + sessionId: string; + }; +} + +export type { PptHistoryItem, PPTTempItem }; diff --git a/packages/effects/common-ui/src/ui/spider/spider-work-view.vue b/packages/effects/common-ui/src/ui/spider/spider-work-view.vue index 43b5161..d1a6efb 100644 --- a/packages/effects/common-ui/src/ui/spider/spider-work-view.vue +++ b/packages/effects/common-ui/src/ui/spider/spider-work-view.vue @@ -65,7 +65,7 @@ const startFetching = async () => { try { const res = await props.runSpider( { - appid: 'c736edd0-925d-4877-9223-56aab7342311', + appid: props.item.id, }, { userId: '1562', diff --git a/packages/icons/src/iconify/index.ts b/packages/icons/src/iconify/index.ts index 9b9bf26..3c966fb 100644 --- a/packages/icons/src/iconify/index.ts +++ b/packages/icons/src/iconify/index.ts @@ -11,3 +11,5 @@ export const MdiGithub = createIconifyIcon('mdi:github'); export const MdiGoogle = createIconifyIcon('mdi:google'); export const MdiChevron = createIconifyIcon('tabler:chevron-right'); +export const MdiUser = createIconifyIcon('mdi:user'); +export const MageRobot = createIconifyIcon('mage:robot'); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a03de33..1f4c35d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1293,6 +1293,9 @@ importers: packages/effects/common-ui: dependencies: + '@ant-design/icons-vue': + specifier: ^7.0.1 + version: 7.0.1(vue@3.5.13(typescript@5.8.3)) '@vben-core/form-ui': specifier: workspace:* version: link:../../@core/ui-kit/form-ui @@ -1332,6 +1335,9 @@ importers: ant-design-vue: specifier: 'catalog:' version: 4.2.6(vue@3.5.13(typescript@5.8.3)) + ant-design-x-vue: + specifier: ^1.1.2 + version: 1.1.2(ant-design-vue@4.2.6(vue@3.5.13(typescript@5.8.3)))(vue@3.5.13(typescript@5.8.3)) qrcode: specifier: 'catalog:' version: 1.5.4