From 2a06f6744d93bb8a9371a8e026dfb75dfa16a2fc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 22 Jul 2025 19:09:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E9=A2=84=E6=B5=8B=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E2=80=9C=E6=9F=A5=E7=9C=8B=E5=AD=90=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE=E4=B8=8D=E6=94=AF=E6=8C=81=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bpm/processInstance/index.ts                 |  1 +
 src/components/DiyEditor/index.vue                   |  3 ++-
 .../detail/ProcessInstanceTimeline.vue               | 12 ++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

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 @@
           </div>
         </div>
         <div v-if="activity.nodeType === NodeType.CHILD_PROCESS_NODE">
-          <el-button type="primary" plain size="small" @click="handleChildProcess(activity)">
+          <el-button
+            type="primary"
+            plain
+            size="small"
+            @click="handleChildProcess(activity)"
+            :disabled="!activity.processInstanceId"
+          >
             查看子流程
           </el-button>
         </div>
@@ -319,7 +325,9 @@ const handleUserSelectConfirm = (activityId: string, userList: any[]) => {
 
 /** 跳转子流程 */
 const handleChildProcess = (activity: any) => {
-  // TODO @lesan：貌似跳不过去？！
+  if (!activity.processInstanceId) {
+    return
+  }
   push({
     name: 'BpmProcessInstanceDetail',
     query: {