diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts index 06392bc4..6b792130 100644 --- a/src/api/bpm/processInstance/index.ts +++ b/src/api/bpm/processInstance/index.ts @@ -48,6 +48,7 @@ export type ApprovalNodeInfo = { status: number startTime?: Date endTime?: Date + processInstanceId?: string candidateUsers?: User[] tasks: ApprovalTaskInfo[] } diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue index 082395a9..940ad664 100644 --- a/src/components/DiyEditor/index.vue +++ b/src/components/DiyEditor/index.vue @@ -269,7 +269,8 @@ watch( if (!val || selectedComponentIndex.value === -1) { return } - // 如果是基础设置页,默认选中的索引改成-1,为了防止删除组件后切换到此页导致报错 + // 如果是基础设置页,默认选中的索引改成 -1,为了防止删除组件后切换到此页导致报错 + // https://gitee.com/yudaocode/yudao-ui-admin-vue3/pulls/792 if (props.showTabBar) { selectedComponentIndex.value = -1 } diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue index 6b80b4e4..ad2547f0 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue @@ -38,7 +38,13 @@
- + 查看子流程
@@ -319,7 +325,9 @@ const handleUserSelectConfirm = (activityId: string, userList: any[]) => { /** 跳转子流程 */ const handleChildProcess = (activity: any) => { - // TODO @lesan:貌似跳不过去?! + if (!activity.processInstanceId) { + return + } push({ name: 'BpmProcessInstanceDetail', query: {