topo-engine 0.1.7 → 0.1.9

package/dist/topo-engine.cjs

@@ -25026,8 +25026,8 @@ function injectCustomers(model, customerMap) {
     node._customers = customers;
     if (customers.length === 1) {
       node._meterBoxMode = "single";
-      node._meterBoxW = 30;
-      node._meterBoxH = 38;
+      node._meterBoxW = 22;
+      node._meterBoxH = 30;
     } else {
       const showName = customers.length <= SHOW_NAME_LIMIT;
       const cols = Math.min(customers.length, MAX_COLS);
@@ -25097,32 +25097,48 @@ 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();
   }
   /** 数据刷新（图重新渲染后调用） */
   update(graph, model, layout, nodeByIdMap) {
+    const colorSnapshot = {
+      node: new Map(this._nodeColorOverrides),
+      cust: new Map(this._custColorOverrides)
+    };
     this.destroy();
     this._graph = graph;
     this._model = model;
     this._layout = layout;
     this._nodeByIdMap = nodeByIdMap;
     this._selectedId = null;
+    this._nodeColorOverrides = colorSnapshot.node;
+    this._custColorOverrides = colorSnapshot.cust;
     this._bindConnGraphEvents();
+    this._applyColorOverrides();
   }
   /** 销毁，释放所有资源 */
   destroy() {
     this._removeAllConnectionsInternal();
     this._unbindConnGraphEvents();
     this._removeAllAnimationsInternal();
+    this._removeAllGlowsInternal();
     this._removeAllTopoLinesInternal();
     this._hideAllCardsInternal();
     this._listeners.clear();
     this._originalNodeStyles.clear();
     this._originalEdgeStyles.clear();
     this._nodeLabels.clear();
+    this._nodeColorOverrides.clear();
+    this._custColorOverrides.clear();
+    this._cellFx.clear();
     this._graph = null;
     this._model = null;
     this._layout = null;
@@ -25240,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() {
@@ -25276,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);
       }
@@ -25293,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() {
@@ -25335,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;
@@ -25352,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) {
@@ -25380,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() {
@@ -25404,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;
   }
   /** 获取图整体边界 */
@@ -25451,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);
     }
   }
   /** 获取当前视口状态 */
@@ -25474,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);
     }
   }
   /** 重置所有节点样式 */
@@ -25506,30 +25707,269 @@ class TopoApi {
     this._originalNodeStyles.clear();
   }
   // ============================================================
+  //  三·五、节点 / 箱内电表户染色（支持 psrId / 资产编号 / 节点 id）
+  //
+  //  普通节点（变压器/开关/熔丝/导线点/用户接入点…）→ 图元“整图单色换装”，
+  //    主体/引线/描边换成指定色，白字与浅色细节保留可读；
+  //  箱内电表户（计量箱 grid/single 里的每只电表）→ 该户电表图标与户名染色。
+  //  引用规则与 addConnection 完全一致：
+  //    节点：节点内部 id 或 psrId（设备编码）；电表户：客户档案 assetNo（资产编号，
+  //    兼容 consNo / consId）。染色记录随数据重渲染（主题切换/换数据）自动保留重放。
+  // ============================================================
+  /**
+   * 把当前记录的染色覆盖（节点 / 电表户）重新写进图 style（update 后调用）。
+   * 仅做 updateNodeData 合并，不主动 render —— 由随后的一次 render 统一生效。
+   * 顺带清理指向已不存在节点 / 表位的过期记录（换数据后自动丢弃）。
+   */
+  _applyColorOverrides() {
+    if (!this._graph) return;
+    const updates = [];
+    if (this._nodeColorOverrides.size) {
+      const stale = [];
+      for (const [id2, color2] of this._nodeColorOverrides) {
+        if (!this._graph.getNodeData(id2)) {
+          stale.push(id2);
+          continue;
+        }
+        updates.push({ id: id2, style: { color: color2 || "" } });
+      }
+      for (const id2 of stale) this._nodeColorOverrides.delete(id2);
+    }
+    if (this._custColorOverrides.size) {
+      const byBox = /* @__PURE__ */ new Map();
+      const stale = [];
+      for (const [key, color2] of this._custColorOverrides) {
+        const sep = key.indexOf("#cust");
+        if (sep < 0) {
+          stale.push(key);
+          continue;
+        }
+        const boxId = key.slice(0, sep);
+        if (!this._graph.getNodeData(boxId)) {
+          stale.push(key);
+          continue;
+        }
+        if (!byBox.has(boxId)) byBox.set(boxId, /* @__PURE__ */ new Map());
+        byBox.get(boxId).set(Number(key.slice(sep + 5)), color2);
+      }
+      for (const [boxId, cellMap] of byBox) {
+        const cur = this._safeNodeStyle(boxId, {});
+        const customers = cur._customers;
+        if (!Array.isArray(customers) || !customers.length) continue;
+        const arr = new Array(customers.length).fill(null);
+        let any = false;
+        for (const [idx, color2] of cellMap) {
+          if (idx >= 0 && idx < arr.length && color2) {
+            arr[idx] = color2;
+            any = true;
+          }
+        }
+        updates.push({ id: boxId, style: { _cellColors: any ? arr : null } });
+      }
+      for (const key of stale) this._custColorOverrides.delete(key);
+    }
+    if (updates.length) {
+      try {
+        this._graph.updateNodeData(updates);
+      } catch (e2) {
+        console.error("[TopoApi] _applyColorOverrides error:", e2);
+      }
+    }
+  }
+  /**
+   * 写入某个解析端点的染色（setNodeColor / batchSetNodeColor 共用）。
+   * @param {{kind:'node',id:string}|{kind:'customer',boxId:string,index:number,node:object}} e
+   * @param {string|null} color 颜色；null/''/undefined = 清除该处染色
+   */
+  _writeColorEndpoint(e2, color2) {
+    if (!this._graph) return;
+    color2 = color2 == null ? null : String(color2).trim() || null;
+    if (e2.kind === "node") {
+      const id2 = e2.id;
+      if (color2) this._nodeColorOverrides.set(id2, color2);
+      else this._nodeColorOverrides.delete(id2);
+      this._updateNodes([{ id: id2, style: { color: color2 || "" } }]);
+      return;
+    }
+    const key = `${e2.boxId}#cust${e2.index}`;
+    if (color2) this._custColorOverrides.set(key, color2);
+    else this._custColorOverrides.delete(key);
+    const cur = this._safeNodeStyle(e2.boxId, {});
+    const customers = cur._customers;
+    if (!Array.isArray(customers) || !customers.length) return;
+    const arr = new Array(customers.length).fill(null);
+    let any = false;
+    for (const [k, c] of this._custColorOverrides) {
+      if (!k.startsWith(`${e2.boxId}#cust`)) continue;
+      const idx = Number(k.slice(k.indexOf("#cust") + 5));
+      if (idx >= 0 && idx < arr.length && c) {
+        arr[idx] = c;
+        any = true;
+      }
+    }
+    this._updateNodes([{ id: e2.boxId, style: { _cellColors: any ? arr : null } }]);
+  }
+  /**
+   * 给节点 / 箱内电表户设置颜色。
+   * @param {string} ref   节点内部 id / 节点 psrId（普通节点、计量箱本体）
+   *                       或 客户资产编号 assetNo（兼容 consNo/consId，箱内电表户）
+   * @param {string} [color] 颜色（'#RRGGBB' / 'red' 等）；传 null/''/undefined 清除该处染色
+   * @returns {boolean} 是否命中并设置成功
+   */
+  setNodeColor(ref, color2) {
+    this._assertReady();
+    const e2 = this._parseEndpoint(ref);
+    if (!e2) {
+      console.warn(`[TopoApi] setNodeColor: 无法解析目标 ${ref}（普通节点请用 psrId/节点id，电表户请用 assetNo/consNo/consId）`);
+      return false;
+    }
+    this._writeColorEndpoint(e2, color2);
+    return true;
+  }
+  /**
+   * 批量设置颜色。三种入参形式：
+   *   1) 数组：[ ['8ff4…', '#FF0000'], ['4230…资产编号', '#00FF00'], … ]
+   *   2) 数组：[{ ref / psrId / assetNo / nodeId, color? }]（color 缺省用第 2 参）
+   *   3) 对象：{ 'psrId或assetNo': '#FF0000', … }
+   * @param {*} entries
+   * @param {string} [color] 未在单项里给色时的兜底颜色
+   * @returns {{total:number, ok:number, failed:Array<{ref:string, reason:string}>}}
+   */
+  batchSetNodeColor(entries, color2) {
+    this._assertReady();
+    const failed = [];
+    let total = 0;
+    const applyRef = (ref, c) => {
+      total++;
+      const e2 = this._parseEndpoint(ref);
+      if (!e2) {
+        failed.push({ ref: String(ref), reason: "未命中任何节点/电表户" });
+        return;
+      }
+      this._writeColorEndpoint(e2, c);
+    };
+    if (Array.isArray(entries)) {
+      for (const item of entries) {
+        if (Array.isArray(item)) {
+          applyRef(item[0], item[1] != null ? item[1] : color2);
+        } else if (item && typeof item === "object") {
+          const ref = item.ref != null ? item.ref : item.psrId != null ? item.psrId : item.assetNo != null ? item.assetNo : item.nodeId;
+          if (ref == null) {
+            total++;
+            failed.push({ ref: JSON.stringify(item), reason: "缺少 ref/psrId/assetNo/nodeId" });
+            continue;
+          }
+          applyRef(ref, item.color != null ? item.color : color2);
+        }
+      }
+    } else if (entries && typeof entries === "object") {
+      for (const [ref, c] of Object.entries(entries)) applyRef(ref, c);
+    }
+    return { total, ok: total - failed.length, failed };
+  }
+  /**
+   * 清除某处染色（返回节点 / 电表户到主题默认配色）。
+   * @param {string} ref 同 setNodeColor 的引用
+   */
+  resetNodeColor(ref) {
+    this._assertReady();
+    const e2 = this._parseEndpoint(ref);
+    if (!e2) {
+      console.warn(`[TopoApi] resetNodeColor: 无法解析目标 ${ref}`);
+      return false;
+    }
+    this._writeColorEndpoint(e2, null);
+    return true;
+  }
+  /** 清除全部染色（所有节点与电表户回到主题默认配色） */
+  resetAllNodeColors() {
+    this._assertReady();
+    const nodeUpdates = [];
+    for (const [id2] of this._nodeColorOverrides) {
+      if (this._graph.getNodeData(id2)) nodeUpdates.push({ id: id2, style: { color: "" } });
+    }
+    const boxes = /* @__PURE__ */ new Set();
+    for (const [key] of this._custColorOverrides) {
+      const sep = key.indexOf("#cust");
+      if (sep >= 0) boxes.add(key.slice(0, sep));
+    }
+    for (const boxId of boxes) {
+      if (this._graph.getNodeData(boxId)) {
+        nodeUpdates.push({ id: boxId, style: { _cellColors: null } });
+      }
+    }
+    if (nodeUpdates.length) this._updateNodes(nodeUpdates);
+    this._nodeColorOverrides.clear();
+    this._custColorOverrides.clear();
+  }
+  /**
+   * 查询某处当前生效的染色。
+   * @param {string} ref 同 setNodeColor 的引用
+   * @returns {{ kind: 'node'|'customer', id: string, index?: number, color: string|null } | null}
+   */
+  getNodeColor(ref) {
+    this._assertReady();
+    const e2 = this._parseEndpoint(ref);
+    if (!e2) return null;
+    if (e2.kind === "node") {
+      const color3 = this._nodeColorOverrides.get(e2.id);
+      if (color3) return { kind: "node", id: e2.id, color: color3 };
+      const cur2 = this._safeNodeStyle(e2.id, {});
+      return { kind: "node", id: e2.id, color: cur2.color || null };
+    }
+    const key = `${e2.boxId}#cust${e2.index}`;
+    const color2 = this._custColorOverrides.get(key);
+    if (color2) return { kind: "customer", id: key, boxId: e2.boxId, index: e2.index, color: color2 };
+    const cur = this._safeNodeStyle(e2.boxId, {});
+    const arr = cur._cellColors;
+    return {
+      kind: "customer",
+      id: key,
+      boxId: e2.boxId,
+      index: e2.index,
+      color: Array.isArray(arr) && arr[e2.index] || null
+    };
+  }
+  // ============================================================
   //  四、边样式
   // ============================================================
-  /** 设置边样式 */
-  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 }]);
@@ -25540,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 = [];
@@ -25605,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)) {
@@ -25623,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;
@@ -25713,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);
@@ -25737,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) {
@@ -25763,12 +26290,270 @@ 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 })
+  //    ref = 节点 id/psrId → 图元光环；assetNo → 该户表位光环
+  //  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,
+          _glowT: void 0
+        }
+      }]);
+    } catch {
+    }
+  }
+  /**
+   * 节点 / 箱内电表户光晕（发光环）动画。
+   * @param {string} ref  节点 id / psrId（图元光环）或资产编号 assetNo（该户表位光环）
+   * @param {object} [opts] - { color, spread/radius, duration, opacity }
+   * @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 cfg = {
+      color: opts.color || "#00C8FF",
+      spread: opts.spread != null ? opts.spread : opts.radius != null ? opts.radius : 14,
+      opacity: opts.opacity != null ? opts.opacity : 0.9,
+      duration: opts.duration || 1600,
+      _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,
+          _glowOpacity: cfg.opacity,
+          _glowDuration: cfg.duration,
+          _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,
+            _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([{
@@ -25782,16 +26567,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 = [];
@@ -25800,6 +26597,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) {
@@ -25829,22 +26638,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) {
@@ -25857,12 +26674,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;
@@ -25872,22 +26714,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);
@@ -25901,21 +26743,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);
     }
   }
   /** 关闭所有卡片 */
@@ -26249,12 +27104,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;
@@ -27901,6 +28761,9 @@ function buildGraphData(model, layout) {
         size: [w, h],
         // 自定义字段（进 attributes，供 svg-symbol 节点绘制使用）
         cat: n.cat,
+        // labelText：节点标签文字（canvasNode 用固定每行 N 字换行绘制）。
+        // 禁用 G6 内置 label（label:false），避免其单行画出长名不换行。
+        label: false,
         labelText: n.cat === "bus" || n.cat === "cableTerminal" || n.cat === "consumer" ? "" : n.shortName || "",
         rotate: layout.stationRotate && layout.stationRotate.get(n.id) || 0,
         highlight: 0,
@@ -28037,21 +28900,56 @@ function setNodePalette(themeName) {
     if (key in C2) C2[key] = t[key];
   }
 }
+function nodeColor(attributes) {
+  return attributes && attributes.color || null;
+}
+function cellColorAt(attributes, i) {
+  const arr = attributes && attributes._cellColors;
+  return Array.isArray(arr) ? arr[i] || null : null;
+}
+function localPalette(attributes) {
+  const c = nodeColor(attributes);
+  if (!c) return C2;
+  return {
+    ...C2,
+    red: c,
+    orange: c,
+    cyan: c,
+    gold: c,
+    trunkLine: c,
+    dotFill: withAlpha(c, 0.18)
+  };
+}
+function withAlpha(color2, a2) {
+  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 r = n >> 16 & 255, g = n >> 8 & 255, b = n & 255;
+  return `rgba(${r},${g},${b},${a2})`;
+}
+const LW = 1.8;
+const LW_HI = 2.2;
 function drawHighlight(attributes, group) {
   if (!attributes.highlight) return;
   const [w, h] = attributes.size;
+  const color2 = attributes.highlightColor || C2.gold;
+  const lw = attributes.highlightWidth || 2;
+  const dash = attributes.highlightDash || [5, 4];
   group.appendChild(
     new Rect({
       style: {
-        x: -w / 2 + 1,
-        y: -h / 2 + 1,
-        width: w - 2,
-        height: h - 2,
-        radius: 4,
+        x: -w / 2 - 3,
+        y: -h / 2 - 3,
+        width: w + 6,
+        height: h + 6,
+        radius: 6,
         fill: "none",
-        stroke: C2.gold,
-        lineWidth: 1.6,
-        lineDash: [4, 3]
+        stroke: color2,
+        lineWidth: lw,
+        lineDash: dash
       }
     })
   );
@@ -28063,15 +28961,16 @@ function drawAnnotation(attributes, group) {
   const pos = attributes.annotationPos || "top";
   const offset = attributes.annotationOffset || 4;
   const y = pos === "top" ? -h / 2 - offset - 6 : h / 2 + offset + 6;
-  _drawWrappedText(group, label, 0, y, attributes.annotationSize || 12, attributes.annotationColor || C2.white, w + 10, 1.25);
+  _drawWrappedText(group, label, 0, y, attributes.annotationSize || 12, attributes.annotationColor || C2.white, w + 10, 1.25, 600);
 }
 function drawLabelUnder(attributes, group) {
   const label = attributes.labelText || "";
   if (!label) return;
   const [w, h] = attributes.size;
-  _drawWrappedText(group, label, 0, h / 2 + 8, 11, C2.white, w + 4, 1.3);
+  const x0 = w / 2 + 6;
+  _drawWrappedTextFixed(group, label, x0, -h / 2, 8, C2.white, 4, 1.3, 500, "left");
 }
-function text(attributes, group, str2, x, y, size, fill) {
+function text(attributes, group, str2, x, y, size, fill, weight = 400) {
   if (!str2) return;
   group.appendChild(
     new Text({
@@ -28081,6 +28980,7 @@ function text(attributes, group, str2, x, y, size, fill) {
         y,
         fontSize: size,
         fill,
+        fontWeight: weight,
         fontFamily: FONT,
         textAlign: "center",
         textBaseline: "middle"
@@ -28111,7 +29011,44 @@ function _wrapLines(str2, fontSize2, maxWidth) {
   if (line) lines.push(line);
   return lines;
 }
-function _drawWrappedText(group, str2, x, y, fontSize2, fill, maxWidth, lineGap = 1.3) {
+function _wrapLinesFixed(str2, chars2) {
+  if (!str2) return [];
+  const lines = [];
+  let line = "";
+  for (const ch of str2) {
+    line += ch;
+    if (line.length >= chars2) {
+      lines.push(line);
+      line = "";
+    }
+  }
+  if (line) lines.push(line);
+  return lines;
+}
+function _drawWrappedTextFixed(group, str2, x, y, fontSize2, fill, chars2, lineGap = 1.3, weight = 400, align = "center") {
+  if (!str2) return;
+  const lines = _wrapLinesFixed(str2, chars2);
+  if (!lines.length) return;
+  const lineHeight2 = fontSize2 * lineGap;
+  for (let i = 0; i < lines.length; i++) {
+    group.appendChild(
+      new Text({
+        style: {
+          text: lines[i],
+          x,
+          y: y + lineHeight2 * i,
+          fontSize: fontSize2,
+          fill,
+          fontWeight: weight,
+          fontFamily: FONT,
+          textAlign: align === "left" ? "left" : "center",
+          textBaseline: "middle"
+        }
+      })
+    );
+  }
+}
+function _drawWrappedText(group, str2, x, y, fontSize2, fill, maxWidth, lineGap = 1.3, weight = 400) {
   if (!str2) return;
   const lines = _wrapLines(str2, fontSize2, maxWidth);
   if (!lines.length) return;
@@ -28126,6 +29063,7 @@ function _drawWrappedText(group, str2, x, y, fontSize2, fill, maxWidth, lineGap
           y: y - totalH / 2 + lineHeight2 * (i + 0.5),
           fontSize: fontSize2,
           fill,
+          fontWeight: weight,
           fontFamily: FONT,
           textAlign: "center",
           textBaseline: "middle"
@@ -28135,77 +29073,172 @@ function _drawWrappedText(group, str2, x, y, fontSize2, fill, maxWidth, lineGap
   }
 }
 function drawTransformer(attributes, group) {
-  const lw = 1.4;
-  group.appendChild(new Line({ style: { x1: -24, y1: 0, x2: -15, y2: 0, stroke: C2.trunkLine, lineWidth: lw } }));
-  group.appendChild(new Circle({ style: { cx: -5, cy: 0, r: 10, fill: C2.orange, stroke: C2.trunkLine, lineWidth: 1.2 } }));
-  group.appendChild(new Circle({ style: { cx: 10, cy: 0, r: 10, fill: "none", stroke: C2.red, lineWidth: 1.2 } }));
-  group.appendChild(new Line({ style: { x1: 20, y1: 0, x2: 29, y2: 0, stroke: C2.red, lineWidth: lw } }));
+  const P = localPalette(attributes);
+  const lw = LW;
+  group.appendChild(new Line({ style: { x1: -26, y1: 0, x2: -14, y2: 0, stroke: P.trunkLine, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Circle({ style: { cx: -4.5, cy: 0, r: 10, fill: P.orange, stroke: P.trunkLine, lineWidth: 1.4 } }));
+  group.appendChild(new Circle({ style: { cx: -7.2, cy: -3.2, r: 3.2, fill: withAlpha(C2.white, 0.25), stroke: "none" } }));
+  group.appendChild(new Circle({ style: { cx: 10, cy: 0, r: 10, fill: withAlpha(P.red, 0.06), stroke: P.red, lineWidth: LW_HI } }));
+  group.appendChild(new Line({ style: { x1: 20, y1: 0, x2: 30, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
 }
 function drawFuse(attributes, group) {
-  const lw = 1.4;
-  group.appendChild(new Line({ style: { x1: -26, y1: 0, x2: -19, y2: 0, stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Rect({ style: { x: -19, y: -7, width: 38, height: 14, radius: 1, fill: "none", stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Circle({ style: { cx: -13, cy: 0, r: 3.6, fill: C2.red } }));
-  group.appendChild(new Rect({ style: { x: -8, y: -2.4, width: 5, height: 4.8, fill: C2.red } }));
-  group.appendChild(new Rect({ style: { x: -1, y: -5.4, width: 13, height: 10.8, fill: C2.red } }));
-  group.appendChild(new Line({ style: { x1: 19, y1: 0, x2: 26, y2: 0, stroke: C2.red, lineWidth: lw } }));
+  const P = localPalette(attributes);
+  const lw = LW;
+  group.appendChild(new Line({ style: { x1: -28, y1: 0, x2: -19, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Line({ style: { x1: 19, y1: 0, x2: 28, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Rect({ style: { x: -19, y: -7.5, width: 38, height: 15, radius: 2, fill: withAlpha(P.red, 0.05), stroke: P.red, lineWidth: lw } }));
+  group.appendChild(new Circle({ style: { cx: -13, cy: 0, r: 3.4, fill: P.red, stroke: "none" } }));
+  group.appendChild(new Rect({ style: { x: -8.2, y: -2.4, width: 5, height: 4.8, radius: 0.6, fill: P.red } }));
+  group.appendChild(new Rect({ style: { x: -1.4, y: -5.4, width: 13, height: 10.8, radius: 0.8, fill: P.red } }));
+  group.appendChild(new Rect({ style: { x: 5, y: -1.2, width: 8, height: 2.4, fill: C2.white, opacity: 0.55 } }));
 }
 function drawBreaker(attributes, group) {
-  const lw = 1.4;
-  group.appendChild(new Line({ style: { x1: -28, y1: 0, x2: -21, y2: 0, stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Rect({ style: { x: -21, y: -9, width: 42, height: 18, radius: 2, fill: "none", stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Rect({ style: { x: -21, y: -9, width: 42, height: 7, fill: "rgba(255,0,0,0.25)" } }));
-  _drawWrappedText(group, attributes.labelText, 0, 0.5, 10, C2.white, 36, 1.2);
-  group.appendChild(new Line({ style: { x1: 21, y1: 0, x2: 28, y2: 0, stroke: C2.red, lineWidth: lw } }));
+  const P = localPalette(attributes);
+  const lw = LW;
+  const [nw] = attributes.size;
+  const bw = 42;
+  const bh = 20, r = 4;
+  const bx = -bw / 2, by = -bh / 2;
+  const xEdge = (nw || 60) / 2;
+  const xBox = bw / 2;
+  if (xEdge > xBox) {
+    group.appendChild(new Line({ style: { x1: -xEdge, y1: 0, x2: -xBox, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+    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) {
+    _drawWrappedText(group, attributes.labelText, 0, 0.6, 11.5, "#FFFFFF", bw - 8, 1.15, 700);
+  }
 }
 function drawCableTerminal(attributes, group) {
-  group.appendChild(new Polygon({ style: { points: [[1, -8], [-7, 8], [9, 8]], fill: C2.red, stroke: C2.red, lineWidth: 1 } }));
+  const P = localPalette(attributes);
+  const lw = 1.6;
+  group.appendChild(new Line({ style: { x1: -11, y1: 0, x2: -5.5, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Polygon({
+    style: {
+      points: [[-5, -9.5], [11, 0], [-5, 9.5]],
+      fill: P.red,
+      stroke: withAlpha(C2.white, 0.3),
+      lineWidth: 1
+    }
+  }));
 }
 function drawStationTerminal(attributes, group) {
-  group.appendChild(new Line({ style: { x1: -9, y1: 0, x2: -1, y2: 0, stroke: C2.red, lineWidth: 1.4 } }));
-  group.appendChild(new Polygon({ style: { points: [[0, -5], [0, 5], [9, 0]], fill: "none", stroke: C2.red, lineWidth: 1.4 } }));
+  const P = localPalette(attributes);
+  const lw = LW;
+  group.appendChild(new Line({ style: { x1: -12, y1: 0, x2: -4, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Polygon({
+    style: {
+      points: [[0, -6], [0, 6], [10, 0]],
+      fill: withAlpha(P.red, 0.08),
+      stroke: P.red,
+      lineWidth: lw
+    }
+  }));
+}
+function drawMeterFace(group, cx, cy, meterW, meterH, lineColor, markCell, cellIdx) {
+  const r = Math.max(2, meterW * 0.16);
+  const body = new Rect({ style: { x: cx - meterW / 2, y: cy - meterH / 2, width: meterW, height: meterH, radius: r, fill: withAlpha(lineColor, 0.06), stroke: lineColor, lineWidth: 1.2, cursor: "pointer" } });
+  if (markCell) markCell(body, cellIdx);
+  group.appendChild(body);
+  const winW = meterW * 0.66, winH = Math.max(2.4, meterH * 0.17);
+  const win = new Rect({ style: { x: cx - winW / 2, y: cy - meterH * 0.31, width: winW, height: winH, radius: winH / 2, fill: lineColor, opacity: 0.5, stroke: "none" } });
+  if (markCell) markCell(win, cellIdx);
+  group.appendChild(win);
+  const dot2 = new Circle({ style: { cx, cy: cy + meterH * 0.12, r: 1.6, fill: lineColor, opacity: 0.85, stroke: "none" } });
+  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) {
+  const color2 = g.color || "#00C8FF";
+  const spread = g.spread || 10;
+  const maxOp = g.opacity == null ? 0.8 : g.opacity;
+  const ease2 = 1 - (1 - t) * (1 - t);
+  const alpha = maxOp * Math.pow(1 - t, 1.4);
+  if (alpha <= 0.02) return;
+  const r = baseR + spread * ease2;
+  const lw = Math.max(1, 3.2 * (1 - t) + 0.6);
+  group.appendChild(new Circle({ style: { cx, cy, r, stroke: color2, lineWidth: lw, strokeOpacity: alpha, fill: "none", lineCap: "round" } }));
+  group.appendChild(new Circle({ style: { cx, cy, r: r + spread * 0.6, stroke: color2, lineWidth: Math.max(0.6, lw * 0.55), strokeOpacity: alpha * 0.35, fill: "none", lineCap: "round" } }));
+}
+function drawCellHighlight(group, cx, cy, baseR, hl) {
+  group.appendChild(new Circle({
+    style: {
+      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");
 }
 function drawMeterBox(attributes, group) {
   const [w, h] = attributes.size;
+  const boxColor = nodeColor(attributes);
   if (attributes._meterBoxMode === "single") {
     const nodeId = attributes._nodeId || "";
     const sel = attributes._custSel === 0;
     const hover = attributes._custHover === 0;
-    const lineColor = sel ? C2.gold : hover ? C2.cyan : C2.white;
+    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;
       shape.__custIndex = 0;
     };
+    const meterW = 20;
+    const meterH = 26;
+    const cx = 0;
+    const cy = -1;
     if (sel || hover) {
-      const ring = new Circle({
+      const ring = new Rect({
         style: {
-          cx: 0,
-          cy: -3,
-          r: 13,
-          fill: sel ? C2.gold : C2.cyan,
-          fillOpacity: sel ? 0.3 : 0.18,
+          x: cx - meterW / 2 - 4,
+          y: cy - meterH / 2 - 4,
+          width: meterW + 8,
+          height: meterH + 8,
+          radius: 5,
+          fill: "none",
           stroke: sel ? C2.gold : C2.cyan,
-          lineWidth: sel ? 1.6 : 1.1
+          lineWidth: sel ? 2 : 1.3
         }
       });
       markCell(ring);
-      group.appendChild(ring);
-    }
-    const meterCircle = new Circle({ style: { cx: 0, cy: -3, r: 11, fill: "none", stroke: lineColor, lineWidth: sel ? 1.8 : 1.6, cursor: "pointer" } });
-    markCell(meterCircle);
-    group.appendChild(meterCircle);
-    const stub = new Line({ style: { x1: 0, y1: -14, x2: 0, y2: -7, stroke: lineColor, lineWidth: 1.6, cursor: "pointer" } });
-    markCell(stub);
-    group.appendChild(stub);
+      cellGroup.appendChild(ring);
+    }
+    drawMeterFace(cellGroup, cx, cy, meterW, meterH, lineColor, markCell, 0);
+    if (fx) {
+      const baseR = Math.max(12, meterH / 2 + 2);
+      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) {
-      const nameText = new Text({ style: { text: name, x: 0, y: 12, fontSize: 8, fill: sel ? C2.gold : hover ? C2.cyan : C2.white, fontFamily: FONT, textAlign: "center", textBaseline: "middle", cursor: "pointer" } });
-      markCell(nameText);
-      group.appendChild(nameText);
+      _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;
     }
+    group.appendChild(cellGroup);
   } else if (attributes._meterBoxMode === "grid" && attributes._customers) {
-    group.appendChild(new Rect({ style: { x: -w / 2, y: -h / 2, width: w, height: h, fill: C2.meterFill, stroke: C2.meterText, lineWidth: 0.9, radius: 2 } }));
+    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 } }));
     const cols = attributes._meterBoxCols || 5;
     const customers = attributes._customers;
     const showName = attributes._meterBoxShowName;
@@ -28216,11 +29249,12 @@ function drawMeterBox(attributes, group) {
     const gridH = rows * cellH + (rows - 1) * METER_GAP;
     const startX = -gridW / 2;
     const startY = -gridH / 2;
-    const meterR = 9;
+    const meterW = Math.min(13, cellW * 0.5);
+    const meterH = meterW * 1.5;
+    const hitR = Math.max(9, meterH * 0.4);
     const custSel = attributes._custSel == null ? -1 : attributes._custSel;
     const custHover = attributes._custHover == null ? -1 : attributes._custHover;
     const nodeId = attributes._nodeId || "";
-    const hitR = meterR + 2.5;
     const markCell = (shape, i) => {
       if (!nodeId) return;
       shape.__custBox = nodeId;
@@ -28233,9 +29267,12 @@ function drawMeterBox(attributes, group) {
       const cy = startY + row2 * (cellH + METER_GAP) + cellW / 2;
       const sel = i === custSel;
       const hover = i === custHover;
-      const lineColor = sel ? C2.gold : hover ? C2.cyan : C2.meterText;
+      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 (sel || hover) {
-        group.appendChild(new Circle({
+        cellGroup.appendChild(new Circle({
           style: {
             cx,
             cy,
@@ -28243,49 +29280,83 @@ function drawMeterBox(attributes, group) {
             fill: sel ? C2.gold : C2.cyan,
             fillOpacity: sel ? 0.3 : 0.18,
             stroke: sel ? C2.gold : C2.cyan,
-            lineWidth: sel ? 1.6 : 1.1
+            lineWidth: sel ? 1.7 : 1.1
           }
         }));
       }
-      group.appendChild(new Circle({ style: { cx, cy, r: meterR, fill: "none", stroke: lineColor, lineWidth: sel ? 1.2 : 0.8 } }));
-      group.appendChild(new Line({ style: { x1: cx, y1: cy - meterR, x2: cx, y2: cy - meterR + 4, stroke: lineColor, lineWidth: 0.8 } }));
+      drawMeterFace(cellGroup, cx, cy, meterW, meterH, lineColor, markCell, i);
+      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 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);
+      cellGroup.appendChild(hit);
       if (showName) {
         const name = customers[i].realConsName || customers[i].consName || "";
         if (name) {
-          const nameText = new Text({ style: { text: name, x: cx, y: cy + meterR + 6, fontSize: 7, fill: sel ? C2.gold : hover ? C2.cyan : C2.meterText, fontFamily: FONT, textAlign: "center", textBaseline: "middle", cursor: "pointer" } });
-          markCell(nameText, i);
-          group.appendChild(nameText);
+          const hitName = new Circle({
+            style: {
+              cx,
+              cy: cy + meterH / 2 + 6.5 + 4,
+              r: Math.max(8, Math.min(14, Math.ceil(name.length / 4) * 4 + 4)),
+              fill: "rgba(255,255,255,0.01)",
+              stroke: "none",
+              cursor: "pointer"
+            }
+          });
+          markCell(hitName, i);
+          cellGroup.appendChild(hitName);
         }
       }
+      if (fx && fx.pulse && fx.pulse.opacity != null && fx.pulse.opacity < 1) {
+        cellGroup.style.opacity = fx.pulse.opacity;
+      }
+      group.appendChild(cellGroup);
     }
   } else {
-    group.appendChild(new Rect({ style: { x: -9.5, y: -9.5, width: 19, height: 19, fill: C2.meterFill, stroke: C2.meterText, lineWidth: 0.9 } }));
-    text(attributes, group, "JX", 0, 0.5, 7.5, C2.meterText);
+    const s2 = Math.min(w, h) || 21;
+    const ink = boxColor || C2.meterText;
+    group.appendChild(new Rect({ style: { x: -s2 / 2, y: -s2 / 2, width: s2, height: s2, radius: Math.max(2, s2 * 0.16), fill: C2.meterFill, stroke: ink, lineWidth: 1.4 } }));
+    group.appendChild(new Rect({ style: { x: -s2 / 2 + 2, y: -s2 / 2 + 2, width: s2 - 4, height: 2, radius: 1, fill: withAlpha(ink, 0.35), stroke: "none" } }));
+    text(attributes, group, "JX", 0, s2 * 0.06, Math.max(8, s2 * 0.4), ink, 700);
   }
 }
 function drawConsumer(attributes, group) {
-  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 12.5, fill: "none", stroke: C2.white, lineWidth: 1.8 } }));
-  text(attributes, group, "J", 0, 0.5, 13, C2.white);
+  const ink = nodeColor(attributes) || C2.white;
+  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 13, fill: "none", stroke: ink, lineWidth: LW_HI } }));
+  text(attributes, group, "J", 0, 0.8, 14.5, ink, 700);
 }
 function drawBus(attributes, group) {
   const [w] = attributes.size;
-  group.appendChild(new Rect({ style: { x: -w / 2, y: -3, width: w, height: 6, radius: 2, fill: C2.busFill, stroke: C2.white, lineWidth: 1.4 } }));
+  const ink = nodeColor(attributes) || C2.white;
+  const hh = Math.max(4.5, Math.min(6, w / 10));
+  group.appendChild(new Rect({ style: { x: -w / 2, y: -hh / 2, width: w, height: hh, radius: hh / 2, fill: withAlpha(ink, 0.5), stroke: ink, lineWidth: 1.2 } }));
+  group.appendChild(new Rect({ style: { x: -w / 2 + 1, y: -0.7, width: w - 2, height: 1.4, fill: withAlpha(C2.canvasBg || "#000", 0.18), stroke: "none" } }));
 }
 function drawLineDot(attributes, group) {
-  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 4, fill: C2.dotFill, stroke: C2.cyan, lineWidth: 1.4 } }));
+  const P = localPalette(attributes);
+  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 4.6, fill: P.dotFill, stroke: P.cyan, lineWidth: 1.6 } }));
+  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 1.5, fill: P.cyan, stroke: "none" } }));
 }
 function drawJunction(attributes, group) {
-  const lw = 1.4;
-  group.appendChild(new Line({ style: { x1: -5, y1: 0, x2: 5, y2: 0, stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Line({ style: { x1: 0, y1: -5, x2: 0, y2: 5, stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Line({ style: { x1: -3.5, y1: -3.5, x2: 3.5, y2: 3.5, stroke: C2.red, lineWidth: lw } }));
-  group.appendChild(new Line({ style: { x1: 3.5, y1: -3.5, x2: -3.5, y2: 3.5, stroke: C2.red, lineWidth: lw } }));
+  const P = localPalette(attributes);
+  const lw = LW;
+  group.appendChild(new Line({ style: { x1: -5.5, y1: 0, x2: 5.5, y2: 0, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Line({ style: { x1: 0, y1: -5.5, x2: 0, y2: 5.5, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Line({ style: { x1: -3.9, y1: -3.9, x2: 3.9, y2: 3.9, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
+  group.appendChild(new Line({ style: { x1: 3.9, y1: -3.9, x2: -3.9, y2: 3.9, stroke: P.red, lineWidth: lw, lineCap: "round" } }));
 }
 function drawUnknown(attributes, group) {
-  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 8, fill: C2.unknownFill, stroke: C2.unknownStroke, lineWidth: 1.2 } }));
+  group.appendChild(new Circle({ style: { cx: 0, cy: 0, r: 9, fill: C2.unknownFill, stroke: C2.unknownStroke, lineWidth: 1.4 } }));
+  text(attributes, group, "?", 0, 0.8, 13, C2.unknownStroke, 700);
 }
 function drawStation(attributes, group) {
   const [w, h] = attributes.size;
@@ -28296,16 +29367,30 @@ function drawStation(attributes, group) {
         y: -h / 2,
         width: w,
         height: h,
-        radius: 2,
+        radius: 5,
         fill: C2.stationFill,
         stroke: C2.white,
-        lineWidth: 1.2,
+        lineWidth: 1.5,
+        opacity: 0.95
+      }
+    })
+  );
+  group.appendChild(
+    new Rect({
+      style: {
+        x: -w / 2 + 2,
+        y: -h / 2 + 2,
+        width: w - 4,
+        height: 2.4,
+        radius: 1.2,
+        fill: withAlpha(C2.white, 0.28),
+        stroke: "none",
         opacity: 0.9
       }
     })
   );
   if (attributes._stationTitle) {
-    _drawWrappedText(group, attributes._stationTitle, 0, -h / 2 + 13, 11, C2.stationText, w - 12, 1.35);
+    _drawWrappedText(group, attributes._stationTitle, 0, -h / 2 + 15, 12, C2.stationText, w - 12, 1.35, 600);
   }
 }
 const DRAWERS = {
@@ -28322,8 +29407,36 @@ const DRAWERS = {
   station: drawStation,
   other: drawUnknown
 };
-const LABEL_UNDER = /* @__PURE__ */ new Set(["transformer", "fuse"]);
 const _pulseState = /* @__PURE__ */ new Map();
+function drawGlow(attributes, group) {
+  const color2 = attributes._glowColor;
+  if (!color2) return;
+  const t = attributes._glowT == null ? 0 : attributes._glowT;
+  const [w, h] = attributes.size || [40, 40];
+  const baseR = Math.max(w, h) / 2 + 3;
+  const spread = attributes._glowSpread || 14;
+  const maxOp = attributes._glowOpacity == null ? 0.9 : attributes._glowOpacity;
+  const ease2 = 1 - (1 - t) * (1 - t);
+  const alpha = maxOp * Math.pow(1 - t, 1.4);
+  if (alpha <= 0.02) return;
+  const r = baseR + spread * ease2;
+  const lw = Math.max(1.2, 4.4 * (1 - t) + 0.8);
+  group.appendChild(new Circle({
+    style: { cx: 0, cy: 0, r, stroke: color2, lineWidth: lw, strokeOpacity: alpha, fill: "none", lineCap: "round" }
+  }));
+  group.appendChild(new Circle({
+    style: {
+      cx: 0,
+      cy: 0,
+      r: r + spread * 0.6,
+      stroke: color2,
+      lineWidth: Math.max(0.8, lw * 0.55),
+      strokeOpacity: alpha * 0.35,
+      fill: "none",
+      lineCap: "round"
+    }
+  }));
+}
 class SvgSymbolNode extends g6.BaseNode {
   drawKeyShape(attributes, container) {
     const [w, h] = attributes.size;
@@ -28354,9 +29467,12 @@ class SvgSymbolNode extends g6.BaseNode {
     if (rot) key.appendChild(target);
     const draw = DRAWERS[attributes.cat] || drawUnknown;
     draw(attributes, target);
+    drawGlow(attributes, target);
     drawHighlight(attributes, target);
     drawAnnotation(attributes, target);
-    if (LABEL_UNDER.has(attributes.cat)) drawLabelUnder(attributes, target);
+    if (attributes.labelText && !attributes._stationTitle && attributes.cat !== "bus" && attributes.cat !== "cableTerminal" && attributes.cat !== "consumer" && attributes.cat !== "switch" && attributes.cat !== "meterBox") {
+      drawLabelUnder(attributes, target);
+    }
     const pulse = _pulseState.get(attributes._nodeId || "");
     if (pulse) {
       const items = rot ? [target] : key.children || [];
@@ -28543,6 +29659,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);
@@ -28855,9 +29997,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,
@@ -28896,7 +30038,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-d3774ed5"]]);
 const _hoisted_1$1 = ["data-theme"];
 const _hoisted_2$1 = { class: "panel-head" };
 const _hoisted_3$1 = {
@@ -29269,7 +30411,7 @@ const _sfc_main = {
   }
 };
 const DistanceTop10 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-438b6017"]]);
-const VERSION = "0.1.7";
+const VERSION = "0.1.9";
 const DESCRIPTION = "配电台区单线图拓扑成图引擎";
 exports.DESCRIPTION = DESCRIPTION;
 exports.DistanceTop10 = DistanceTop10;