diff --git a/apps/web-antd/src/api/workflow/definition/index.ts b/apps/web-antd/src/api/workflow/definition/index.ts index b78d736a..46c26738 100644 --- a/apps/web-antd/src/api/workflow/definition/index.ts +++ b/apps/web-antd/src/api/workflow/definition/index.ts @@ -1,27 +1,34 @@ -import type { ID, IDS, PageQuery } from '#/api/common'; +import type { ProcessDefinition } from './model'; + +import type { ID, IDS, PageQuery, PageResult } from '#/api/common'; import { requestClient } from '#/api/request'; export function workflowDefinitionList(params?: PageQuery) { - return requestClient.get('/workflow/definition/list', { params }); + return requestClient.get>( + '/workflow/definition/list', + { params }, + ); } /** * 获取历史流程定义列表 * @param flowCode - * @returns + * @returns ProcessDefinition[] */ export function getHisListByKey(flowCode: string) { - return requestClient.get(`/workflow/definition/getHisListByKey/${flowCode}`); + return requestClient.get( + `/workflow/definition/getHisListByKey/${flowCode}`, + ); } /** * 获取流程定义详细信息 * @param id id - * @returns + * @returns ProcessDefinition */ export function workflowDefinitionInfo(id: ID) { - return requestClient.get(`/workflow/definition/${id}`); + return requestClient.get(`/workflow/definition/${id}`); } /** diff --git a/apps/web-antd/src/api/workflow/definition/model.d.ts b/apps/web-antd/src/api/workflow/definition/model.d.ts new file mode 100644 index 00000000..b5eeed9c --- /dev/null +++ b/apps/web-antd/src/api/workflow/definition/model.d.ts @@ -0,0 +1,19 @@ +export interface ProcessDefinition { + id: string; + createTime: string; + updateTime: string; + tenantId: string; + delFlag: string; + flowCode: string; + flowName: string; + category: string; + categoryName: string; + version: string; + isPublish: number; + formCustom: string; + formPath: string; + activityStatus: number; + listenerType?: any; + listenerPath?: any; + ext?: any; +} diff --git a/apps/web-antd/src/views/workflow/processDefinition/index.vue b/apps/web-antd/src/views/workflow/processDefinition/index.vue index 1c9401f6..56d995ee 100644 --- a/apps/web-antd/src/views/workflow/processDefinition/index.vue +++ b/apps/web-antd/src/views/workflow/processDefinition/index.vue @@ -122,7 +122,6 @@ const router = useRouter(); * @param disabled true为预览,false为设计 */ function handleDesign(row: any, disabled: boolean) { - console.log(row); router.push({ path: '/workflow/designer', query: { definitionId: row.id, disabled: String(disabled) }, @@ -146,7 +145,7 @@ const [ProcessDefinitionHistoryModal, historyModalApi] = useVbenModal({ * @param row row */ function handleHistory(row: any) { - historyModalApi.setData({ flowCode: row.flowCode }); + historyModalApi.setData({ flowCode: row.flowCode, currentId: row.id }); historyModalApi.open(); } diff --git a/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue b/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue index d5ae375a..45b48859 100644 --- a/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue +++ b/apps/web-antd/src/views/workflow/processDefinition/process-definition-history-modal.vue @@ -1,9 +1,23 @@