topo-engine 0.1.11 → 0.1.12

package/dist/topo-engine.js

@@ -27319,12 +27319,24 @@ class TopoApi {
 }
 const TYPE_MAP = {
   "0302": { cat: "transformer", label: "配电变压器", order: 1 },
+  "0110": { cat: "transformer", label: "配电变压器", order: 1 },
+  // 柱上变压器（PMS 另一套类型码，与 0302 共用图元）
   "3301": { cat: "switch", label: "开关", order: 2 },
+  "321500000": { cat: "switch", label: "开关", order: 2 },
+  // 开关/断路器（另一套类型码，与 3301 共用图元）
   "3303": { cat: "bus", label: "低压母线", order: 3 },
   "3202": { cat: "cableTerminal", label: "电缆终端头", order: 4 },
   "310100000": { cat: "line", label: "低压导线", order: 5 },
+  "3201": { cat: "line", label: "低压导线", order: 5 },
+  // 低压导线（另一套类型码，与 310100000 共用图元）
+  "3102": { cat: "line", label: "低压导线", order: 5 },
+  // 低压电杆/导线点（同上，共用低压导线图元）
+  "3101": { cat: "line", label: "低压导线", order: 5 },
+  // 低压导线分段（同上，共用低压导线图元）
   "320300000": { cat: "junction", label: "密母分接点", order: 4 },
   "3112": { cat: "meterBox", label: "计量箱", order: 6 },
+  "31120003": { cat: "meterBox", label: "计量箱", order: 6 },
+  // 计量箱（另一套类型码，与 3112 共用图元）
   "3218000": { cat: "consumer", label: "用户接入点", order: 7 },
   "32500000": { cat: "station", label: "低压配电箱", order: 0 }
 };
@@ -27357,7 +27369,7 @@ function parseTopo(raw) {
     }
   }
   let roots = [...nodes].filter((n) => (indeg.get(n.id) || 0) === 0);
-  const prio = (n) => n.psrType === "0302" ? 0 : n.psrType === "3301" ? 1 : 2;
+  const prio = (n) => n.psrType === "0302" || n.psrType === "0110" ? 0 : n.psrType === "3301" || n.psrType === "321500000" ? 1 : 2;
   roots.sort((a2, b) => prio(a2) - prio(b) || a2.id - b.id);
   const rootId = roots.length ? roots[0].id : nodes[0].id;
   const children = /* @__PURE__ */ new Map();
@@ -27376,19 +27388,20 @@ function parseTopo(raw) {
     }
   }
   const shortName = (n) => {
-    if (n.psrType === "3301") {
+    if (n.psrType === "3301" || n.psrType === "321500000") {
       const no = extractSwitchNo(n.name);
       if (no) return no;
+      if (/母联/.test(n.name || "")) return "母联";
       return /熔丝/.test(n.name || "") ? "熔丝" : "开关";
     }
-    if (n.psrType === "310100000") return extractLineShort(n.name);
+    if (n.psrType === "310100000" || n.psrType === "3201" || n.psrType === "3102" || n.psrType === "3101") return extractLineShort(n.name);
     if (n.psrType === "3218000") {
       const m = String(n.name || "").match(/([\dA-Za-z#\-]+用户接入点)/);
       return m ? m[1].replace("用户接入点", "") : "用户";
     }
     if (n.psrType === "3303") return "母线";
-    if (n.psrType === "0302") return "柱上变";
-    if (n.psrType === "3112") return "";
+    if (n.psrType === "0302" || n.psrType === "0110") return "柱上变";
+    if (n.psrType === "3112" || n.psrType === "31120003") return "";
     if (n.psrType === "320300000") {
       const m = String(n.name || "").match(/(\d+栋\d+单元\d+层)/);
       return m ? m[1] : "分接点";
@@ -27407,9 +27420,9 @@ function parseTopo(raw) {
       cat: type.cat,
       catLabel: type.label,
       shortName: shortName(n),
-      isLine: n.psrType === "310100000",
+      isLine: n.psrType === "310100000" || n.psrType === "3201" || n.psrType === "3102" || n.psrType === "3101",
       insideStation: stationPsrIds.has(n.psrId),
-      isFuse: n.psrType === "3301" && /熔丝/.test(nm),
+      isFuse: (n.psrType === "3301" || n.psrType === "321500000") && /熔丝/.test(nm),
       status: n.status
     };
   });
@@ -27479,10 +27492,11 @@ function stationPlans(model) {
     const containSet = new Set(st.contain);
     const parents = model.edges.filter((e2) => containSet.has(e2.target) && !containSet.has(e2.source));
     const outEdges = model.edges.filter((e2) => containSet.has(e2.source) && !containSet.has(e2.target));
-    const busNode = st.contain.find((id2) => {
+    const busList = st.contain.filter((id2) => {
       const n = nodesById.get(id2);
       return n && n.cat === "bus";
-    }) || null;
+    });
+    let busNode = busList.length ? busList[0] : null;
     const hasParent = new Set(model.edges.map((e2) => e2.target));
     const innerRoot = st.contain.map((c) => nodesById.get(c)).filter(Boolean).find((n) => !hasParent.has(n.id) && n.cat !== "bus");
     let inNode = parents.length ? parents[0].target : null;
@@ -27498,9 +27512,78 @@ function stationPlans(model) {
         return n && n.cat !== "bus" && !outNodes.has(k);
       }) || null;
     }
+    const multiBusStation = busList.length > 1;
+    let busNodes = busList;
+    let ties = [];
+    let busOuts = /* @__PURE__ */ new Map();
+    let busLeaves = /* @__PURE__ */ new Map();
+    let primaryBus = busNode;
+    if (inNode) {
+      const feed = model.edges.find(
+        (e2) => e2.source === inNode && containSet.has(e2.target) && (nodesById.get(e2.target) || {}).cat === "bus"
+      );
+      if (feed) primaryBus = feed.target;
+    }
+    if (multiBusStation) busNode = primaryBus;
+    if (multiBusStation) {
+      const busSet = new Set(busList);
+      const catOf = (id2) => (nodesById.get(id2) || {}).cat;
+      for (const id2 of st.contain) {
+        const n = nodesById.get(id2);
+        if (!n || n.cat === "bus") continue;
+        const fromBus = model.edges.find(
+          (e2) => e2.target === id2 && containSet.has(e2.source) && catOf(e2.source) === "bus"
+        );
+        const toBus = model.edges.find(
+          (e2) => e2.source === id2 && containSet.has(e2.target) && catOf(e2.target) === "bus"
+        );
+        if (fromBus && toBus) ties.push({ id: id2, from: fromBus.source, to: toBus.target });
+      }
+      const tieIds = new Set(ties.map((t) => t.id));
+      const busOfNode = (id2) => {
+        const pe = model.edges.find((e2) => e2.target === id2 && busSet.has(e2.source));
+        return pe ? pe.source : busNode;
+      };
+      for (const b of busList) {
+        busOuts.set(b, []);
+        busLeaves.set(b, []);
+      }
+      for (const e2 of outEdges) {
+        const b = busOfNode(e2.source);
+        if (!busOuts.has(b)) busOuts.set(b, []);
+        busOuts.get(b).push({ node: e2.source, child: e2.target });
+      }
+      for (const id2 of st.contain) {
+        const n = nodesById.get(id2);
+        if (!n || n.cat === "bus") continue;
+        if (id2 === inNode || innerRoot && id2 === innerRoot.id || tieIds.has(id2)) continue;
+        if (outEdges.some((e2) => e2.source === id2)) continue;
+        const b = busOfNode(id2);
+        if (!busLeaves.has(b)) busLeaves.set(b, []);
+        busLeaves.get(b).push(id2);
+      }
+      const order = busNode ? [busNode] : [];
+      const seen = new Set(order);
+      for (let i = 0; i < order.length; i++) {
+        for (const t of ties) {
+          if (t.from === order[i] && !seen.has(t.to)) {
+            seen.add(t.to);
+            order.push(t.to);
+          } else if (t.to === order[i] && !seen.has(t.from)) {
+            seen.add(t.from);
+            order.push(t.from);
+          }
+        }
+      }
+      for (const b of busList) if (!seen.has(b)) {
+        seen.add(b);
+        order.push(b);
+      }
+      busNodes = order;
+    }
     const outSources = new Set(outEdges.map((e2) => e2.source));
     const drawn = new Set([busNode, inNode, innerRoot && innerRoot.id, ...outSources].filter(Boolean));
-    const leafOuts = st.contain.filter((id2) => !drawn.has(id2)).sort((a2, b) => {
+    const leafOuts = multiBusStation ? [] : st.contain.filter((id2) => !drawn.has(id2)).sort((a2, b) => {
       const sa = String((nodesById.get(a2) || {}).shortName || a2);
       const sb = String((nodesById.get(b) || {}).shortName || b);
       return sa.localeCompare(sb, "zh", { numeric: true });
@@ -27513,6 +27596,11 @@ function stationPlans(model) {
       inNode,
       innerRoot: innerRoot ? innerRoot.id : null,
       busNode,
+      busNodes,
+      multiBus: multiBusStation,
+      ties,
+      busOuts,
+      busLeaves,
       leafOuts,
       outs: outEdges.map((e2) => ({ child: e2.target, node: e2.source }))
     });
@@ -27540,6 +27628,130 @@ function stationInner(plan, model, band = 50, nodeMap) {
     ...plan.outs.map((o) => ({ id: o.node, child: o.child, s: specOf(o.node) })),
     ...(plan.leafOuts || []).map((id2) => ({ id: id2, child: null, s: specOf(id2) }))
   ];
+  if (plan.multiBus && plan.busNodes && plan.busNodes.length > 1) {
+    const TIE_GAP = 22;
+    const busH = bs0.h;
+    const busSwitchIds = /* @__PURE__ */ new Map();
+    for (const b of plan.busNodes) {
+      const outs = (plan.busOuts.get(b) || []).map((o) => o.node);
+      const leaves = plan.busLeaves.get(b) || [];
+      busSwitchIds.set(b, [.../* @__PURE__ */ new Set([...outs, ...leaves])]);
+    }
+    const busWidthOf = (b) => {
+      const ids = busSwitchIds.get(b) || [];
+      let mv = 0;
+      for (const id2 of ids) mv = Math.max(mv, vert(specOf(id2)).w);
+      const st = mv + 72;
+      return Math.max(120, ids.length * st);
+    };
+    const order = plan.busNodes;
+    const gapTies = /* @__PURE__ */ new Map();
+    const placedTies = /* @__PURE__ */ new Set();
+    for (let i = 0; i + 1 < order.length; i++) {
+      const L2 = order[i], R = order[i + 1];
+      for (const t of plan.ties) {
+        if (placedTies.has(t.id)) continue;
+        const link = t.from === L2 && t.to === R || t.from === R && t.to === L2;
+        if (!link) continue;
+        if (!gapTies.has(L2)) gapTies.set(L2, []);
+        gapTies.get(L2).push({ ...t, left: L2, right: R });
+        placedTies.add(t.id);
+      }
+    }
+    for (const t of plan.ties) {
+      if (placedTies.has(t.id)) continue;
+      const L2 = t.from, R = t.to;
+      if (!gapTies.has(L2)) gapTies.set(L2, []);
+      gapTies.get(L2).push({ ...t, left: L2, right: R });
+      placedTies.add(t.id);
+    }
+    const buses = [];
+    const tieDefs = [];
+    let cursor = 0;
+    for (const bid of order) {
+      const w = busWidthOf(bid);
+      buses.push({ id: bid, w, x: cursor + w / 2 });
+      cursor += w;
+      const ts = gapTies.get(bid) || [];
+      if (ts.length) {
+        const TIE_SIDE = 22;
+        const TIE_MIN_GAP = 168;
+        const totalTieW = ts.reduce((s2, t) => s2 + specOf(t.id).w, 0) + (ts.length - 1) * TIE_SIDE;
+        const gapTotal = Math.max(TIE_MIN_GAP, totalTieW + 2 * TIE_SIDE);
+        let tc = cursor + (gapTotal - totalTieW) / 2;
+        for (const t of ts) {
+          const tsp = specOf(t.id);
+          const dy = busH / 2 + 34 + tsp.h / 2;
+          tieDefs.push({
+            id: t.id,
+            from: t.from,
+            to: t.to,
+            left: t.left,
+            right: t.right,
+            w: tsp.w,
+            h: tsp.h,
+            x: tc + tsp.w / 2,
+            dy
+          });
+          tc += tsp.w + TIE_SIDE;
+        }
+        cursor += gapTotal;
+      }
+    }
+    const primary = buses.find((b) => b.id === plan.busNode) || buses[0];
+    const dx = -primary.x;
+    for (const b of buses) b.x += dx;
+    for (const t of tieDefs) t.x += dx;
+    const inPosMb = plan.inNode ? (() => {
+      const s2 = vert(specOf(plan.inNode));
+      return { x: 0, y: -(busH / 2 + VGAP + s2.h / 2), w: s2.w, h: s2.h, rot: 90 };
+    })() : null;
+    let minX2 = Infinity, maxX2 = -Infinity, minY2 = -busH / 2, maxY2 = busH / 2;
+    for (const b of buses) {
+      minX2 = Math.min(minX2, b.x - b.w / 2);
+      maxX2 = Math.max(maxX2, b.x + b.w / 2);
+    }
+    for (const t of tieDefs) {
+      minX2 = Math.min(minX2, t.x - t.w / 2);
+      maxX2 = Math.max(maxX2, t.x + t.w / 2);
+    }
+    if (inPosMb) {
+      minY2 = Math.min(minY2, inPosMb.y - inPosMb.h / 2);
+      maxY2 = Math.max(maxY2, inPosMb.y + inPosMb.h / 2);
+    }
+    if (plan.innerRoot) {
+      const s2 = specOf(plan.innerRoot);
+      minX2 = Math.min(minX2, -s2.w / 2);
+      maxX2 = Math.max(maxX2, s2.w / 2);
+      const inTop = inPosMb ? inPosMb.y - inPosMb.h / 2 : -busH / 2 - VGAP;
+      minY2 = Math.min(minY2, inTop - VGAP - s2.h);
+    }
+    let maxSwH = 0;
+    for (const [, ids] of busSwitchIds) for (const id2 of ids) maxSwH = Math.max(maxSwH, vert(specOf(id2)).h);
+    const switchBottomMaxMb = busH / 2 + VGAP + maxSwH;
+    maxY2 = Math.max(maxY2, switchBottomMaxMb);
+    const needK02Mb = plan.outs.length >= 2 && !plan.outs.every(
+      (o) => (nmap.get(o.child) || {}).cat === "consumer"
+    );
+    const sinkExtraMb = Math.max(0, switchBottomMaxMb + (needK02Mb ? band + 100 : 0) - maxY2);
+    const spanW = maxX2 - minX2;
+    return {
+      inPos: inPosMb,
+      outDefs: plan.outs.map((o) => ({ id: o.node, child: o.child, s: specOf(o.node) })),
+      bs: { w: spanW, h: busH },
+      VGAP,
+      HGAP,
+      HM,
+      VM,
+      vert,
+      specOf,
+      estW: spanW + 2 * HM,
+      estH: maxY2 - minY2 + 2 * VM + sinkExtraMb,
+      fanW: spanW,
+      box: { minX: minX2, maxX: maxX2, minY: minY2, maxY: maxY2 },
+      multiBus: { buses, ties: tieDefs, busH, busSwitchIds, TIE_GAP }
+    };
+  }
   let maxVW = 0;
   for (const o of outDefs) maxVW = Math.max(maxVW, vert(o.s).w);
   const step2 = maxVW + 72;
@@ -27748,6 +27960,7 @@ function fanSubtreeXRange(model, plans, root2, pos, nodeMap) {
   return [minX, maxX];
 }
 function expandStations(model, plans, pos, edgeCP, band, bandClear, vTrunkStations, nodeMap) {
+  var _a;
   const nmap = nodeMap || new Map(model.nodes.map((n) => [n.id, n]));
   for (const plan of plans) {
     const sp = pos.get(plan.sid);
@@ -27817,6 +28030,7 @@ function expandStations(model, plans, pos, edgeCP, band, bandClear, vTrunkStatio
   const frames = [];
   const rotateMap = /* @__PURE__ */ new Map();
   const busWidth = /* @__PURE__ */ new Map();
+  const tieNodes = /* @__PURE__ */ new Set();
   for (const plan of plans) {
     const sp = pos.get(plan.sid);
     if (!sp) continue;
@@ -27833,73 +28047,151 @@ function expandStations(model, plans, pos, edgeCP, band, bandClear, vTrunkStatio
       dirs.push({ ...o, dir: Math.abs(dy) < 0.5 ? "trunk" : dy > 0 ? "V" : "U" });
     }
     const devs = [];
-    if (plan.busNode) devs.push({ id: plan.busNode, x: xS, y: yS, w: bs.w, h: bs.h, rot: 0 });
+    const mb = inner.multiBus || null;
+    const outPos = /* @__PURE__ */ new Map();
+    const busOfSwitch = /* @__PURE__ */ new Map();
+    if (mb) for (const [b, ids] of mb.busSwitchIds) for (const id2 of ids) busOfSwitch.set(id2, b);
+    if (mb) {
+      for (const b of mb.buses) devs.push({ id: b.id, x: xS + b.x, y: yS, w: b.w, h: bs.h, rot: 0 });
+      for (const t of mb.ties) {
+        tieNodes.add(t.id);
+        devs.push({ id: t.id, x: xS + t.x, y: yS + (t.dy || 0), w: t.w, h: t.h, rot: 0 });
+      }
+    } else if (plan.busNode) {
+      devs.push({ id: plan.busNode, x: xS, y: yS, w: bs.w, h: bs.h, rot: 0 });
+    }
     if (inner.inPos) {
       const p = inner.inPos;
       devs.push({ id: plan.inNode, x: xS + p.x, y: yS + p.y, w: p.w, h: p.h, rot: p.rot });
     }
-    if (plan.innerRoot && plan.inNode) {
+    if (plan.innerRoot) {
       const s2 = specOf(plan.innerRoot);
-      const inTop = yS + inner.inPos.y - inner.inPos.h / 2;
-      devs.push({ id: plan.innerRoot, x: xS, y: inTop - VGAP - s2.h / 2, w: s2.w, h: s2.h, rot: 0 });
+      if (plan.inNode && inner.inPos) {
+        const inTop = yS + inner.inPos.y - inner.inPos.h / 2;
+        devs.push({ id: plan.innerRoot, x: xS, y: inTop - VGAP - s2.h / 2, w: s2.w, h: s2.h, rot: 0 });
+      } else if (plan.busNode) {
+        const bx = mb ? ((_a = mb.buses.find((b) => b.id === plan.busNode)) == null ? void 0 : _a.x) ?? 0 : 0;
+        devs.push({ id: plan.innerRoot, x: xS + bx, y: yS - (bs.h / 2 + VGAP + s2.h / 2), w: s2.w, h: s2.h, rot: 0 });
+      }
     }
     const vOuts = dirs.filter((o) => o.node !== plan.busNode).sort((a2, b) => pos.get(a2.child).x - pos.get(b.child).x);
     const leafOuts = (plan.leafOuts || []).map((id2) => ({ node: id2, child: null, dir: "V" }));
-    const vAll = [...vOuts, ...leafOuts];
     const busHalf = bs.w / 2;
     const uniqNodes = [];
     const seenNodes = /* @__PURE__ */ new Set();
-    for (const o of vAll) {
-      if (!seenNodes.has(o.node)) {
-        seenNodes.add(o.node);
-        uniqNodes.push({ node: o.node, firstChild: o.child });
+    if (mb) {
+      for (const b of mb.buses) {
+        const outs = vOuts.filter((o) => busOfSwitch.get(o.node) === b.id);
+        const leaves = (plan.busLeaves.get(b.id) || []).map((id2) => ({ node: id2, child: null, dir: "V" }));
+        const list = [];
+        const seen = /* @__PURE__ */ new Set();
+        for (const o of [...outs, ...leaves]) {
+          if (!seen.has(o.node)) {
+            seen.add(o.node);
+            list.push(o);
+          }
+        }
+        list.forEach((o, k) => {
+          const v = vert(specOf(o.node));
+          const x = list.length === 1 ? 0 : -b.w / 2 + (k + 0.5) * b.w / list.length;
+          const p = { id: o.node, x: xS + b.x + x, y: yS + (bs.h / 2 + VGAP + v.h / 2), w: v.w, h: v.h, rot: 90 };
+          outPos.set(o.node, p);
+          devs.push(p);
+        });
+      }
+    } else {
+      const vAll = [...vOuts, ...leafOuts];
+      for (const o of vAll) {
+        if (!seenNodes.has(o.node)) {
+          seenNodes.add(o.node);
+          uniqNodes.push({ node: o.node, firstChild: o.child });
+        }
+      }
+      const rowPos = (list) => list.map((o, k) => {
+        const s2 = specOf(o.node);
+        const v = vert(s2);
+        const x = list.length === 1 ? 0 : -busHalf + (k + 0.5) * (2 * busHalf) / list.length;
+        return { o, x, v };
+      });
+      for (const { o, x, v } of rowPos(uniqNodes)) {
+        const p = { id: o.node, x: xS + x, y: yS + (bs.h / 2 + VGAP + v.h / 2), w: v.w, h: v.h, rot: 90 };
+        outPos.set(o.node, p);
+        devs.push(p);
       }
-    }
-    const rowPos = (list) => list.map((o, k) => {
-      const s2 = specOf(o.node);
-      const v = vert(s2);
-      const x = list.length === 1 ? 0 : -busHalf + (k + 0.5) * (2 * busHalf) / list.length;
-      return { o, x, v };
-    });
-    const outPos = /* @__PURE__ */ new Map();
-    for (const { o, x, v } of rowPos(uniqNodes)) {
-      const p = { id: o.node, x: xS + x, y: yS + (bs.h / 2 + VGAP + v.h / 2), w: v.w, h: v.h, rot: 90 };
-      outPos.set(o.node, p);
-      devs.push(p);
     }
     for (const d2 of devs) {
       pos.set(d2.id, { x: d2.x, y: d2.y });
       if (d2.rot) rotateMap.set(d2.id, d2.rot);
     }
-    if (plan.busNode && inner.inPos) {
-      const inBottom = pos.get(plan.inNode).y + inner.inPos.h / 2;
-      edgeCP.set(`${plan.inNode}-${plan.busNode}`, [[xS, inBottom], [xS, yS - bs.h / 2]]);
-    }
-    if (plan.innerRoot && plan.inNode) {
-      const ir = pos.get(plan.innerRoot);
-      const inTop = pos.get(plan.inNode).y - inner.inPos.h / 2;
-      edgeCP.set(`${plan.innerRoot}-${plan.inNode}`, [[xS, ir.y + specOf(plan.innerRoot).h / 2], [xS, inTop]]);
-    }
-    if (plan.busNode) {
-      for (const o of dirs) {
-        if (o.node === plan.busNode) continue;
-        const s2 = specOf(o.node);
-        const v = vert(s2);
-        const p = outPos.get(o.node);
-        const key = `${plan.busNode}-${o.node}`;
-        const top = p.y - v.h / 2;
-        edgeCP.set(key, [[p.x, yS + bs.h / 2], [p.x, top]]);
+    if (mb) {
+      if (plan.innerRoot && plan.inNode && inner.inPos) {
+        const ir = pos.get(plan.innerRoot);
+        const inTop = pos.get(plan.inNode).y - inner.inPos.h / 2;
+        edgeCP.set(`${plan.innerRoot}-${plan.inNode}`, [[xS, ir.y + specOf(plan.innerRoot).h / 2], [xS, inTop]]);
+      }
+      if (plan.innerRoot && !plan.inNode && plan.busNode) {
+        const ir = pos.get(plan.innerRoot);
+        const pb = mb.buses.find((b) => b.id === plan.busNode) || mb.buses[0];
+        edgeCP.set(`${plan.innerRoot}-${plan.busNode}`, [[xS + pb.x, ir.y + specOf(plan.innerRoot).h / 2], [xS + pb.x, yS - bs.h / 2]]);
+      }
+      if (plan.inNode && plan.busNode) {
+        const pb = mb.buses.find((b) => b.id === plan.busNode) || mb.buses[0];
+        const inBottom = pos.get(plan.inNode).y + inner.inPos.h / 2;
+        edgeCP.set(`${plan.inNode}-${plan.busNode}`, [[xS + pb.x, inBottom], [xS + pb.x, yS - bs.h / 2]]);
+      }
+      for (const t of mb.ties) {
+        const lb = mb.buses.find((b) => b.id === t.left);
+        const rb = mb.buses.find((b) => b.id === t.right);
+        if (!lb || !rb) continue;
+        const lEnd = xS + lb.x + lb.w / 2;
+        const rEnd = xS + rb.x - rb.w / 2;
+        const tL = xS + t.x - t.w / 2;
+        const tR = xS + t.x + t.w / 2;
+        const yT = yS + (t.dy || 0);
+        if (t.from === t.left) edgeCP.set(`${t.from}-${t.id}`, [[lEnd, yS], [lEnd, yT], [tL, yT]]);
+        else edgeCP.set(`${t.from}-${t.id}`, [[rEnd, yS], [rEnd, yT], [tR, yT]]);
+        if (t.to === t.right) edgeCP.set(`${t.id}-${t.to}`, [[tR, yT], [rEnd, yT], [rEnd, yS]]);
+        else edgeCP.set(`${t.id}-${t.to}`, [[tL, yT], [lEnd, yT], [lEnd, yS]]);
+      }
+      for (const [nodeId, p] of outPos) {
+        const b = busOfSwitch.get(nodeId) || plan.busNode;
+        const v = vert(specOf(nodeId));
+        edgeCP.set(`${b}-${nodeId}`, [[p.x, yS + bs.h / 2], [p.x, p.y - v.h / 2]]);
       }
-    }
-    const busOrIn = plan.busNode || plan.inNode;
-    if (busOrIn) {
-      const busP = plan.busNode ? pos.get(plan.busNode) : pos.get(plan.inNode);
-      const busY = (busP || { y: yS }).y;
-      for (const id2 of plan.leafOuts || []) {
-        const p = outPos.get(id2);
-        if (!p) continue;
-        const v = vert(specOf(id2));
-        edgeCP.set(`${busOrIn}-${id2}`, [[p.x, busY + bs.h / 2], [p.x, p.y - v.h / 2]]);
+    } else {
+      if (plan.busNode && inner.inPos) {
+        const inBottom = pos.get(plan.inNode).y + inner.inPos.h / 2;
+        edgeCP.set(`${plan.inNode}-${plan.busNode}`, [[xS, inBottom], [xS, yS - bs.h / 2]]);
+      }
+      if (plan.innerRoot && plan.inNode) {
+        const ir = pos.get(plan.innerRoot);
+        const inTop = pos.get(plan.inNode).y - inner.inPos.h / 2;
+        edgeCP.set(`${plan.innerRoot}-${plan.inNode}`, [[xS, ir.y + specOf(plan.innerRoot).h / 2], [xS, inTop]]);
+      } else if (plan.innerRoot && plan.busNode) {
+        const ir = pos.get(plan.innerRoot);
+        edgeCP.set(`${plan.innerRoot}-${plan.busNode}`, [[xS, ir.y + specOf(plan.innerRoot).h / 2], [xS, yS - bs.h / 2]]);
+      }
+      if (plan.busNode) {
+        for (const o of dirs) {
+          if (o.node === plan.busNode) continue;
+          const s2 = specOf(o.node);
+          const v = vert(s2);
+          const p = outPos.get(o.node);
+          const key = `${plan.busNode}-${o.node}`;
+          const top = p.y - v.h / 2;
+          edgeCP.set(key, [[p.x, yS + bs.h / 2], [p.x, top]]);
+        }
+      }
+      const busOrIn = plan.busNode || plan.inNode;
+      if (busOrIn) {
+        const busP = plan.busNode ? pos.get(plan.busNode) : pos.get(plan.inNode);
+        const busY = (busP || { y: yS }).y;
+        for (const id2 of plan.leafOuts || []) {
+          const p = outPos.get(id2);
+          if (!p) continue;
+          const v = vert(specOf(id2));
+          edgeCP.set(`${busOrIn}-${id2}`, [[p.x, busY + bs.h / 2], [p.x, p.y - v.h / 2]]);
+        }
       }
     }
     const inTarget = plan.inNode ? plan.inNode : plan.busNode;
@@ -28058,18 +28350,21 @@ function expandStations(model, plans, pos, edgeCP, band, bandClear, vTrunkStatio
       const cw = specOf(o.child).w;
       const ch = specOf(o.child).h;
       const level = levelOf.get(o) ?? bandLevel;
-      if (o.node === plan.busNode) {
+      if (o.node === plan.busNode || mb && mb.buses.some((b) => b.id === o.node)) {
+        const bb = mb ? mb.buses.find((b) => b.id === o.node) : null;
+        const anchorX = bb ? xS + bb.x : xS;
+        const anchorHalf = bb ? bb.w / 2 : busHalf;
         if (o.dir === "trunk") {
           edgeCP.set(`${o.node}-${o.child}`, [
-            [xS + busHalf, yS],
-            [xS + busHalf, level],
+            [anchorX + anchorHalf, yS],
+            [anchorX + anchorHalf, level],
             [childPos.x - cw / 2, level],
             [childPos.x - cw / 2, childPos.y - ch / 2]
           ]);
         } else {
           edgeCP.set(`${o.node}-${o.child}`, [
-            [xS, yS + bs.h / 2],
-            [xS, level],
+            [anchorX, yS + bs.h / 2],
+            [anchorX, level],
             [childPos.x, level],
             [childPos.x, childPos.y - ch / 2]
           ]);
@@ -28096,10 +28391,10 @@ function expandStations(model, plans, pos, edgeCP, band, bandClear, vTrunkStatio
       }
       edgeCP.delete(`${plan.sid}-${o.child}`);
     }
-    let bminX = -busHalf;
-    let bmaxX = busHalf;
-    let bminY = -bs.h / 2;
-    let bmaxY = bs.h / 2;
+    let bminX = mb ? Infinity : -busHalf;
+    let bmaxX = mb ? -Infinity : busHalf;
+    let bminY = mb ? Infinity : -bs.h / 2;
+    let bmaxY = mb ? -Infinity : bs.h / 2;
     for (const d2 of devs) {
       bminX = Math.min(bminX, d2.x - xS - d2.w / 2);
       bmaxX = Math.max(bmaxX, d2.x - xS + d2.w / 2);
@@ -28128,9 +28423,22 @@ function expandStations(model, plans, pos, edgeCP, band, bandClear, vTrunkStatio
     }
     pos.set(plan.sid, { x: fx, y: fy });
     frames.push({ id: plan.sid, x: fx, y: fy, w: fw, h: fh, name: plan.name });
-    if (plan.busNode) busWidth.set(plan.busNode, bs.w);
+    if (mb) {
+      for (const b of mb.buses) busWidth.set(b.id, b.w);
+    } else if (plan.busNode) {
+      busWidth.set(plan.busNode, bs.w);
+    }
+    for (const e2 of model.edges) {
+      if (!plan.containSet.has(e2.source) || !plan.containSet.has(e2.target)) continue;
+      const key = `${e2.source}-${e2.target}`;
+      if (edgeCP.has(key)) continue;
+      const pa = pos.get(e2.source);
+      const pb = pos.get(e2.target);
+      if (!pa || !pb) continue;
+      edgeCP.set(key, [[pa.x, pa.y], [pa.x, pb.y], [pb.x, pb.y]]);
+    }
   }
-  return { frames, rotateMap, busWidth };
+  return { frames, rotateMap, busWidth, tieNodes };
 }
 function computeOrthogonalLayout(model, opts = {}) {
   const {
@@ -28637,6 +28945,7 @@ function computeOrthogonalLayout(model, opts = {}) {
   const stationFrames = [];
   const stationRotate = /* @__PURE__ */ new Map();
   const stationBusWidth = /* @__PURE__ */ new Map();
+  const stationTies = /* @__PURE__ */ new Set();
   if (plans.length) {
     const depthOf = /* @__PURE__ */ new Map([[extModel.rootId, 0]]);
     const vis = /* @__PURE__ */ new Set([extModel.rootId]);
@@ -28652,10 +28961,11 @@ function computeOrthogonalLayout(model, opts = {}) {
       }
     }
     plans.sort((a2, b) => (depthOf.get(b.sid) || 0) - (depthOf.get(a2.sid) || 0));
-    const { frames, rotateMap, busWidth } = expandStations(model, plans, pos, edgeCP, band, bandClear, vChainStations, nodeMap);
+    const { frames, rotateMap, busWidth, tieNodes } = expandStations(model, plans, pos, edgeCP, band, bandClear, vChainStations, nodeMap);
     stationFrames.push(...frames);
     for (const [k, v] of rotateMap) stationRotate.set(k, v);
     for (const [k, v] of busWidth) stationBusWidth.set(k, v);
+    if (tieNodes) for (const id2 of tieNodes) stationTies.add(id2);
   }
   const nodeSpec = (id2) => {
     const f2 = stationFrames.find((x) => x.id === id2);
@@ -28703,6 +29013,7 @@ function computeOrthogonalLayout(model, opts = {}) {
     stationFrames,
     stationRotate,
     stationBusWidth,
+    stationTies,
     bounds: { minX: minX + dx, minY: minY + dy, maxX: maxX + dx, maxY: maxY + dy },
     stats: { trunkLen: 0, leaves: 0, nodes: model.nodes.length }
   };
@@ -28790,6 +29101,7 @@ function setEdgeTheme(themeName) {
 function buildGraphData(model, layout) {
   const nodes = model.nodes.map((n) => {
     const spec = getSymbolSpec(n.cat);
+    const isTie = !!(layout.stationTies && layout.stationTies.has(n.id));
     const busW = layout.stationBusWidth && layout.stationBusWidth.get(n.id);
     const meterBoxDim = n.cat === "meterBox" ? getMeterBoxSize(n) : null;
     const w = busW || (meterBoxDim ? meterBoxDim.w : spec.w);
@@ -28808,6 +29120,8 @@ function buildGraphData(model, layout) {
         // 禁用 G6 内置 label（label:false），避免其单行画出长名不换行。
         label: false,
         labelText: n.cat === "bus" || n.cat === "cableTerminal" || n.cat === "consumer" ? "" : n.shortName || "",
+        // 母联标记：canvasNode 据此把（短名）标签居中画在「半矩形」内部
+        _tieLabel: isTie,
         rotate: layout.stationRotate && layout.stationRotate.get(n.id) || 0,
         highlight: 0,
         cursor: "pointer",
@@ -29026,6 +29340,12 @@ function drawLabelUnder(attributes, group) {
   const x0 = w / 2 + 6;
   _drawWrappedTextFixed(group, label, x0, -h / 2, 8, C2.white, 4, 1.3, 500, "left");
 }
+function drawTieLabel(attributes, group) {
+  const label = attributes.labelText || "";
+  if (!label) return;
+  const [w, h] = attributes.size;
+  _drawWrappedText(group, label, 0, -(h / 2 + 22), 7, C2.white, Math.max(72, w + 34), 1.2, 500);
+}
 function text(attributes, group, str2, x, y, size, fill, weight = 400) {
   if (!str2) return;
   group.appendChild(
@@ -29163,7 +29483,7 @@ function drawBreaker(attributes, group) {
     group.appendChild(new Line({ style: { x1: xBox, y1: 0, x2: xEdge, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
   }
   group.appendChild(new Rect({ style: { x: bx, y: by, width: bw, height: bh, radius: r, fill: P.red, stroke: withAlpha(C2.white, 0.22), lineWidth: 1 } }));
-  if (attributes.labelText) {
+  if (attributes.labelText && !attributes._tieLabel) {
     _drawWrappedText(group, attributes.labelText, 0, 0.6, 11.5, C2.switchText, bw - 8, 1.15, 700);
   }
 }
@@ -29670,6 +29990,7 @@ class SvgSymbolNode extends BaseNode {
     drawGlowBackdrop(attributes, target);
     const symStart = (target.children || []).length;
     draw(attributes, target);
+    if (attributes._tieLabel && attributes.labelText) drawTieLabel(attributes, target);
     const symEnd = (target.children || []).length;
     drawGlow(attributes, target);
     drawHighlight(attributes, target);
@@ -31112,7 +31433,7 @@ const _sfc_main = {
   }
 };
 const DistanceTop10 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-438b6017"]]);
-const VERSION = "0.1.11";
+const VERSION = "0.1.12";
 const DESCRIPTION = "配电台区单线图拓扑成图引擎";
 export {
   DESCRIPTION,