From a3aa012d6c826ae5e896cbdb133be0e9afe4328b Mon Sep 17 00:00:00 2001
From: duxingchen <duxingchen@iris-rs.cn>
Date: Tue, 1 Sep 2026 14:25:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E6=A0=91=E4=BF=AE=E5=A4=8D=E6=96=AD=E6=9D=A1=E7=AE=AD?=
 =?UTF-8?q?=E5=A4=B4=E4=B8=8E=E5=88=86=E6=94=AF=E5=B1=82=E7=BA=A7=E5=A1=8C?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 父节点与第一个主线子节点之间补 ↓ 连线箭头
- 新增 isBranchContext prop:进入分支后子子孙孙强制缩进,不再回主干道
---
 track-uniapp/src/pages/scan/components/FlowTree.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/track-uniapp/src/pages/scan/components/FlowTree.vue b/track-uniapp/src/pages/scan/components/FlowTree.vue
index 55fd03f..7486050 100644
--- a/track-uniapp/src/pages/scan/components/FlowTree.vue
+++ b/track-uniapp/src/pages/scan/components/FlowTree.vue
@@ -21,6 +21,8 @@
 
     <!-- 子任务：主线继续主干道(左对齐 + ↓连线)，分支(SPAWN 协助)缩进 -->
     <view v-if="node.child_tasks && node.child_tasks.length">
+      <!-- 修复断条：父节点与第一个主线子节点之间的连线箭头 -->
+      <view v-if="mainChildren.length" class="ft-flow-arrow">↓</view>
       <!-- 主线子任务：左边缘对齐，形成笔直主干道，之间用 ↓ 连线 -->
       <template v-for="(child, i) in mainChildren" :key="'mc-' + child.id">
         <view v-if="i > 0" class="ft-flow-arrow">↓</view>
@@ -32,12 +34,13 @@
           @view-records="$emit('viewRecords', $event)"
         />
       </template>
-      <!-- 分支子任务：缩进 + 左边线 -->
+      <!-- 分支子任务：缩进 + 左边线；进入分支后子子孙孙都保持分支上下文 -->
       <view v-if="branchChildren.length" class="ft-branch-children">
         <FlowTree
           v-for="child in branchChildren"
           :key="child.id"
           :node="child"
+          :is-branch-context="true"
           :current-user="currentUser"
           :current-user-id="currentUserId"
           :current-username="currentUsername"
@@ -58,6 +61,8 @@ export default {
     currentUser: { type: Object, default: null },
     currentUserId: { type: [String, Number], default: "" },
     currentUsername: { type: String, default: "" },
+    // 分支上下文：一旦进入分支，其子子孙孙都强制缩进，不再回主干道
+    isBranchContext: { type: Boolean, default: false },
   },
   emits: ["viewRecords"],
   computed: {
@@ -67,13 +72,17 @@ export default {
         || this.node.task_type === "RECOVERY";
     },
     // 主线子任务：TRANSFER/RECOVERY，继续主干道（左对齐）
+    // 分支上下文拦截：一旦处于分支，所有子任务强制归入分支，主线返回空
     mainChildren() {
+      if (this.isBranchContext) return [];
       return (this.node.child_tasks || []).filter((c) =>
         !c.parent_task_id || c.task_type === "TRANSFER" || c.task_type === "RECOVERY"
       );
     },
     // 分支子任务：其余(SPAWN 协助等)，缩进显示
+    // 分支上下文拦截：处于分支时，全部子任务都作为分支继续缩进
     branchChildren() {
+      if (this.isBranchContext) return this.node.child_tasks || [];
       return (this.node.child_tasks || []).filter((c) =>
         c.parent_task_id && c.task_type !== "TRANSFER" && c.task_type !== "RECOVERY"
       );