From ecd082bb9947fbc62edc04a17bb14b562a0c805b Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Mon, 12 Oct 2026 11:29:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(def-editor):=20=E7=A9=BA=E5=87=BA=E5=8F=A3?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=EF=BC=88=E7=9B=B4=E6=8E=A5=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=EF=BC=89=E5=BE=80=E8=BF=94=E6=94=AF=E6=8C=81=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E4=B8=8D=E5=86=8D=E9=80=A0=E6=97=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA=E5=8D=A0=E4=BD=8D=E5=8D=A1=EF=BC=88=E6=9B=BE?=
 =?UTF-8?q?=E8=87=B4=E6=89=93=E5=BC=80=E5=8D=B3=E6=8A=A5"=E6=9C=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=A7=91=E5=AE=A4=E6=98=A0=E5=B0=84"?=
 =?UTF-8?q?=E4=B8=94=E4=BF=9D=E5=AD=98=E5=87=AD=E7=A9=BA=E5=8A=A0=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=94=B9=E8=AF=AD=E4=B9=89=EF=BC=89=EF=BC=9B=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=E7=A9=BA=E5=88=86=E6=94=AF=3D=E8=B5=B7?=
 =?UTF-8?q?=E7=82=B9=E2=86=92=E6=B1=87=E5=90=88=E7=82=B9=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?+=E6=9D=A1=E4=BB=B6=E7=9B=B4=E8=BF=9E=E8=BE=B9=EF=BC=88Tail=20?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E5=87=BA=E5=8F=A3=E5=B1=9E=E6=80=A7=EF=BC=89?=
 =?UTF-8?q?=EF=BC=9B=E6=A0=A1=E9=AA=8C=E7=A9=BA=E5=88=86=E6=94=AF=E9=99=8D?=
 =?UTF-8?q?=E4=B8=BA=20warn=EF=BC=88=E5=B9=B6=E8=A1=8C=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=20error=EF=BC=9A=E5=90=8E=E7=AB=AF=E7=A6=81?=
 =?UTF-8?q?=20SPLIT=20=E7=9B=B4=E8=BF=9E=20JOIN=EF=BC=89=EF=BC=9BCondition?=
 =?UTF-8?q?Box=20=E7=A9=BA=E5=88=86=E6=94=AF=E6=B8=B2=E6=9F=93"=E7=9B=B4?=
 =?UTF-8?q?=E8=BE=BE=E6=B1=87=E5=90=88=E7=82=B9"=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E3=80=82convert=20=E5=BE=80=E8=BF=94=2064/64=EF=BC=88=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=A9=BA=E5=88=86=E6=94=AF/=E7=A9=BA=E6=B3=B3?=
 =?UTF-8?q?=E9=81=93=206=20=E4=BE=8B+=E4=BF=AE=E6=AD=A3=201=20=E5=A4=84?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E8=B4=9F=E4=BE=8B=E6=96=87=E6=A1=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../def-editor/components/ConditionBox.vue    | 11 ++++
 src/views/flow/admin/def-editor/convert.ts    | 55 ++++++++++++++-----
 src/views/flow/admin/def-editor/validate.ts   |  6 +-
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/views/flow/admin/def-editor/components/ConditionBox.vue b/src/views/flow/admin/def-editor/components/ConditionBox.vue
index eb40ffb..8db18b7 100644
--- a/src/views/flow/admin/def-editor/components/ConditionBox.vue
+++ b/src/views/flow/admin/def-editor/components/ConditionBox.vue
@@ -78,6 +78,7 @@ function editCondition(i: number, v: string): void {
                     @input="editCondition(i, ($event.target as HTMLInputElement).value)"
                 />
                 <NodeList :items="branch" :container="`${node.uid}:${i}`" />
+                <div v-if="!branch.length" class="cb-empty">该出口直达汇合点（直接通过）</div>
             </div>
         </div>
         <Button v-if="canAddBranch" class="cb-add" size="small" long @click="ctx.addBranch(node.uid)">
@@ -118,6 +119,16 @@ function editCondition(i: number, v: string): void {
     color: #9254de;
     margin: 6px 0 10px;
 }
+.cb-empty {
+    margin: 4px 0 8px;
+    padding: 8px 6px;
+    border: 1px dashed #d3c6e8;
+    border-radius: 6px;
+    text-align: center;
+    font-size: 11px;
+    color: #9254de;
+    background: rgba(255, 255, 255, 0.6);
+}
 .cb-cols {
     display: flex;
     gap: 14px;
diff --git a/src/views/flow/admin/def-editor/convert.ts b/src/views/flow/admin/def-editor/convert.ts
index fa14243..5871211 100644
--- a/src/views/flow/admin/def-editor/convert.ts
+++ b/src/views/flow/admin/def-editor/convert.ts
@@ -42,25 +42,42 @@ export function toContentJson(model: EditorModel): DefJson {
     /**
      * 条件分支（2026-09-24）无 JOIN 语义：分支尾不互连，隐式汇合到容器后继——cursor 置 null 后
      * 下一个节点（或 END）只接收各分支尾的连线；firstEdgeName 只作用于分支首边（出口名）。
-     * walk 返回"尾集合"（普通序列=末节点，末尾含条件分支=各分支尾）。
      * firstEdgeCondition（2026-10-10）：EXPRESSION 模式分支首边的条件表达式，与出口名同位写入。
+     * 空出口分支（2026-10-12，"直接通过"）：items 为空时 walk 原样返回起点作为尾并携带出口名/条件，
+     * 汇合连线即"起点→汇合点"的命名直连边——与引擎 cond→汇合点直连边双向保真。
      */
+    interface Tail {
+        id: string;
+        name?: string;
+        condition?: string;
+    }
+    const tailEdge = (from: string, to: string, t: Tail): DefEdgeJson => {
+        const e: DefEdgeJson = { from, to };
+        if (t.name) e.name = t.name;
+        if (t.condition !== undefined && t.condition !== null && t.condition !== "") {
+            e.condition = t.condition;
+        }
+        return e;
+    };
     const walk = (items: EditorItem[], prev: string, firstEdgeName?: string,
-                  firstEdgeCondition?: string): string[] => {
+                  firstEdgeCondition?: string): Tail[] => {
         let cursor: string | null = prev;
-        let pending: string[] = [];
+        let pending: Tail[] = [];
         let first = true;
         const linkTo = (toId: string): void => {
             if (cursor !== null) {
                 if (first && firstEdgeName) {
                     const e: DefEdgeJson = { from: cursor, to: toId, name: firstEdgeName };
-                    if (firstEdgeCondition !== undefined) e.condition = firstEdgeCondition;
+                    if (firstEdgeCondition !== undefined && firstEdgeCondition !== null
+                        && firstEdgeCondition !== "") {
+                        e.condition = firstEdgeCondition;
+                    }
                     edges.push(e);
                 } else {
                     edges.push({ from: cursor, to: toId });
                 }
             }
-            pending.forEach((t) => edges.push({ from: t, to: toId }));
+            pending.forEach((t) => edges.push(tailEdge(t.id, toId, t)));
             pending = [];
             first = false;
         };
@@ -80,7 +97,7 @@ export function toContentJson(model: EditorModel): DefJson {
                 if (item.outlets && item.outlets.length >= 2 && item.branches) {
                     // 多出口（2026-10-03 P2）：APPROVAL 的多条命名出边即按钮选路，
                     // 分支尾隐式汇合到后继（与条件分支容器完全同构）
-                    const tails: string[] = [];
+                    const tails: Tail[] = [];
                     item.branches.forEach((branch, bi) => {
                         tails.push(...walk(branch, id, item.outlets![bi]));
                     });
@@ -116,7 +133,7 @@ export function toContentJson(model: EditorModel): DefJson {
                 if (item.judgeMode === "EXPRESSION") node.judgeMode = "EXPRESSION";
                 nodes.push(node);
                 linkTo(condId);
-                const tails: string[] = [];
+                const tails: Tail[] = [];
                 const expression = item.judgeMode === "EXPRESSION";
                 item.branches.forEach((branch, bi) => {
                     const cond = expression ? (item.conditions || [])[bi] || "" : undefined;
@@ -132,17 +149,27 @@ export function toContentJson(model: EditorModel): DefJson {
             nodes.push({ id: join, type: "PARALLEL_JOIN", waitFor: "ALL" });
             linkTo(split);
             item.branches.forEach((branch) => {
-                walk(branch, split).forEach((tail) => edges.push({ from: tail, to: join }));
+                walk(branch, split).forEach((tail) => edges.push(tailEdge(tail.id, join, tail)));
             });
             cursor = join;
         });
-        const tails: string[] = [];
-        if (cursor !== null) tails.push(cursor);
+        const tails: Tail[] = [];
+        // 空出口分支：无任何节点消费（first 未翻转、cursor 停在起点）——出口名/条件随尾携带，
+        // 由汇合点连线落成命名直连边（非空分支的 first 边已由 linkTo 写过，此处 first=false 不受影响）
+        if (cursor !== null) {
+            const t: Tail = { id: cursor };
+            if (first && firstEdgeName) t.name = firstEdgeName;
+            if (first && firstEdgeCondition !== undefined && firstEdgeCondition !== null
+                && firstEdgeCondition !== "") {
+                t.condition = firstEdgeCondition;
+            }
+            tails.push(t);
+        }
         tails.push(...pending);
         return tails;
     };
 
-    walk(model.list, "start").forEach((tail) => edges.push({ from: tail, to: "end" }));
+    walk(model.list, "start").forEach((tail) => edges.push(tailEdge(tail.id, "end", tail)));
     const endNode: DefNodeJson = { id: "end", type: "END" };
     if (model.endName) endNode.name = model.endName;
     nodes.push(endNode);
@@ -334,7 +361,9 @@ export function fromContentJson(def: any): ParsedDef {
                 judgeMode: n.judgeMode === "EXPRESSION" ? "EXPRESSION" : "SERVICE",
                 conditions,
                 outlets,
-                branches: branches.map((b) => (b.length ? b : [createApproval()])),
+                // 空出口分支（2026-10-12）：保留空数组（"直接通过"直达汇合点），
+                // 不再造无审批人占位卡（曾导致打开即报"未选择科室映射"、保存还会凭空改语义）
+                branches,
             },
             mergeId,
         };
@@ -377,7 +406,7 @@ export function fromContentJson(def: any): ParsedDef {
                     }
                     const node = toApprovalNode(n);
                     node.outlets = outlets;
-                    node.branches = branches.map((b) => (b.length ? b : [createApproval()]));
+                    node.branches = branches; // 空出口泳道保留（直达汇合点），不造占位卡
                     list.push(node);
                     cur = mergeId;
                 } else {
diff --git a/src/views/flow/admin/def-editor/validate.ts b/src/views/flow/admin/def-editor/validate.ts
index 18e7c52..15347a2 100644
--- a/src/views/flow/admin/def-editor/validate.ts
+++ b/src/views/flow/admin/def-editor/validate.ts
@@ -69,7 +69,8 @@ export function validateModel(model: EditorModel, depts: DeptOption[], routers:
                     (item.branches || []).forEach((branch, i) => {
                         const p = `${path}·出口「${item.outlets![i] || i + 1}」`;
                         if (!branch.length) {
-                            push(item.uid, "error", p, "出口泳道为空，请添加节点");
+                            // 空出口泳道（2026-10-12）：合法语义=该出口直达汇合点（直接通过），仅提示不阻断
+                            push(item.uid, "warn", p, "出口泳道为空：该出口直达汇合点（直接通过）");
                             return;
                         }
                         rec(branch, p);
@@ -136,7 +137,8 @@ export function validateModel(model: EditorModel, depts: DeptOption[], routers:
                 item.branches.forEach((branch, i) => {
                     const branchPath = `${path}·出口「${item.outlets[i] || BRANCH_LABELS[i] || i + 1}」`;
                     if (!branch.length) {
-                        push(item.uid, "error", branchPath, "分支为空，请添加节点");
+                        // 空出口分支（2026-10-12）：合法语义=该出口直达汇合点（直接通过），仅提示不阻断
+                        push(item.uid, "warn", branchPath, "分支为空：该出口直达汇合点（直接通过）");
                         return;
                     }
                     rec(branch, branchPath);