From 238809ecfdca25441404f3174dc20e771043654d Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Mon, 16 Dec 2024 10:18:33 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=A1=E6=89=B9=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/system/oss/index.ts | 2 +- .../src/api/workflow/instance/model.d.ts | 2 +- .../workflow/components/approval-panel.vue | 23 ++++-- .../components/approval-timeline-item.vue | 74 +++++++++++++++++++ .../workflow/components/approval-timeline.vue | 37 ++-------- 5 files changed, 99 insertions(+), 39 deletions(-) create mode 100644 apps/web-antd/src/views/workflow/components/approval-timeline-item.vue diff --git a/apps/web-antd/src/api/system/oss/index.ts b/apps/web-antd/src/api/system/oss/index.ts index 139b9260..990c8e7c 100644 --- a/apps/web-antd/src/api/system/oss/index.ts +++ b/apps/web-antd/src/api/system/oss/index.ts @@ -18,7 +18,7 @@ export function ossList(params?: PageQuery) { } export function ossInfo(ossIds: IDS) { - return requestClient.get(`${Api.ossInfo}/${ossIds}`); + return requestClient.get(`${Api.ossInfo}/${ossIds}`); } /** diff --git a/apps/web-antd/src/api/workflow/instance/model.d.ts b/apps/web-antd/src/api/workflow/instance/model.d.ts index 68134e1f..8ef4b22e 100644 --- a/apps/web-antd/src/api/workflow/instance/model.d.ts +++ b/apps/web-antd/src/api/workflow/instance/model.d.ts @@ -25,7 +25,7 @@ export interface Flow { flowTaskStatus?: any; flowStatusName?: any; message: string; - ext?: any; + ext: null | string; createBy?: any; formCustom: string; formPath: string; diff --git a/apps/web-antd/src/views/workflow/components/approval-panel.vue b/apps/web-antd/src/views/workflow/components/approval-panel.vue index 225b9f17..482773eb 100644 --- a/apps/web-antd/src/views/workflow/components/approval-panel.vue +++ b/apps/web-antd/src/views/workflow/components/approval-panel.vue @@ -22,14 +22,14 @@ defineOptions({ const props = defineProps<{ task?: TaskInfo }>(); const currentFlowInfo = ref(); -watch( - () => props.task, - async (task) => { - if (!task) return null; - const resp = await flowInfo(task.businessId); - currentFlowInfo.value = resp; - }, -); + +async function handleLoadInfo(task: TaskInfo | undefined) { + if (!task) return null; + const resp = await flowInfo(task.businessId); + currentFlowInfo.value = resp; +} + +watch(() => props.task, handleLoadInfo); onUnmounted(() => (currentFlowInfo.value = undefined)); @@ -42,6 +42,13 @@ onUnmounted(() => (currentFlowInfo.value = undefined)); class="thin-scrollbar flex-1 overflow-y-hidden" size="small" > +
diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue b/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue new file mode 100644 index 00000000..43212c7b --- /dev/null +++ b/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue @@ -0,0 +1,74 @@ + + + diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline.vue b/apps/web-antd/src/views/workflow/components/approval-timeline.vue index 4c71ee33..0e344fcc 100644 --- a/apps/web-antd/src/views/workflow/components/approval-timeline.vue +++ b/apps/web-antd/src/views/workflow/components/approval-timeline.vue @@ -1,15 +1,9 @@