topo-engine 0.1.8 → 0.1.10

package/dist/topo-engine.cjs

@@ -6660,11 +6660,11 @@ var parseGradient$1 = /* @__PURE__ */ function() {
     }
   }
   function matchPositioning() {
-    var location = matchCoordinates();
-    if (location.x || location.y) {
+    var location2 = matchCoordinates();
+    if (location2.x || location2.y) {
       return {
         type: "position",
-        value: location
+        value: location2
       };
     }
   }
@@ -25097,11 +25097,14 @@ class TopoApi {
     this._topoLines = /* @__PURE__ */ new Map();
     this._cards = /* @__PURE__ */ new Map();
     this._animations = /* @__PURE__ */ new Map();
+    this._glowNodes = /* @__PURE__ */ new Map();
+    this._glowRaf = null;
     this._nodeLabels = /* @__PURE__ */ new Map();
     this._originalNodeStyles = /* @__PURE__ */ new Map();
     this._originalEdgeStyles = /* @__PURE__ */ new Map();
     this._nodeColorOverrides = /* @__PURE__ */ new Map();
     this._custColorOverrides = /* @__PURE__ */ new Map();
+    this._cellFx = /* @__PURE__ */ new Map();
     this._bindConnGraphEvents();
   }
   /** 数据刷新（图重新渲染后调用） */
@@ -25126,6 +25129,7 @@ class TopoApi {
     this._removeAllConnectionsInternal();
     this._unbindConnGraphEvents();
     this._removeAllAnimationsInternal();
+    this._removeAllGlowsInternal();
     this._removeAllTopoLinesInternal();
     this._hideAllCardsInternal();
     this._listeners.clear();
@@ -25134,6 +25138,7 @@ class TopoApi {
     this._nodeLabels.clear();
     this._nodeColorOverrides.clear();
     this._custColorOverrides.clear();
+    this._cellFx.clear();
     this._graph = null;
     this._model = null;
     this._layout = null;
@@ -25251,11 +25256,163 @@ class TopoApi {
     }
   }
   // ============================================================
+  //  统一目标解析（id / psrId / assetNo）
+  //
+  //  全库约定：凡入参语义为「节点/设备/用户」的方法，一律接受三种引用：
+  //    - 节点内部 id 或 psrId（设备编码）  → 普通节点（变压器/开关/导线点/计量箱…）
+  //    - 客户 assetNo（资产编号，兼容 consNo/consId）→ 计量箱内该户「电表户」
+  //  解析结果：
+  //    { kind:'node',     id, node }                        普通节点
+  //    { kind:'customer', boxId, index, boxNode, customer } 箱内电表户
+  // ============================================================
+  /** 统一解析 ref（内部实现；对外用 resolveRef） */
+  _resolveTarget(ref) {
+    if (ref == null) return null;
+    const e2 = this._parseEndpoint(ref);
+    if (!e2) return null;
+    if (e2.kind === "node") {
+      return { kind: "node", id: e2.id, node: this._nodeByIdMap.get(e2.id) || null };
+    }
+    const boxNode = this._nodeByIdMap.get(e2.boxId) || null;
+    const customers = boxNode && Array.isArray(boxNode._customers) ? boxNode._customers : [];
+    return {
+      kind: "customer",
+      boxId: e2.boxId,
+      index: e2.index,
+      boxNode,
+      customer: customers[e2.index] || null,
+      customers
+    };
+  }
+  /** 解析到“节点 id”层：customer 统一落到其所在计量箱节点 */
+  _targetNodeId(ref) {
+    const t = this._resolveTarget(ref);
+    return t ? t.kind === "node" ? t.id : t.boxId : null;
+  }
+  /** 解析到“图 id”层：普通节点=节点 id；电表户=`${boxId}#cust${index}`（唯一键） */
+  _targetGraphKey(ref) {
+    const t = this._resolveTarget(ref);
+    if (!t) return null;
+    return t.kind === "node" ? t.id : `${t.boxId}#cust${t.index}`;
+  }
+  /** 目标中心的世界坐标（节点中心 / 户表位中心） */
+  _targetWorld(ref) {
+    const e2 = this._parseEndpoint(ref);
+    if (!e2) return null;
+    if (e2.kind === "customer") return this._endpointWorld(e2);
+    const p = this._layout.pos.get(e2.id);
+    return p ? { x: p.x, y: p.y } : null;
+  }
+  // ---- 箱内电表户特效（_cellFx）读写 ----
+  _cellFxKey(boxId, index) {
+    return `${boxId}#cust${index}`;
+  }
+  /** 取某户特效 descriptor（无则新建空对象，不落库） */
+  _cellFxGet(boxId, index) {
+    const key = this._cellFxKey(boxId, index);
+    let d2 = this._cellFx.get(key);
+    if (!d2) {
+      d2 = {};
+      this._cellFx.set(key, d2);
+    }
+    return d2;
+  }
+  /** 删除某户特效键（若因此无任何特效则一并清除该箱 style 上的 _cellFx） */
+  _cellFxDrop(boxId, index) {
+    const key = this._cellFxKey(boxId, index);
+    this._cellFx.delete(key);
+  }
+  /** 把某只计量箱的 _cellFx 映射刷成 style（无特效则移除 style 字段） */
+  _flushCellFx(boxId) {
+    if (!this._graph) return;
+    const out = {};
+    let any = false;
+    for (const [key, d2] of this._cellFx) {
+      if (!key.startsWith(`${boxId}#cust`)) continue;
+      const idx = Number(key.slice(key.indexOf("#cust") + 5));
+      if (!d2 || !d2.hl && !d2.note && !d2.glow && !d2.pulse) {
+        this._cellFx.delete(key);
+        continue;
+      }
+      out[idx] = d2;
+      any = true;
+    }
+    const cur = this._safeNodeStyle(boxId, {});
+    this._graph.updateNodeData([{ id: boxId, style: { ...cur, _cellFx: any ? out : void 0 } }]);
+    this._graph.render();
+  }
+  /** 清理失效的户特效记录（箱/户不存在时自动丢弃），返回受影响箱列表 */
+  _pruneCellFx() {
+    const touched = /* @__PURE__ */ new Set();
+    for (const [key] of this._cellFx) {
+      const sep = key.indexOf("#cust");
+      if (sep < 0) {
+        this._cellFx.delete(key);
+        continue;
+      }
+      const boxId = key.slice(0, sep);
+      const idx = Number(key.slice(sep + 5));
+      const box2 = this._nodeByIdMap.get(boxId);
+      if (!box2 || !Array.isArray(box2._customers) || idx < 0 || idx >= box2._customers.length) {
+        this._cellFx.delete(key);
+        touched.add(boxId);
+      }
+    }
+    return touched;
+  }
+  // ============================================================
   //  一、查询 API
   // ============================================================
-  /** 获取单个节点 */
+  /** 获取单个节点（ref = 节点 id/psrId/资产编号 assetNo）
+   *  命中电表户时返回其所在计量箱节点，并附带 customer/customerIndex 等客户信息 */
   getNode(nodeId) {
-    return this._nodeByIdMap.get(nodeId) || null;
+    const t = this._resolveTarget(nodeId);
+    if (!t) return null;
+    if (t.kind === "node") return t.node || null;
+    if (!t.boxNode) return null;
+    const box2 = t.boxNode;
+    return {
+      ...box2,
+      targetKind: "customer",
+      meterBoxId: t.boxId,
+      customer: t.customer,
+      customerIndex: t.index,
+      customerCount: t.customers.length
+    };
+  }
+  /**
+   * 解析任意引用 → 标准目标描述（调试 / 业务分支判断用）。
+   * @param {string} ref  节点 id / psrId / 资产编号(assetNo，兼容 consNo/consId)
+   * @returns {object|null}
+   *   kind='node'     → { kind, id, node }
+   *   kind='customer' → { kind, boxId, boxNode, index, customer, key, assetNo, name }
+   */
+  resolveRef(ref) {
+    const t = this._resolveTarget(ref);
+    if (!t) return null;
+    if (t.kind === "node") {
+      return { kind: "node", id: t.id, node: t.node };
+    }
+    const c = t.customer || {};
+    return {
+      kind: "customer",
+      boxId: t.boxId,
+      boxNode: t.boxNode,
+      index: t.index,
+      customer: t.customer,
+      key: this._cellFxKey(t.boxId, t.index),
+      assetNo: c.assetNo != null ? c.assetNo : c.consNo != null ? c.consNo : c.consId,
+      name: c.realConsName || c.consName || ""
+    };
+  }
+  /**
+   * 按资产编号 / 客户编号取客户档案包装（也可传所在箱的 psrId 时返回 null）。
+   * @returns {{ node, customer, index, count, boxId } | null}
+   */
+  getCustomer(ref) {
+    const t = this._resolveTarget(ref);
+    if (!t || t.kind !== "customer") return null;
+    return { node: t.boxNode, customer: t.customer, index: t.index, count: t.customers.length, boxId: t.boxId };
   }
   /** 获取所有节点（只读副本） */
   getAllNodes() {
@@ -25287,15 +25444,17 @@ class TopoApi {
   getSelectedId() {
     return this._selectedId;
   }
-  /** 获取上下游邻居 */
+  /** 获取上下游邻居（ref 可传 节点id/psrId/资产编号；电表户按所在计量箱参与拓扑） */
   getNeighbors(nodeId) {
+    const id2 = this._targetNodeId(nodeId);
+    if (id2 == null) return { upstream: [], downstream: [] };
     const upstream = [];
     const downstream = [];
     for (const e2 of this._model.edges) {
-      if (e2.target === nodeId) {
+      if (e2.target === id2) {
         const p = this._nodeByIdMap.get(e2.source);
         if (p) upstream.push(p);
-      } else if (e2.source === nodeId) {
+      } else if (e2.source === id2) {
         const c = this._nodeByIdMap.get(e2.target);
         if (c) downstream.push(c);
       }
@@ -25304,11 +25463,13 @@ class TopoApi {
   }
   /**
    * 沿拓扑流向取节点链
-   * @param {string} nodeId - 起始节点
+   * @param {string} ref - 节点 id / psrId / 资产编号（电表户按所在箱）
    * @param {'upstream'|'downstream'} direction
    */
-  getStreamNodes(nodeId, direction2) {
-    return this._bfs(nodeId, direction2).nodes;
+  getStreamNodes(ref, direction2) {
+    const id2 = this._targetNodeId(ref);
+    if (id2 == null) return [];
+    return this._bfs(id2, direction2).nodes;
   }
   /** 获取主干链节点 */
   getTrunkNodes() {
@@ -25346,11 +25507,13 @@ class TopoApi {
     for (const k of kids) w += this._subtreeWeight(k, childrenMap, visited);
     return w;
   }
-  /** 获取子树所有节点 */
-  getSubtreeNodes(nodeId) {
+  /** 获取子树所有节点（ref 可传 节点id/psrId/资产编号） */
+  getSubtreeNodes(ref) {
+    const id2 = this._targetNodeId(ref);
+    if (id2 == null) return [];
     const result = [];
     const visited = /* @__PURE__ */ new Set();
-    const queue = [nodeId];
+    const queue = [id2];
     while (queue.length) {
       const cur = queue.shift();
       if (visited.has(cur)) continue;
@@ -25363,8 +25526,11 @@ class TopoApi {
     }
     return result;
   }
-  /** 获取两节点间路径（BFS） */
-  getPath(fromId, toId) {
+  /** 获取两节点间路径（BFS；端点可传 id/psrId/assetNo，电表户按所在箱） */
+  getPath(fromRef, toRef) {
+    const fromId = this._targetNodeId(fromRef);
+    const toId = this._targetNodeId(toRef);
+    if (fromId == null || toId == null) return null;
     const parent = /* @__PURE__ */ new Map([[fromId, null]]);
     const queue = [fromId];
     while (queue.length) {
@@ -25391,17 +25557,19 @@ class TopoApi {
     }
     return path;
   }
-  /** 获取指定边 */
-  getEdge(srcId, tgtId) {
-    return this._findEdgeData(srcId, tgtId);
+  /** 获取指定边（端点可传 id/psrId/assetNo，电表户按所在箱） */
+  getEdge(srcRef, tgtRef) {
+    return this._findEdgeData(this._targetNodeId(srcRef), this._targetNodeId(tgtRef));
   }
   /** 获取所有边 */
   getEdges() {
     return [...this._model.edges];
   }
-  /** 沿流向取边 */
-  getStreamEdges(nodeId, direction2) {
-    return this._bfs(nodeId, direction2).edges;
+  /** 沿流向取边（ref 可传 节点id/psrId/资产编号） */
+  getStreamEdges(ref, direction2) {
+    const id2 = this._targetNodeId(ref);
+    if (id2 == null) return [];
+    return this._bfs(id2, direction2).edges;
   }
   /** 获取主干边 */
   getMainEdge() {
@@ -25415,14 +25583,15 @@ class TopoApi {
       return true;
     });
   }
-  /** 获取节点坐标 */
-  getNodePosition(nodeId) {
-    const p = this._layout.pos.get(nodeId);
-    return p ? { x: p.x, y: p.y } : null;
+  /** 获取节点 / 户表位中心坐标（assetNo → 该户表位中心；节点 id/psrId → 节点中心） */
+  getNodePosition(ref) {
+    const world = this._targetWorld(ref);
+    return world ? { x: world.x, y: world.y } : null;
   }
-  /** 获取边折线点序列 */
-  getEdgePath(srcId, tgtId) {
-    const cps = this._layout.edgeCP.get(this._edgeKey(srcId, tgtId));
+  /** 获取边折线点序列（端点可传 id/psrId/assetNo） */
+  getEdgePath(srcRef, tgtRef) {
+    const key = this._edgeKey(this._targetNodeId(srcRef), this._targetNodeId(tgtRef));
+    const cps = this._layout.edgeCP.get(key);
     return cps ? cps.map(([x, y]) => [x, y]) : null;
   }
   /** 获取图整体边界 */
@@ -25462,17 +25631,29 @@ class TopoApi {
     const current = this._graph.getZoom();
     this._graph.zoomTo(current / (1 + step2));
   }
-  /** 定位节点到视口中央 */
-  locateNode(nodeId, zoom) {
+  /** 定位节点到视口中央（ref 可传 id/psrId/资产编号；电表户聚焦其表位） */
+  locateNode(ref, zoom) {
     this._assertReady();
-    const p = this._layout.pos.get(nodeId);
-    if (!p) return;
+    const t = this._resolveTarget(ref);
+    if (!t) return;
+    const world = this._targetWorld(ref);
+    if (!world) return;
     if (zoom) this._graph.zoomTo(zoom);
+    if (t.kind === "node") {
+      try {
+        this._graph.focusElement(t.id);
+        return;
+      } catch {
+      }
+    }
     try {
-      this._graph.focusElement(nodeId);
-    } catch {
-      const center = this._canvasCenterXY();
-      this._graph.translateTo({ x: center.x - p.x * (zoom || this._graph.getZoom()), y: center.y - p.y * (zoom || this._graph.getZoom()) });
+      const z2 = zoom || this._graph.getZoom();
+      const [vx, vy] = this._graph.getViewportCenter();
+      const dx = (vx - world.x) * z2;
+      const dy = (vy - world.y) * z2;
+      this._graph.translateBy([dx, dy]);
+    } catch (e2) {
+      console.warn("[TopoApi] locateNode 平移失败:", e2 && e2.message);
     }
   }
   /** 获取当前视口状态 */
@@ -25485,25 +25666,34 @@ class TopoApi {
   // ============================================================
   //  三、节点样式
   // ============================================================
-  /** 设置单个节点样式 */
-  setNodeStyle(nodeId, style) {
+  /** 设置单个节点样式（ref = 节点id/psrId；传 assetNo 时作用于其所在计量箱节点） */
+  setNodeStyle(ref, style) {
     this._assertReady();
-    this._snapshotNodeStyle(nodeId);
-    this._updateNodes([{ id: nodeId, style }]);
+    const id2 = this._targetNodeId(ref);
+    if (id2 == null) {
+      console.warn(`[TopoApi] setNodeStyle: 无法解析目标 ${ref}`);
+      return;
+    }
+    this._snapshotNodeStyle(id2);
+    this._updateNodes([{ id: id2, style }]);
   }
-  /** 批量设置节点样式 */
-  batchSetNodeStyle(nodeIds, style) {
+  /** 批量设置节点样式（每一项可为 id/psrId/assetNo） */
+  batchSetNodeStyle(refs, style) {
     this._assertReady();
-    for (const id2 of nodeIds) this._snapshotNodeStyle(id2);
-    this._updateNodes(nodeIds.map((id2) => ({ id: id2, style })));
+    const ids = refs.map((r) => this._targetNodeId(r)).filter((v) => v != null);
+    if (!ids.length) return;
+    for (const id2 of ids) this._snapshotNodeStyle(id2);
+    this._updateNodes(ids.map((id2) => ({ id: id2, style })));
   }
-  /** 重置单个节点样式 */
-  resetNodeStyle(nodeId) {
+  /** 重置单个节点样式（ref = 节点id/psrId/assetNo） */
+  resetNodeStyle(ref) {
     this._assertReady();
-    const orig = this._originalNodeStyles.get(nodeId);
+    const id2 = this._targetNodeId(ref);
+    if (id2 == null) return;
+    const orig = this._originalNodeStyles.get(id2);
     if (orig) {
-      this._updateNodes([{ id: nodeId, style: orig }]);
-      this._originalNodeStyles.delete(nodeId);
+      this._updateNodes([{ id: id2, style: orig }]);
+      this._originalNodeStyles.delete(id2);
     }
   }
   /** 重置所有节点样式 */
@@ -25743,28 +25933,43 @@ class TopoApi {
   // ============================================================
   //  四、边样式
   // ============================================================
-  /** 设置边样式 */
-  setEdgeStyle(srcId, tgtId, style) {
+  /** 解析边端点 → 节点 id（customer → 所在计量箱；失败返回 null） */
+  _edgeEndpoints(srcRef, tgtRef) {
+    const a2 = this._targetNodeId(srcRef);
+    const b = this._targetNodeId(tgtRef);
+    return a2 != null && b != null ? [a2, b] : null;
+  }
+  /** 设置边样式（端点可为节点 id/psrId/资产编号 assetNo） */
+  setEdgeStyle(srcRef, tgtRef, style) {
     this._assertReady();
-    const edgeId = this._edgeKey(srcId, tgtId);
+    const ep = this._edgeEndpoints(srcRef, tgtRef);
+    if (!ep) {
+      console.warn(`[TopoApi] setEdgeStyle: 无法解析端点 ${srcRef} / ${tgtRef}`);
+      return;
+    }
+    const edgeId = this._edgeKey(ep[0], ep[1]);
     this._snapshotEdgeStyle(edgeId);
     this._updateEdges([{ id: edgeId, style }]);
   }
-  /** 批量设置边样式 */
-  batchSetEdgeStyle(edgeIds, style) {
+  /** 批量设置边样式（每个端对可为 id/psrId/assetNo） */
+  batchSetEdgeStyle(edgeRefs, style) {
     this._assertReady();
     const updates = [];
-    for (const [src, tgt] of edgeIds) {
-      const eid = this._edgeKey(src, tgt);
+    for (const [src, tgt] of edgeRefs) {
+      const ep = this._edgeEndpoints(src, tgt);
+      if (!ep) continue;
+      const eid = this._edgeKey(ep[0], ep[1]);
       this._snapshotEdgeStyle(eid);
       updates.push({ id: eid, style });
     }
     if (updates.length) this._updateEdges(updates);
   }
-  /** 重置边样式 */
-  resetEdgeStyle(srcId, tgtId) {
+  /** 重置边样式（端点可为节点 id/psrId/资产编号 assetNo） */
+  resetEdgeStyle(srcRef, tgtRef) {
     this._assertReady();
-    const edgeId = this._edgeKey(srcId, tgtId);
+    const ep = this._edgeEndpoints(srcRef, tgtRef);
+    if (!ep) return;
+    const edgeId = this._edgeKey(ep[0], ep[1]);
     const orig = this._originalEdgeStyles.get(edgeId);
     if (orig) {
       this._updateEdges([{ id: edgeId, style: orig }]);
@@ -25775,54 +25980,92 @@ class TopoApi {
   //  五、高亮与标注
   // ============================================================
   /**
-   * 高亮节点
-   * @param {string} nodeId
+   * 高亮节点 / 箱内电表户
+   * @param {string} ref - 节点 id / psrId / 资产编号（电表户 → 该户表位高亮环 + 可选文字）
    * @param {object} [opts] - { color, label, labelColor, labelSize, borderColor, borderStyle, borderWidth }
    */
-  highlightNode(nodeId, opts = {}) {
+  highlightNode(ref, opts = {}) {
     this._assertReady();
-    this._snapshotNodeStyle(nodeId);
-    const style = {
-      highlight: 1
+    const t = this._resolveTarget(ref);
+    if (!t) {
+      console.warn(`[TopoApi] highlightNode: 无法解析目标 ${ref}`);
+      return;
+    }
+    if (t.kind === "node") {
+      this._snapshotNodeStyle(t.id);
+      const style = {
+        highlight: 1
+      };
+      if (opts.borderColor) style.highlightColor = opts.borderColor;
+      if (opts.borderWidth) style.highlightWidth = opts.borderWidth;
+      if (opts.borderStyle === "solid") style.highlightDash = [];
+      if (opts.label) {
+        style.annotationText = opts.label;
+        style.annotationColor = opts.labelColor || "#FFFFFF";
+        style.annotationSize = opts.labelSize || 12;
+      }
+      this._updateNodes([{ id: t.id, style }]);
+      return;
+    }
+    const d2 = this._cellFxGet(t.boxId, t.index);
+    d2.hl = {
+      color: opts.borderColor || opts.color || "#FFD700",
+      width: opts.borderWidth || 2,
+      dash: opts.borderStyle === "solid" ? [] : [4, 3]
     };
-    if (opts.borderColor) style.highlightColor = opts.borderColor;
-    if (opts.borderWidth) style.highlightWidth = opts.borderWidth;
-    if (opts.borderStyle === "solid") style.highlightDash = [];
     if (opts.label) {
-      style.annotationText = opts.label;
-      style.annotationColor = opts.labelColor || "#FFFFFF";
-      style.annotationSize = opts.labelSize || 12;
+      d2.note = {
+        text: String(opts.label),
+        color: opts.labelColor || "#FFD700",
+        size: Math.min(opts.labelSize || 8, 9),
+        position: "top",
+        mark: "hl"
+      };
     }
-    this._updateNodes([{ id: nodeId, style }]);
+    this._flushCellFx(t.boxId);
   }
-  /** 取消节点高亮 */
-  unhighlightNode(nodeId) {
+  /** 取消节点 / 箱内电表户高亮（ref 可传 id/psrId/assetNo） */
+  unhighlightNode(ref) {
     this._assertReady();
-    this._updateNodes([{
-      id: nodeId,
-      style: {
-        highlight: 0,
-        annotationText: "",
-        annotationColor: "",
-        annotationSize: 0
-      }
-    }]);
-    this._originalNodeStyles.delete(nodeId);
+    const t = this._resolveTarget(ref);
+    if (!t) return;
+    if (t.kind === "node") {
+      this._updateNodes([{
+        id: t.id,
+        style: {
+          highlight: 0,
+          annotationText: "",
+          annotationColor: "",
+          annotationSize: 0
+        }
+      }]);
+      this._originalNodeStyles.delete(t.id);
+      return;
+    }
+    const d2 = this._cellFx.get(this._cellFxKey(t.boxId, t.index));
+    if (!d2) return;
+    delete d2.hl;
+    if (d2.note && d2.note.mark === "hl") delete d2.note;
+    if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) this._cellFx.delete(this._cellFxKey(t.boxId, t.index));
+    this._flushCellFx(t.boxId);
   }
-  /** 高亮路径（节点+边） */
-  highlightPath(nodeIds, opts = {}) {
+  /** 高亮路径（节点与边；节点可为 id/psrId，箱内户可用 assetNo） */
+  highlightPath(refs, opts = {}) {
     this._assertReady();
-    for (const id2 of nodeIds) {
+    for (const id2 of refs) {
       this.highlightNode(id2, opts);
     }
     const edgeColor = opts.edgeColor || opts.color || "#00C8FF";
-    for (let i = 0; i + 1 < nodeIds.length; i++) {
-      const eid = this._edgeKey(nodeIds[i], nodeIds[i + 1]);
+    for (let i = 0; i + 1 < refs.length; i++) {
+      const a2 = this._targetNodeId(refs[i]);
+      const b = this._targetNodeId(refs[i + 1]);
+      if (a2 == null || b == null || a2 === b) continue;
+      const eid = this._edgeKey(a2, b);
       this._snapshotEdgeStyle(eid);
       this._updateEdges([{ id: eid, style: { overrideStroke: edgeColor, overrideLineWidth: 2.5 } }]);
     }
   }
-  /** 取消所有高亮 */
+  /** 取消所有高亮（含箱内电表户高亮环） */
   unhighlightAll() {
     this._assertReady();
     const nodeUpdates = [];
@@ -25840,11 +26083,26 @@ class TopoApi {
     }
     if (edgeUpdates.length) this._updateEdges(edgeUpdates);
     this._originalEdgeStyles.clear();
+    const boxes = /* @__PURE__ */ new Set();
+    for (const [key, d2] of this._cellFx) {
+      const hasHl = !!d2.hl;
+      if (d2.note && d2.note.mark === "hl") delete d2.note;
+      delete d2.hl;
+      if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) {
+        this._cellFx.delete(key);
+      } else if (hasHl) {
+        const sep = key.indexOf("#cust");
+        boxes.add(sep > 0 ? key.slice(0, sep) : null);
+      }
+    }
+    for (const boxId of boxes) {
+      if (boxId != null) this._flushCellFx(boxId);
+    }
   }
-  /** 非指定节点变暗 */
-  dimOthers(keepIds, opacity2 = 0.15) {
+  /** 非指定节点变暗（keepIds 内每一项可为 节点id/psrId/assetNo） */
+  dimOthers(keepRefs, opacity2 = 0.15) {
     this._assertReady();
-    const keepSet = new Set(keepIds);
+    const keepSet = new Set(keepRefs.map((r) => this._targetNodeId(r)).filter((v) => v != null));
     const updates = [];
     for (const n of this._model.nodes) {
       if (!keepSet.has(n.id)) {
@@ -25858,13 +26116,34 @@ class TopoApi {
   //  六、动画
   // ============================================================
   /**
-   * 节点脉动动画（G6 v5: updateNodeData + draw 方式）
+   * 节点脉动动画（G6 v5: updateNodeData + draw 方式）。
+   * ref = 节点 id/psrId → 图元透明度呼吸；assetNo → 该户电表格淡入淡出。
+   * opts: { duration, min, max }（min/max 为透明度下限/上限，默认 0.3/1）
    */
-  setNodePulse(nodeId, opts = {}) {
+  setNodePulse(ref, opts = {}) {
     this._assertReady();
+    const t = this._resolveTarget(ref);
+    if (!t) {
+      console.warn(`[TopoApi] setNodePulse: 无法解析目标 ${ref}（节点用 id/psrId，电表户用 assetNo）`);
+      return;
+    }
+    if (t.kind === "customer") {
+      this.removeAnimation(ref);
+      const d2 = this._cellFxGet(t.boxId, t.index);
+      d2.pulse = {
+        duration: opts.duration || 1500,
+        min: opts.min != null ? opts.min : 0.3,
+        max: opts.max != null ? opts.max : 1,
+        _start: performance.now(),
+        opacity: 1
+      };
+      this._flushCellFx(t.boxId);
+      this._ensureFxLoop();
+      return;
+    }
+    const nodeId = t.id;
     this.removeAnimation(nodeId);
     const duration2 = opts.duration || 1500;
-    this._safeNodeStyle(nodeId, {});
     let start = null;
     const animate = (ts) => {
       if (!this._graph || !this._animations.has(nodeId)) return;
@@ -25948,8 +26227,19 @@ class TopoApi {
     const raf2 = requestAnimationFrame(animate);
     this._animations.set(edgeId, raf2);
   }
-  /** 移除指定元素动画 */
+  /** 移除指定元素动画（ref = 节点 id/psrId → 脉动/边流动；assetNo → 该户脉动+光晕） */
   removeAnimation(targetId) {
+    const t = targetId != null ? this._resolveTarget(String(targetId)) : null;
+    if (t && t.kind === "customer") {
+      const key = this._cellFxKey(t.boxId, t.index);
+      const d2 = this._cellFx.get(key);
+      if (!d2) return;
+      delete d2.pulse;
+      delete d2.glow;
+      if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) this._cellFx.delete(key);
+      this._flushCellFx(t.boxId);
+      return;
+    }
     const raf2 = this._animations.get(targetId);
     if (raf2) {
       cancelAnimationFrame(raf2);
@@ -25972,9 +26262,11 @@ class TopoApi {
       console.error("[TopoApi] removeAnimation update error:", e2);
     }
   }
-  /** 移除所有动画 */
+  /** 移除所有动画（脉动/流动/光晕/户脉动户光晕） */
   removeAllAnimations() {
     this._removeAllAnimationsInternal();
+    this._removeAllGlowsInternal();
+    this._removeAllCellPulses();
   }
   _removeAllAnimationsInternal() {
     for (const [id2, raf2] of this._animations) {
@@ -25998,12 +26290,310 @@ class TopoApi {
     }
     this._animations.clear();
   }
+  /** 清除全部箱内电表户的脉动（保留光晕/高亮/文字） */
+  _removeAllCellPulses() {
+    if (this._glowRaf) {
+      cancelAnimationFrame(this._glowRaf);
+      this._glowRaf = null;
+    }
+    const dirty = /* @__PURE__ */ new Set();
+    for (const [key, d2] of this._cellFx) {
+      if (!d2.pulse) continue;
+      delete d2.pulse;
+      if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) {
+        this._cellFx.delete(key);
+      } else {
+        const sep = key.indexOf("#cust");
+        if (sep > 0) dirty.add(key.slice(0, sep));
+      }
+    }
+    if (!this._graph) return;
+    for (const boxId of dirty) this._flushCellFx(boxId);
+    if (this._hasFramedFx()) this._ensureFxLoop();
+  }
+  // ------------------------------------------------------------
+  //  光晕 / 脉动 动画 —— 节点 & 箱内电表户
+  //  setNodeGlow(ref, { color, spread/radius, duration, opacity, width, intensity, blink })
+  //    ref = 节点 id/psrId → 图元光环；assetNo → 该户表位光环
+  //    强度栈：blur 柔光底衬 + 实心光块 + 外扩散环×2 + 霓虹主环(shadowBlur) + 亮芯环
+  //    intensity = 强度倍率（默认 1）；blink = true/0~1 → 图元「整体闪烁」
+  //  setNodePulse(ref, opts) → 节点透明度呼吸；assetNo → 该户电表格淡入淡出
+  // ------------------------------------------------------------
+  /** 是否有需要逐帧推进的动画（节点光晕 / 户光晕 / 户脉动） */
+  _hasFramedFx() {
+    if (this._glowNodes.size) return true;
+    for (const d2 of this._cellFx.values()) {
+      if (d2.glow && !d2.glow.done || d2.pulse && !d2.pulse.done) return true;
+    }
+    return false;
+  }
+  /** 启动统一动画循环（节点光晕 + 箱内户光晕/脉动，每帧一次批量写入） */
+  _ensureFxLoop() {
+    if (this._glowRaf) return;
+    const loop = (ts) => {
+      if (!this._graph) {
+        this._glowRaf = null;
+        return;
+      }
+      const updates = [];
+      if (this._glowNodes.size) {
+        for (const [id2, s2] of this._glowNodes) {
+          if (!this._graph.getNodeData(id2)) {
+            this._glowNodes.delete(id2);
+            continue;
+          }
+          s2.phase = (ts - s2.start) % s2.duration / s2.duration;
+          updates.push({ id: id2, style: { _glowT: s2.phase } });
+        }
+      }
+      const dirtyBoxes = /* @__PURE__ */ new Set();
+      if (this._cellFx.size) {
+        const stale = [];
+        for (const [key, d2] of this._cellFx) {
+          if (!d2.glow && !d2.pulse) continue;
+          const sep = key.indexOf("#cust");
+          if (sep < 0) {
+            stale.push(key);
+            continue;
+          }
+          const boxId = key.slice(0, sep);
+          const idx = Number(key.slice(sep + 5));
+          const box2 = this._nodeByIdMap.get(boxId);
+          if (!box2 || !Array.isArray(box2._customers) || idx < 0 || idx >= box2._customers.length) {
+            stale.push(key);
+            continue;
+          }
+          if (d2.glow) d2.glow.t = (ts - d2.glow._start) % d2.glow.duration / d2.glow.duration;
+          if (d2.pulse) {
+            d2.pulse.opacity = d2.pulse.min + (d2.pulse.max - d2.pulse.min) * (0.5 + 0.5 * Math.sin((ts - d2.pulse._start) % d2.pulse.duration / d2.pulse.duration * Math.PI * 2));
+          }
+          dirtyBoxes.add(boxId);
+        }
+        for (const k of stale) this._cellFx.delete(k);
+      }
+      if (dirtyBoxes.size) {
+        const perBox = /* @__PURE__ */ new Map();
+        for (const [key, d2] of this._cellFx) {
+          const sep = key.indexOf("#cust");
+          if (sep < 0) continue;
+          const boxId = key.slice(0, sep);
+          if (!dirtyBoxes.has(boxId)) continue;
+          if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) continue;
+          if (!perBox.has(boxId)) perBox.set(boxId, {});
+          perBox.get(boxId)[Number(key.slice(sep + 5))] = d2;
+        }
+        for (const [boxId, obj] of perBox) {
+          const cur = this._safeNodeStyle(boxId, {});
+          updates.push({ id: boxId, style: { ...cur, _cellFx: obj } });
+        }
+      }
+      if (updates.length) {
+        try {
+          this._graph.updateNodeData(updates);
+          this._graph.render();
+        } catch {
+        }
+      }
+      if (!this._hasFramedFx()) {
+        this._glowRaf = null;
+        return;
+      }
+      this._glowRaf = requestAnimationFrame(loop);
+    };
+    this._glowRaf = requestAnimationFrame(loop);
+  }
+  /** 清除某节点 style 上的光晕帧字段（光晕环不再绘制） */
+  _clearGlowStyle(nodeId) {
+    try {
+      const cur = this._safeNodeStyle(nodeId, {});
+      this._graph.updateNodeData([{
+        id: nodeId,
+        style: {
+          ...cur,
+          _glowColor: void 0,
+          _glowSpread: void 0,
+          _glowOpacity: void 0,
+          _glowDuration: void 0,
+          _glowWidth: void 0,
+          _glowLevel: void 0,
+          _glowBlink: void 0,
+          _glowT: void 0
+        }
+      }]);
+    } catch {
+    }
+  }
+  /**
+   * 归一化「整体闪烁」参数：false / 未给 → 0（只画光环）；true → 0.85；数字 → clamp(0,1)。
+   * 数值含义 = 图元最暗时被压掉的透明度幅度（1 → 图元完全隐去，0.5 → 最暗降到 50%）。
+   */
+  _normBlink(v) {
+    if (v === true) return 0.85;
+    if (v === false || v == null) return 0;
+    const n = Number(v);
+    return Number.isFinite(n) ? Math.max(0, Math.min(1, n)) : 0;
+  }
+  /** 归一化强度倍率（intensity/level/strength）：默认 1，范围 0.2~3 */
+  _normLevel(v) {
+    const n = Number(v);
+    return Number.isFinite(n) && n > 0 ? Math.max(0.2, Math.min(3, n)) : 1;
+  }
+  /**
+   * 节点 / 箱内电表户光晕（发光环 + 霓虹辉光）动画。
+   * @param {string} ref  节点 id / psrId（图元光环）或资产编号 assetNo（该户表位光环）
+   * @param {object} [opts] - { color, spread/radius, duration, opacity, width, intensity/level/strength, blink/flash }
+   *   渲染栈：blur 柔光底衬 + 贴合图元的实心光块（面光）→ 图元 → 外扩散环 ×2 →
+   *           霓虹主环（粗线 + canvas shadowBlur 辉光）→ 偏白亮芯环（刺眼高光）。
+   *   intensity：强度倍率，默认 1（线宽/辉光/底光同时放大）；想“更夸张”给 1.5~2.5，想收敛给 0.5~0.7。
+   *   spread：光环外扩半径，默认按图元大小自适应（短边 ×0.7，16~46px）。
+   *   blink：图元「整体闪烁」开关/强度（默认 false 只画光环；true = 0.85；数字 0~1）。
+   *          开启后图元本体透明度随相位「亮 ↔ 暗」交替（与光环相位互补，始终有强视觉元素），
+   *          图元变暗的瞬间底衬光块最亮 —— 整块明暗交替比细线醒目得多。
+   *   width：主环初始线宽 (px)，默认 5.6（节点）/ 3.6（户表位），随相位收细。
+   * @returns {boolean} 是否命中并启动
+   */
+  setNodeGlow(ref, opts = {}) {
+    this._assertReady();
+    const t = this._resolveTarget(ref);
+    if (!t) {
+      console.warn(`[TopoApi] setNodeGlow: 无法解析目标 ${ref}（节点用 id/psrId，电表户用 assetNo）`);
+      return false;
+    }
+    const width = parseFloat(opts.width);
+    const spread = opts.spread != null ? opts.spread : opts.radius;
+    const cfg = {
+      color: opts.color || "#00C8FF",
+      spread: Number.isFinite(parseFloat(spread)) ? parseFloat(spread) : null,
+      // null → 按图元大小自适应
+      opacity: opts.opacity != null ? opts.opacity : 0.95,
+      duration: opts.duration || 1600,
+      width: Number.isFinite(width) && width > 0 ? width : null,
+      level: this._normLevel(opts.intensity != null ? opts.intensity : opts.level != null ? opts.level : opts.strength),
+      blink: this._normBlink(opts.blink != null ? opts.blink : opts.flash),
+      _start: performance.now(),
+      t: 0
+    };
+    if (t.kind === "node") {
+      this._glowNodes.set(t.id, cfg);
+      this._updateNodes([{
+        id: t.id,
+        style: {
+          _glowColor: cfg.color,
+          _glowSpread: cfg.spread == null ? void 0 : cfg.spread,
+          _glowOpacity: cfg.opacity,
+          _glowDuration: cfg.duration,
+          _glowWidth: cfg.width == null ? void 0 : cfg.width,
+          _glowLevel: cfg.level,
+          _glowBlink: cfg.blink || void 0,
+          _glowT: 0
+        }
+      }]);
+    } else {
+      const d2 = this._cellFxGet(t.boxId, t.index);
+      d2.glow = cfg;
+      this._flushCellFx(t.boxId);
+    }
+    this._ensureFxLoop();
+    return true;
+  }
+  /**
+   * 停止节点 / 箱内电表户的光晕动画。
+   * @param {string} ref  节点 id / psrId / 资产编号
+   */
+  removeNodeGlow(ref) {
+    this._assertReady();
+    const t = this._resolveTarget(ref);
+    if (!t) return false;
+    if (t.kind === "node") {
+      if (this._glowNodes.delete(t.id)) this._clearGlowStyle(t.id);
+      return true;
+    }
+    const d2 = this._cellFx.get(this._cellFxKey(t.boxId, t.index));
+    if (!d2) return false;
+    delete d2.glow;
+    if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) this._cellFx.delete(this._cellFxKey(t.boxId, t.index));
+    this._flushCellFx(t.boxId);
+    return true;
+  }
+  /** 停止全部光晕动画（节点 + 箱内电表户） */
+  removeAllNodeGlows() {
+    this._removeAllGlowsInternal();
+    if (this._hasFramedFx()) this._ensureFxLoop();
+  }
+  _removeAllGlowsInternal() {
+    if (this._glowRaf) {
+      cancelAnimationFrame(this._glowRaf);
+      this._glowRaf = null;
+    }
+    const updates = [];
+    if (this._graph && this._glowNodes.size) {
+      for (const [id2] of this._glowNodes) {
+        if (!this._graph.getNodeData(id2)) continue;
+        updates.push({
+          id: id2,
+          style: {
+            _glowColor: void 0,
+            _glowSpread: void 0,
+            _glowOpacity: void 0,
+            _glowDuration: void 0,
+            _glowWidth: void 0,
+            _glowLevel: void 0,
+            _glowBlink: void 0,
+            _glowT: void 0
+          }
+        });
+      }
+    }
+    this._glowNodes.clear();
+    const dirty = /* @__PURE__ */ new Set();
+    for (const [key, d2] of this._cellFx) {
+      if (!d2.glow) continue;
+      delete d2.glow;
+      if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) {
+        this._cellFx.delete(key);
+      } else {
+        const sep = key.indexOf("#cust");
+        if (sep > 0) dirty.add(key.slice(0, sep));
+      }
+    }
+    if (this._graph) {
+      if (updates.length) {
+        try {
+          this._graph.updateNodeData(updates);
+          this._graph.render();
+        } catch {
+        }
+      }
+      for (const boxId of dirty) this._flushCellFx(boxId);
+    }
+  }
   // ============================================================
   //  七、文字标注
   // ============================================================
-  /** 设置附加文字 */
-  setText(nodeId, text2, opts = {}) {
+  /**
+   * 设置附加文字（ref = 节点 id/psrId → 节点旁标注；assetNo → 该户表位上方小标注）
+   * opts: { color, fontSize, position: 'top'|'bottom' }
+   */
+  setText(ref, text2, opts = {}) {
     this._assertReady();
+    const t = this._resolveTarget(ref);
+    if (!t) {
+      console.warn(`[TopoApi] setText: 无法解析目标 ${ref}`);
+      return;
+    }
+    if (t.kind === "customer") {
+      const d2 = this._cellFxGet(t.boxId, t.index);
+      d2.note = {
+        text: String(text2),
+        color: opts.color || "#FFD700",
+        size: Math.min(opts.fontSize || 8, 9),
+        position: opts.position === "bottom" ? "bottom" : "top",
+        mark: "text"
+      };
+      this._flushCellFx(t.boxId);
+      return;
+    }
+    const nodeId = t.id;
     this._snapshotNodeStyle(nodeId);
     this._nodeLabels.set(nodeId, { text: text2, opts });
     this._updateNodes([{
@@ -26017,16 +26607,28 @@ class TopoApi {
       }
     }]);
   }
-  /** 移除附加文字 */
-  removeText(nodeId) {
+  /** 移除附加文字（ref = 节点 id/psrId/资产编号） */
+  removeText(ref) {
     this._assertReady();
+    const t = this._resolveTarget(ref);
+    if (!t) return;
+    if (t.kind === "customer") {
+      const key = this._cellFxKey(t.boxId, t.index);
+      const d2 = this._cellFx.get(key);
+      if (!d2) return;
+      delete d2.note;
+      if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) this._cellFx.delete(key);
+      this._flushCellFx(t.boxId);
+      return;
+    }
+    const nodeId = t.id;
     this._nodeLabels.delete(nodeId);
     this._updateNodes([{
       id: nodeId,
       style: { annotationText: "", annotationColor: "", annotationSize: 0 }
     }]);
   }
-  /** 移除所有附加文字 */
+  /** 移除所有附加文字（含箱内电表户标注） */
   removeAllTexts() {
     this._assertReady();
     const updates = [];
@@ -26035,6 +26637,18 @@ class TopoApi {
     }
     if (updates.length) this._updateNodes(updates);
     this._nodeLabels.clear();
+    const dirty = /* @__PURE__ */ new Set();
+    for (const [key, d2] of this._cellFx) {
+      if (!d2.note) continue;
+      delete d2.note;
+      if (!d2.hl && !d2.note && !d2.glow && !d2.pulse) {
+        this._cellFx.delete(key);
+      } else {
+        const sep = key.indexOf("#cust");
+        if (sep > 0) dirty.add(key.slice(0, sep));
+      }
+    }
+    for (const boxId of dirty) this._flushCellFx(boxId);
   }
   /** 按设备类型设字号 */
   setDeviceText(cat, fontSize2) {
@@ -26064,22 +26678,30 @@ class TopoApi {
   //  八、卡片盒
   // ============================================================
   /**
-   * 在节点旁弹卡片
-   * @param {string} nodeId
-   * @param {object} content - { title, fields, buttons, closable, width }
+   * 在节点 / 箱内电表户旁弹卡片。
+   * @param {string} ref   节点 id / psrId / 资产编号（assetNo → 卡片定位在该户表位旁）
+   * @param {object} [content] - { title, fields, buttons, closable, width }；
+   *                             缺省自动按「设备 / 客户档案」生成字段
    */
-  showCard(nodeId, content) {
+  showCard(ref, content) {
     var _a, _b, _c, _d, _e, _f;
     this._assertReady();
-    this.hideCard(nodeId);
+    const t = this._resolveTarget(ref);
+    if (!t) {
+      console.warn(`[TopoApi] showCard: 无法解析目标 ${ref}（节点用 id/psrId，电表户用 assetNo）`);
+      return;
+    }
+    const isCustomer = t.kind === "customer";
+    const cardKey = isCustomer ? this._cellFxKey(t.boxId, t.index) : t.id;
+    this.hideCard(cardKey);
     const container = ((_b = (_a = this._graph).getContainer) == null ? void 0 : _b.call(_a)) || ((_f = (_e = (_d = (_c = this._graph).getCanvas) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.getContainer) == null ? void 0 : _f.call(_e));
     if (!container) return;
-    const pos = this._layout.pos.get(nodeId);
-    if (!pos) return;
+    const world = this._targetWorld(ref);
+    if (!world) return;
     let client = null;
     try {
       if (typeof this._graph.getClientByCanvas === "function") {
-        const r = this._graph.getClientByCanvas([pos.x, pos.y]);
+        const r = this._graph.getClientByCanvas([world.x, world.y]);
         client = Array.isArray(r) ? { x: r[0], y: r[1] } : r;
       }
     } catch (e2) {
@@ -26092,12 +26714,37 @@ class TopoApi {
       const zoom = this._graph.getZoom();
       const canvasCenter = this._canvasCenterXY();
       const containerRect = container.getBoundingClientRect();
-      screenX = containerRect.left + canvasCenter.x + pos.x * zoom;
-      screenY = containerRect.top + canvasCenter.y + pos.y * zoom;
+      screenX = containerRect.left + canvasCenter.x + world.x * zoom;
+      screenY = containerRect.top + canvasCenter.y + world.y * zoom;
+    }
+    content = content || {};
+    let cTitle = content.title;
+    let cFields = content.fields;
+    if (!cTitle || !Array.isArray(cFields) || !cFields.length) {
+      if (isCustomer) {
+        const c = t.customer || {};
+        cTitle = cTitle || c.realConsName || c.consName || `表位 ${t.index + 1}`;
+        cFields = [
+          ["户名", c.realConsName || c.consName],
+          ["资产编号", c.assetNo],
+          ["客户编号", c.consId],
+          ["户号", c.consNo],
+          ["电表编号", c.meterId]
+        ].filter(([, v]) => v != null && v !== "").map(([label, value]) => ({ label, value }));
+      } else {
+        const node = t.node || {};
+        cTitle = cTitle || node.name || "设备信息";
+        cFields = [
+          ["类型", node.catLabel],
+          ["设备名称", node.name],
+          ["PSR编号", node.psrId],
+          ["状态", node.status === "0" ? "正常" : node.status]
+        ].filter(([, v]) => v != null && v !== "").map(([label, value]) => ({ label, value }));
+      }
     }
     const el = document.createElement("div");
     el.className = "topo-card";
-    el.dataset.nodeId = nodeId;
+    el.dataset.nodeId = cardKey;
     el.style.cssText = `
       position: fixed; left: ${screenX + 30}px; top: ${screenY - 20}px;
       width: ${content.width || 240}px; z-index: 1000;
@@ -26107,22 +26754,22 @@ class TopoApi {
     `;
     const head = document.createElement("div");
     head.style.cssText = "display:flex;align-items:center;justify-content:space-between;padding:8px 12px;border-bottom:1px solid #2c2c30;";
-    head.innerHTML = `<span style="font-weight:600;color:#fff;">${content.title || ""}</span>`;
+    head.innerHTML = `<span style="font-weight:600;color:#fff;">${String(cTitle || "").replace(/</g, "&lt;")}</span>`;
     if (content.closable !== false) {
       const closeBtn = document.createElement("button");
       closeBtn.textContent = "×";
       closeBtn.style.cssText = "border:none;background:none;color:#888;font-size:16px;cursor:pointer;";
-      closeBtn.onclick = () => this.hideCard(nodeId);
+      closeBtn.onclick = () => this.hideCard(cardKey);
       head.appendChild(closeBtn);
     }
     el.appendChild(head);
-    if (content.fields && content.fields.length) {
+    if (cFields && cFields.length) {
       const body = document.createElement("div");
       body.style.cssText = "padding:8px 12px;";
-      for (const f2 of content.fields) {
+      for (const f2 of cFields) {
         const row2 = document.createElement("div");
         row2.style.cssText = "display:flex;gap:8px;margin-bottom:4px;";
-        row2.innerHTML = `<span style="color:#8a8a96;flex:none;width:56px;">${f2.label}</span><span style="color:#eee;">${f2.value}</span>`;
+        row2.innerHTML = `<span style="color:#8a8a96;flex:none;width:56px;">${String(f2.label || "").replace(/</g, "&lt;")}</span><span style="color:#eee;">${String(f2.value != null ? f2.value : "").replace(/</g, "&lt;")}</span>`;
         body.appendChild(row2);
       }
       el.appendChild(body);
@@ -26136,21 +26783,34 @@ class TopoApi {
         b.style.cssText = btn.type === "primary" ? "padding:3px 10px;border:1px solid #00c8ff;border-radius:4px;background:#00c8ff;color:#000;cursor:pointer;font-size:12px;" : "padding:3px 10px;border:1px solid #3a3a42;border-radius:4px;background:#18181c;color:#ddd;cursor:pointer;font-size:12px;";
         b.onclick = () => {
           if (btn.onClick) btn.onClick();
-          this._emit("card:button", { nodeId, buttonIndex: idx });
+          if (isCustomer) {
+            this._emit("card:button", {
+              nodeId: t.boxId,
+              boxId: t.boxId,
+              index: t.index,
+              customer: t.customer,
+              cardKey,
+              buttonIndex: idx
+            });
+          } else {
+            this._emit("card:button", { nodeId: t.id, buttonIndex: idx });
+          }
         };
         foot.appendChild(b);
       });
       el.appendChild(foot);
     }
     document.body.appendChild(el);
-    this._cards.set(nodeId, el);
+    this._cards.set(cardKey, el);
   }
-  /** 关闭指定卡片 */
-  hideCard(nodeId) {
-    const el = this._cards.get(nodeId);
+  /** 关闭指定节点 / 电表户旁的卡片（ref 可传 id/psrId/assetNo） */
+  hideCard(ref) {
+    const t = this._resolveTarget(ref);
+    const key = t ? t.kind === "node" ? t.id : this._cellFxKey(t.boxId, t.index) : String(ref);
+    const el = this._cards.get(key);
     if (el) {
       el.remove();
-      this._cards.delete(nodeId);
+      this._cards.delete(key);
     }
   }
   /** 关闭所有卡片 */
@@ -26484,12 +27144,17 @@ class TopoApi {
   }
   /**
    * 添加拓扑高亮线
-   * @param {string[]} nodeIds - 节点路径
+   * @param {string[]} refs - 节点路径（每点可为 id/psrId；assetNo 落到所在计量箱）
    * @param {object} [opts] - { color, width, id }
    * @returns {string} 线 ID
    */
-  addTopoLine(nodeIds, opts = {}) {
+  addTopoLine(refs, opts = {}) {
     this._assertReady();
+    const nodeIds = refs.map((n) => this._targetNodeId(n)).filter((v) => v != null);
+    if (nodeIds.length < 2) {
+      console.warn("[TopoApi] addTopoLine: 有效节点不足 2 个，无法画线");
+      return opts.id || `topo-${Date.now()}`;
+    }
     const lineId = opts.id || `topo-${Date.now()}`;
     const color2 = opts.color || "#00C8FF";
     const width = opts.width || 3;
@@ -28076,6 +28741,8 @@ const THEMES = {
     cyan: "#00C8FF",
     gold: "#FFD700",
     gray: "#8B8B8B",
+    // 开关/熔丝（Kxx）标签文字：画在红色箱体（red）里的文字色，随主题切换
+    switchText: "#FFFFFF",
     // 计量箱（JX）：深色主题黑底白字；浅色主题白底深框深字（随画布配套）
     meterFill: "#000000",
     meterText: "#FFFFFF",
@@ -28104,6 +28771,9 @@ const THEMES = {
     cyan: "#0087B8",
     gold: "#B8860B",
     gray: "#9C9C9C",
+    // 开关标签：浅色主题下箱体仍是深红 red（#C62828），此处保持浅色字
+    // （白字对比度 ≈5.6:1；若改成深字，请连 red 一起调浅，否则只剩 ≈2.3:1 会发糊）
+    switchText: "#FFFFFF",
     meterFill: "#FFFFFF",
     // 浅色主题：白底 + 深框深字（随白画布配套）
     meterText: "#3A3A3A",
@@ -28307,6 +28977,19 @@ function withAlpha(color2, a2) {
 }
 const LW = 1.8;
 const LW_HI = 2.2;
+function mixWhite(color2, k) {
+  if (typeof color2 !== "string") return color2;
+  const m = color2.match(/^#([0-9a-f]{6}|[0-9a-f]{3})$/i);
+  if (!m) return color2;
+  let hex2 = m[1];
+  if (hex2.length === 3) hex2 = hex2.split("").map((h) => h + h).join("");
+  const n = parseInt(hex2, 16);
+  const mix = (v) => Math.round(v + (255 - v) * Math.max(0, Math.min(1, k)));
+  const r = mix(n >> 16 & 255), g = mix(n >> 8 & 255), b = mix(n & 255);
+  return `#${(r << 16 | g << 8 | b).toString(16).padStart(6, "0")}`;
+}
+const clampNum = (v, lo, hi) => v < lo ? lo : v > hi ? hi : v;
+const NO_HIT = { pointerEvents: "none" };
 function drawHighlight(attributes, group) {
   if (!attributes.highlight) return;
   const [w, h] = attributes.size;
@@ -28400,7 +29083,7 @@ function _wrapLinesFixed(str2, chars2) {
   if (line) lines.push(line);
   return lines;
 }
-function _drawWrappedTextFixed(group, str2, x, y, fontSize2, fill, chars2, lineGap = 1.3, weight = 400, align = "center") {
+function _drawWrappedTextFixed(group, str2, x, y, fontSize2, fill, chars2, lineGap = 1.3, weight = 400, align = "center", extra = null) {
   if (!str2) return;
   const lines = _wrapLinesFixed(str2, chars2);
   if (!lines.length) return;
@@ -28409,6 +29092,7 @@ function _drawWrappedTextFixed(group, str2, x, y, fontSize2, fill, chars2, lineG
     group.appendChild(
       new Text({
         style: {
+          ...extra || {},
           text: lines[i],
           x,
           y: y + lineHeight2 * i,
@@ -28482,7 +29166,7 @@ function drawBreaker(attributes, group) {
   }
   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) {
-    _drawWrappedText(group, attributes.labelText, 0, 0.6, 11.5, "#FFFFFF", bw - 8, 1.15, 700);
+    _drawWrappedText(group, attributes.labelText, 0, 0.6, 11.5, C2.switchText, bw - 8, 1.15, 700);
   }
 }
 function drawCableTerminal(attributes, group) {
@@ -28524,6 +29208,55 @@ function drawMeterFace(group, cx, cy, meterW, meterH, lineColor, markCell, cellI
   if (markCell) markCell(dot2, cellIdx);
   group.appendChild(dot2);
 }
+function cellFxAt(attributes, i) {
+  const fx = attributes && attributes._cellFx;
+  return fx && typeof fx === "object" ? fx[i] || null : null;
+}
+function drawCellGlowRings(group, cx, cy, baseR, g, t) {
+  glowStack(group, cx, cy, baseR, {
+    color: g.color,
+    t: t == null ? g.t : t,
+    spread: g.spread,
+    opacity: g.opacity,
+    width: g.width,
+    level: g.level
+  });
+}
+function cellBlinkOpacity(g) {
+  if (!g || !g.blink) return 1;
+  return 1 - g.blink * glowBlinkK(g.t == null ? 0 : g.t);
+}
+function drawCellGlowBackdrop(group, cx, cy, meterW, meterH, g) {
+  if (!g) return;
+  glowBackdrop(group, cx, cy, meterW, meterH, {
+    color: g.color,
+    t: g.t,
+    spread: g.spread != null ? g.spread : 14,
+    level: g.level,
+    blink: g.blink
+  });
+}
+function drawCellHighlight(group, cx, cy, baseR, hl) {
+  group.appendChild(new Circle({
+    style: {
+      ...NO_HIT,
+      cx,
+      cy,
+      r: baseR + 3,
+      stroke: hl.color || "#FFD700",
+      lineWidth: hl.width || 2,
+      lineDash: hl.dash || [4, 3],
+      fill: "none"
+    }
+  }));
+}
+function drawCellNote(group, cx, cy, baseR, note) {
+  const size = note.size || 7;
+  const color2 = note.color || C2.gold;
+  const top = !note.position || note.position === "top";
+  const y = top ? cy - baseR - 5 - size / 2 : cy + baseR + 6 + size / 2;
+  _drawWrappedTextFixed(group, note.text, cx, y, size, color2, 6, 1.15, 600, "center", NO_HIT);
+}
 function drawMeterBox(attributes, group) {
   const [w, h] = attributes.size;
   const boxColor = nodeColor(attributes);
@@ -28533,6 +29266,8 @@ function drawMeterBox(attributes, group) {
     const hover = attributes._custHover === 0;
     const baseColor = cellColorAt(attributes, 0) || boxColor || C2.white;
     const lineColor = sel ? C2.gold : hover ? C2.cyan : baseColor;
+    const fx = cellFxAt(attributes, 0);
+    const cellGroup = new Group({});
     const markCell = (shape) => {
       if (!nodeId) return;
       shape.__custBox = nodeId;
@@ -28540,12 +29275,15 @@ function drawMeterBox(attributes, group) {
     };
     const meterW = 20;
     const meterH = 26;
-    drawMeterFace(group, 0, -1, meterW, meterH, lineColor, markCell, 0);
+    const cx = 0;
+    const cy = -1;
+    const baseR = Math.max(12, meterH / 2 + 2);
+    if (fx && fx.glow) drawCellGlowBackdrop(cellGroup, cx, cy, meterW, meterH, fx.glow);
     if (sel || hover) {
       const ring = new Rect({
         style: {
-          x: -meterW / 2 - 4,
-          y: -meterH / 2 - 4,
+          x: cx - meterW / 2 - 4,
+          y: cy - meterH / 2 - 4,
           width: meterW + 8,
           height: meterH + 8,
           radius: 5,
@@ -28555,12 +29293,31 @@ function drawMeterBox(attributes, group) {
         }
       });
       markCell(ring);
-      group.appendChild(ring);
+      cellGroup.appendChild(ring);
+    }
+    const faceStart = cellGroup.children.length;
+    drawMeterFace(cellGroup, cx, cy, meterW, meterH, lineColor, markCell, 0);
+    const faceEnd = cellGroup.children.length;
+    if (fx) {
+      if (fx.hl) drawCellHighlight(cellGroup, cx, cy, baseR, fx.hl);
+      if (fx.note && fx.note.text) drawCellNote(cellGroup, cx, cy, baseR, fx.note);
+      if (fx.glow) drawCellGlowRings(cellGroup, cx, cy, baseR, fx.glow, fx.glow.t || 0);
     }
     const name = attributes._customers && attributes._customers[0] ? attributes._customers[0].realConsName || attributes._customers[0].consName || "" : "";
     if (name) {
-      _drawWrappedTextFixed(group, name, 0, meterH / 2 + 7, 7, lineColor, 4, 1.15, 500);
+      _drawWrappedTextFixed(cellGroup, name, cx, meterH / 2 + 7, 7, lineColor, 4, 1.15, 500);
+    }
+    if (fx && fx.pulse && fx.pulse.opacity != null && fx.pulse.opacity < 1) {
+      cellGroup.style.opacity = fx.pulse.opacity;
+    }
+    const blinkOp0 = fx && fx.glow ? cellBlinkOpacity(fx.glow) : 1;
+    if (blinkOp0 < 1) {
+      for (let k = faceStart; k < faceEnd && k < cellGroup.children.length; k++) {
+        const s2 = cellGroup.children[k].style;
+        s2.opacity = (s2.opacity == null ? 1 : s2.opacity) * blinkOp0;
+      }
     }
+    group.appendChild(cellGroup);
   } else if (attributes._meterBoxMode === "grid" && attributes._customers) {
     const frameColor = boxColor || C2.meterText;
     group.appendChild(new Rect({ style: { x: -w / 2, y: -h / 2, width: w, height: h, fill: withAlpha(frameColor, 0.04), stroke: frameColor, lineWidth: 1, radius: 4 } }));
@@ -28585,6 +29342,7 @@ function drawMeterBox(attributes, group) {
       shape.__custBox = nodeId;
       shape.__custIndex = i;
     };
+    const hitLayer = new Group({});
     for (let i = 0; i < customers.length; i++) {
       const row2 = Math.floor(i / cols);
       const col = i % cols;
@@ -28594,8 +29352,11 @@ function drawMeterBox(attributes, group) {
       const hover = i === custHover;
       const baseColor = cellColorAt(attributes, i) || C2.meterText;
       const lineColor = sel ? C2.gold : hover ? C2.cyan : baseColor;
+      const fx = cellFxAt(attributes, i);
+      const cellGroup = new Group({});
+      if (fx && fx.glow) drawCellGlowBackdrop(cellGroup, cx, cy, meterW, meterH, fx.glow);
       if (sel || hover) {
-        group.appendChild(new Circle({
+        cellGroup.appendChild(new Circle({
           style: {
             cx,
             cy,
@@ -28607,14 +29368,36 @@ function drawMeterBox(attributes, group) {
           }
         }));
       }
-      drawMeterFace(group, cx, cy, meterW, meterH, lineColor, markCell, i);
-      const hit = new Circle({ style: { cx, cy, r: hitR, fill: "rgba(255,255,255,0.01)", stroke: "none", cursor: "pointer" } });
-      markCell(hit, i);
-      group.appendChild(hit);
+      const faceStart = cellGroup.children.length;
+      drawMeterFace(cellGroup, cx, cy, meterW, meterH, lineColor, markCell, i);
+      const faceEnd = cellGroup.children.length;
+      if (fx) {
+        if (fx.hl) drawCellHighlight(cellGroup, cx, cy, hitR, fx.hl);
+        if (fx.note && fx.note.text) drawCellNote(cellGroup, cx, cy, hitR, fx.note);
+        if (fx.glow) drawCellGlowRings(cellGroup, cx, cy, hitR, fx.glow, fx.glow.t || 0);
+      }
+      if (showName) {
+        const name = customers[i].realConsName || customers[i].consName || "";
+        if (name) {
+          _drawWrappedTextFixed(cellGroup, name, cx, cy + meterH / 2 + 6.5, 6.5, lineColor, 4, 1.15, 500);
+        }
+      }
+      const hitCell = new Rect({
+        style: {
+          x: cx - cellW / 2 - METER_GAP / 2,
+          y: cy - cellW / 2 - METER_GAP / 2,
+          width: cellW + METER_GAP,
+          height: cellH + METER_GAP,
+          fill: "rgba(255,255,255,0.01)",
+          stroke: "none",
+          cursor: "pointer"
+        }
+      });
+      markCell(hitCell, i);
+      hitLayer.appendChild(hitCell);
       if (showName) {
         const name = customers[i].realConsName || customers[i].consName || "";
         if (name) {
-          _drawWrappedTextFixed(group, name, cx, cy + meterH / 2 + 6.5, 6.5, lineColor, 4, 1.15, 500);
           const hitName = new Circle({
             style: {
               cx,
@@ -28626,10 +29409,22 @@ function drawMeterBox(attributes, group) {
             }
           });
           markCell(hitName, i);
-          group.appendChild(hitName);
+          hitLayer.appendChild(hitName);
+        }
+      }
+      if (fx && fx.pulse && fx.pulse.opacity != null && fx.pulse.opacity < 1) {
+        cellGroup.style.opacity = fx.pulse.opacity;
+      }
+      const blinkOp = fx && fx.glow ? cellBlinkOpacity(fx.glow) : 1;
+      if (blinkOp < 1) {
+        for (let k = faceStart; k < faceEnd && k < cellGroup.children.length; k++) {
+          const s2 = cellGroup.children[k].style;
+          s2.opacity = (s2.opacity == null ? 1 : s2.opacity) * blinkOp;
         }
       }
+      group.appendChild(cellGroup);
     }
+    group.appendChild(hitLayer);
   } else {
     const s2 = Math.min(w, h) || 21;
     const ink = boxColor || C2.meterText;
@@ -28717,6 +29512,134 @@ const DRAWERS = {
   other: drawUnknown
 };
 const _pulseState = /* @__PURE__ */ new Map();
+function pushGlowRing(group, cx, cy, r, lineWidth, strokeOpacity, color2, blur) {
+  if (strokeOpacity <= 0.015 || lineWidth <= 0) return;
+  const style = {
+    ...NO_HIT,
+    cx,
+    cy,
+    r,
+    stroke: color2,
+    lineWidth,
+    strokeOpacity,
+    fill: "none",
+    lineCap: "round"
+  };
+  if (blur > 0.5) {
+    style.shadowColor = color2;
+    style.shadowBlur = blur;
+  }
+  group.appendChild(new Circle({ style }));
+}
+function glowStack(group, cx, cy, baseR, g) {
+  const color2 = g.color || "#00C8FF";
+  const level = g.level > 0 ? g.level : 1;
+  const tt = clampNum(g.t == null ? 0 : g.t, 0, 1);
+  const spread = g.spread != null ? g.spread : 14;
+  const maxOp = g.opacity == null ? 0.95 : g.opacity;
+  const alpha = Math.min(1, maxOp * Math.pow(1 - tt, 1.1) * Math.min(1.5, level));
+  if (alpha <= 0.02) return;
+  const r = baseR + spread * (1 - (1 - tt) * (1 - tt));
+  const lw = Math.max(1.3, (g.width || 3.6) * level * (0.34 + 0.66 * (1 - tt)));
+  pushGlowRing(group, cx, cy, r + spread * 1.1, lw * 0.4, alpha * 0.26, color2, 0);
+  pushGlowRing(group, cx, cy, r + spread * 0.55, lw * 0.62, alpha * 0.5, color2, lw * 2.5);
+  pushGlowRing(group, cx, cy, r, lw, alpha, color2, lw * 6);
+  pushGlowRing(group, cx, cy, r, Math.max(1.1, lw * 0.34), Math.min(1, alpha * 1.05), mixWhite(color2, 0.62), lw * 2);
+}
+function glowBackdrop(group, x, y, w, h, g) {
+  const color2 = g.color || "#00C8FF";
+  const level = g.level > 0 ? g.level : 1;
+  const tt = clampNum(g.t == null ? 0 : g.t, 0, 1);
+  const spread = g.spread != null ? g.spread : Math.max(14, Math.min(w, h) * 0.7);
+  const blink = g.blink || 0;
+  const fade = Math.pow(1 - tt, 1.1);
+  const bk = glowBlinkK(tt);
+  const base = Math.min(0.6, level * (0.26 * fade + 0.5 * blink * bk));
+  const aura = Math.min(0.45, level * (0.2 * fade + 0.42 * blink * bk));
+  if (base <= 0.02 && aura <= 0.02) return;
+  const rad2 = Math.max(3, Math.min(w, h) * 0.16);
+  const blurPx = clampNum(Math.min(w, h) * 0.28, 4, 18) * level;
+  group.appendChild(new Rect({
+    style: {
+      ...NO_HIT,
+      x: x - w / 2 - spread * 0.85,
+      y: y - h / 2 - spread * 0.85,
+      width: w + spread * 1.7,
+      height: h + spread * 1.7,
+      radius: rad2 + 4,
+      fill: color2,
+      fillOpacity: aura,
+      stroke: "none",
+      filter: `blur(${blurPx.toFixed(1)}px)`
+    }
+  }));
+  group.appendChild(new Rect({
+    style: {
+      ...NO_HIT,
+      x: x - w / 2 - 2.5,
+      y: y - h / 2 - 2.5,
+      width: w + 5,
+      height: h + 5,
+      radius: rad2,
+      fill: color2,
+      fillOpacity: base,
+      stroke: "none"
+    }
+  }));
+}
+function glowBlinkK(t) {
+  return 0.5 - 0.5 * Math.cos((t || 0) * Math.PI * 2);
+}
+function glowParams(attributes) {
+  const color2 = attributes._glowColor;
+  if (!color2) return null;
+  const [w, h] = attributes.size || [40, 40];
+  const t = clampNum(attributes._glowT == null ? 0 : attributes._glowT, 0, 1);
+  const level = attributes._glowLevel > 0 ? attributes._glowLevel : 1;
+  const spread = attributes._glowSpread != null ? attributes._glowSpread : clampNum(Math.min(w, h) * 0.7, 16, 46);
+  return {
+    color: color2,
+    t,
+    w,
+    h,
+    level,
+    baseR: Math.max(w, h) / 2 + 3,
+    spread,
+    maxOp: attributes._glowOpacity == null ? 0.95 : attributes._glowOpacity,
+    lw0: attributes._glowWidth || 5.6,
+    // 主环初始线宽（可调，默认 5.6）
+    blink: attributes._glowBlink || 0
+    // 整体闪烁强度（0=关；setNodeGlow blink 参数）
+  };
+}
+function drawGlowBackdrop(attributes, group) {
+  const p = glowParams(attributes);
+  if (!p) return;
+  glowBackdrop(group, 0, 0, p.w, p.h, {
+    color: p.color,
+    t: p.t,
+    spread: p.spread,
+    level: p.level,
+    blink: p.blink
+  });
+}
+function nodeBlinkOpacity(attributes) {
+  const blink = attributes._glowBlink;
+  if (!blink) return 1;
+  return 1 - blink * glowBlinkK(attributes._glowT == null ? 0 : attributes._glowT);
+}
+function drawGlow(attributes, group) {
+  const p = glowParams(attributes);
+  if (!p) return;
+  glowStack(group, 0, 0, p.baseR, {
+    color: p.color,
+    t: p.t,
+    spread: p.spread,
+    opacity: p.maxOp,
+    width: p.lw0,
+    level: p.level
+  });
+}
 class SvgSymbolNode extends g6.BaseNode {
   drawKeyShape(attributes, container) {
     const [w, h] = attributes.size;
@@ -28746,7 +29669,11 @@ class SvgSymbolNode extends g6.BaseNode {
     const target = rot ? new Group({ style: { transform: `rotate(${rot}deg)` } }) : key;
     if (rot) key.appendChild(target);
     const draw = DRAWERS[attributes.cat] || drawUnknown;
+    drawGlowBackdrop(attributes, target);
+    const symStart = (target.children || []).length;
     draw(attributes, target);
+    const symEnd = (target.children || []).length;
+    drawGlow(attributes, target);
     drawHighlight(attributes, target);
     drawAnnotation(attributes, target);
     if (attributes.labelText && !attributes._stationTitle && attributes.cat !== "bus" && attributes.cat !== "cableTerminal" && attributes.cat !== "consumer" && attributes.cat !== "switch" && attributes.cat !== "meterBox") {
@@ -28763,6 +29690,15 @@ class SvgSymbolNode extends g6.BaseNode {
         for (const child of items) child.style.opacity = op;
       }
     }
+    const blinkOp = nodeBlinkOpacity(attributes);
+    if (blinkOp < 1) {
+      const kids = target.children || [];
+      for (let i = symStart; i < symEnd && i < kids.length; i++) {
+        const s2 = kids[i].style;
+        const base = s2.opacity == null ? 1 : s2.opacity;
+        s2.opacity = base * blinkOp;
+      }
+    }
     return key;
   }
 }
@@ -28860,6 +29796,56 @@ const _sfc_main$2 = {
     function cellFromShape(shape) {
       return shape && shape.__custBox != null && shape.__custIndex != null ? { nodeId: shape.__custBox, index: shape.__custIndex } : null;
     }
+    function cellIndexAtPoint(nodeId, evt) {
+      const st = styleOf(nodeId);
+      if (!st || st._meterBoxMode !== "grid" || !Array.isArray(st._customers) || !st._customers.length) return null;
+      const c = evt && (evt.canvas || evt.viewport) || {};
+      if (c.x == null || c.y == null || st.x == null || st.y == null) return null;
+      let lx = c.x - st.x;
+      let ly = c.y - st.y;
+      const rot = (st.rotate || 0) * Math.PI / 180;
+      if (rot) {
+        const cos = Math.cos(-rot);
+        const sin = Math.sin(-rot);
+        const nx = lx * cos - ly * sin;
+        const ny = lx * sin + ly * cos;
+        lx = nx;
+        ly = ny;
+      }
+      const cols = st._meterBoxCols || Math.min(st._customers.length, MAX_COLS);
+      const cellW = METER_CELL_W;
+      const cellH = st._meterBoxShowName ? METER_CELL_H : METER_CELL_W;
+      const rows = st._meterBoxRows || Math.ceil(st._customers.length / cols);
+      const gridW = cols * cellW + (cols - 1) * METER_GAP;
+      const gridH = rows * cellH + (rows - 1) * METER_GAP;
+      const col = Math.floor((lx + gridW / 2) / (cellW + METER_GAP));
+      const row2 = Math.floor((ly + gridH / 2) / (cellH + METER_GAP));
+      if (col < 0 || col >= cols || row2 < 0 || row2 >= rows) return null;
+      const i = row2 * cols + col;
+      return i < st._customers.length ? i : null;
+    }
+    const DEBUG_CELL = typeof location !== "undefined" && /[?&]debugCell\b/.test(location.search);
+    function dbgCell(tag, detail) {
+      if (DEBUG_CELL) console.log("[cell-debug]", tag, detail);
+    }
+    function nodeIdOfShape(shape) {
+      if (!shape || !nodeByIdMap) return null;
+      let el = shape;
+      for (let hops = 0; el && hops < 16; hops++) {
+        if (el.id && nodeByIdMap.has(el.id)) return el.id;
+        el = el.parentElement;
+      }
+      return null;
+    }
+    function resolveCell(evt, shape, nodeIdHint, allowBboxFallback = true) {
+      const direct = cellFromShape(shape);
+      if (direct) return direct;
+      let nid = nodeIdHint || nodeIdOfShape(shape);
+      if (!nid && allowBboxFallback) nid = hitTestNodeAtCanvas(evt);
+      if (!nid) return null;
+      const idx = cellIndexAtPoint(nid, evt);
+      return idx == null ? null : { nodeId: nid, index: idx };
+    }
     function neighborsOf(id2) {
       const upstream = [];
       const downstream = [];
@@ -28938,6 +29924,32 @@ const _sfc_main$2 = {
       emit("node-select", { node, upstream, downstream });
       if (api) api._emit("node:click", { nodeId: id2, node });
     }
+    function selectNodeRef(ref) {
+      if (!api || !graph || ref == null) return;
+      const t = api._resolveTarget(ref);
+      if (!t) {
+        selectNodeWithInfo(String(ref));
+        return;
+      }
+      if (t.kind === "customer") {
+        selectCustomerWithInfo(t.boxId, t.index);
+      } else {
+        selectNodeWithInfo(t.id);
+      }
+    }
+    function selectCustomerRef(nodeRef, index) {
+      if (!api || !graph || nodeRef == null) return;
+      const t = api._resolveTarget(nodeRef);
+      if (!t) {
+        selectNodeWithInfo(String(nodeRef));
+        return;
+      }
+      if (t.kind === "customer") {
+        selectCustomerWithInfo(t.boxId, t.index);
+        return;
+      }
+      selectCustomerWithInfo(t.id, index);
+    }
     function routeNodeTap(id2) {
       if (!graph || id2 == null) return;
       const customers = customersOf(id2);
@@ -29071,14 +30083,21 @@ const _sfc_main$2 = {
       graph.on("node:click", (evt) => {
         const id2 = evt.target.id;
         if (!id2) return;
-        const cell = cellFromShape(evt.originalTarget);
-        if (cell && customersOf(id2)) {
+        const cell = resolveCell(evt, evt.originalTarget, id2);
+        dbgCell("node:click", {
+          id: id2,
+          shape: evt.originalTarget && evt.originalTarget.nodeName,
+          mark: cellFromShape(evt.originalTarget),
+          cell,
+          canvas: evt.canvas
+        });
+        if (cell && customersOf(id2) && cell.nodeId === id2) {
           selectCustomerWithInfo(id2, cell.index);
           return;
         }
         routeNodeTap(id2);
       });
-      function hitTestNodeAtCanvas(evt) {
+      function hitTestNodeAtCanvas2(evt) {
         const c = evt && (evt.canvas || evt.viewport) || {};
         const cx = c.x, cy = c.y;
         if (cx == null || cy == null) return null;
@@ -29128,8 +30147,14 @@ const _sfc_main$2 = {
         api._emit("edge:click", { edgeId: id2, source: src, target: tgt });
       });
       graph.on("canvas:click", (evt) => {
-        const hitId = hitTestNodeAtCanvas(evt);
+        const hitId = hitTestNodeAtCanvas2(evt);
         if (hitId) {
+          const cell = resolveCell(evt, null, hitId);
+          dbgCell("canvas:click", { hitId, cell, canvas: evt.canvas });
+          if (cell && cell.nodeId === hitId && customersOf(hitId)) {
+            selectCustomerWithInfo(hitId, cell.index);
+            return;
+          }
           routeNodeTap(hitId);
           return;
         }
@@ -29151,7 +30176,7 @@ const _sfc_main$2 = {
         const gCanvas = graph.getCanvas && graph.getCanvas();
         const doc = gCanvas && gCanvas.document;
         if (doc) {
-          doc.addEventListener("pointermove", (e2) => setCellHover(cellFromShape(e2 && e2.target)));
+          doc.addEventListener("pointermove", (e2) => setCellHover(resolveCell(e2, e2 && e2.target, null, false)));
         }
         hoverLeaveHandler = () => setCellHover(null);
         container.value.addEventListener("pointerleave", hoverLeaveHandler);
@@ -29250,9 +30275,9 @@ const _sfc_main$2 = {
       }, {}),
       // 保留原有快捷方法
       resetView,
-      selectNode: selectNodeWithInfo,
-      /** 选中计量箱内第 index 个用户（多用户箱，等价于画布点击该用户） */
-      selectCustomer: (nodeId, index) => selectCustomerWithInfo(nodeId, index),
+      selectNode: selectNodeRef,
+      /** 选中计量箱内第 index 个用户（nodeRef=箱节点id/psrId；传 assetNo 时自动定位该户） */
+      selectCustomer: selectCustomerRef,
       /** 当前选中的“箱内用户”信息（{ nodeId, index, customer, node } | null） */
       getSelectedCustomer,
       exportPng,
@@ -29291,7 +30316,7 @@ const _sfc_main$2 = {
     };
   }
 };
-const TopoGraph = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-c2cd8b2c"]]);
+const TopoGraph = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-a4a4c398"]]);
 const _hoisted_1$1 = ["data-theme"];
 const _hoisted_2$1 = { class: "panel-head" };
 const _hoisted_3$1 = {
@@ -29664,7 +30689,7 @@ const _sfc_main = {
   }
 };
 const DistanceTop10 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-438b6017"]]);
-const VERSION = "0.1.8";
+const VERSION = "0.1.10";
 const DESCRIPTION = "配电台区单线图拓扑成图引擎";
 exports.DESCRIPTION = DESCRIPTION;
 exports.DistanceTop10 = DistanceTop10;