kd-lane-chart-v3 0.1.7 → 0.1.8

package/dist/esm/index.js

@@ -2659,7 +2659,7 @@ function findLogTrendSeries(chart, paramId) {
       const type = sm && sm.subType || (Array.isArray(opt.type) ? opt.type[0] : opt.type);
       if (type !== "line") continue;
       const name = Array.isArray(sm.name) ? sm.name[0] : sm.name;
-      if (name === "helper" || name === "log-grid") continue;
+      if (name === "helper" || name === "log-grid" || name === "trend") continue;
       const pid = Array.isArray(opt.paramId) ? opt.paramId[0] : opt.paramId;
       if (String(pid) === String(paramId)) return opt;
     }
@@ -2718,6 +2718,17 @@ function logTrendDataToPixel(chart, paramId, lg, depth) {
   const series = findLogTrendSeries(chart, paramId);
   const xAxisIndex = series ? axisIndexOf$1(series.xAxisIndex) : 0;
   const yAxisIndex = series ? axisIndexOf$1(series.yAxisIndex) : 0;
+  try {
+    const model = chart.getModel();
+    const xAxis = model.getComponent("xAxis", xAxisIndex) && model.getComponent("xAxis", xAxisIndex).axis;
+    const yAxis = model.getComponent("yAxis", yAxisIndex) && model.getComponent("yAxis", yAxisIndex).axis;
+    if (xAxis && yAxis) {
+      const x = xAxis.toGlobalCoord(xAxis.dataToCoord(lg, true));
+      const y = yAxis.toGlobalCoord(yAxis.dataToCoord(depth, true));
+      if (Number.isFinite(x) && Number.isFinite(y)) return [x, y];
+    }
+  } catch (e) {
+  }
   try {
     const px = chart.convertToPixel({ xAxisIndex, yAxisIndex }, [lg, depth]);
     if (px && Number.isFinite(px[0]) && Number.isFinite(px[1])) return px;
@@ -3344,7 +3355,6 @@ const TREND_MIRROR_POINT_STYLE = {
   lineWidth: 1
 };
 const TREND_LINE_Z = 9999;
-const TREND_POINT_Z = 99999;
 const DEPTH_EDGE_SNAP = 0.2;
 const TREND_CLICK_DELAY_MS = 240;
 const TREND_HIT_RADIUS = 14;
@@ -3699,7 +3709,7 @@ function listLineSeries(model) {
       const type = sm && sm.subType || seriesTypeName(opt);
       if (type !== "line") continue;
       const name = optionScalar(sm && sm.name) || seriesDisplayName(opt);
-      if (name === "helper" || name === "log-grid") continue;
+      if (name === "helper" || name === "log-grid" || name === "trend") continue;
       out.push({
         seriesIndex: sm.seriesIndex,
         xAxisIndex: axisIndexOf(opt.xAxisIndex),
@@ -3738,20 +3748,27 @@ function findSeriesForDepth(chart, paramId, depth) {
 function eventOffsetInChart(chart, evt) {
   var _a, _b;
   const zr = chart.getZr();
-  const rect = (_b = (_a = chart.getDom()) == null ? void 0 : _a.getBoundingClientRect) == null ? void 0 : _b.call(_a);
-  let offsetX = 0;
-  let offsetY = 0;
+  const clamp = (x, y) => ({
+    offsetX: Math.max(0, Math.min(x, zr.getWidth())),
+    offsetY: Math.max(0, Math.min(y, zr.getHeight()))
+  });
+  if (evt && evt.event && Number.isFinite(evt.offsetX) && Number.isFinite(evt.offsetY)) {
+    return clamp(evt.offsetX, evt.offsetY);
+  }
   const native = (evt == null ? void 0 : evt.event) || evt;
+  let el = null;
+  try {
+    el = zr.painter && zr.painter.getViewportRoot && zr.painter.getViewportRoot();
+  } catch (e) {
+  }
+  const rect = (_b = (_a = el || chart.getDom()) == null ? void 0 : _a.getBoundingClientRect) == null ? void 0 : _b.call(_a);
   if (rect && Number.isFinite(native == null ? void 0 : native.clientX) && Number.isFinite(native == null ? void 0 : native.clientY)) {
-    offsetX = native.clientX - rect.left;
-    offsetY = native.clientY - rect.top;
-  } else if (Number.isFinite(evt == null ? void 0 : evt.offsetX) && Number.isFinite(evt == null ? void 0 : evt.offsetY)) {
-    offsetX = evt.offsetX;
-    offsetY = evt.offsetY;
+    return clamp(native.clientX - rect.left, native.clientY - rect.top);
   }
-  offsetX = Math.max(0, Math.min(offsetX, zr.getWidth()));
-  offsetY = Math.max(0, Math.min(offsetY, zr.getHeight()));
-  return { offsetX, offsetY };
+  if (Number.isFinite(evt == null ? void 0 : evt.offsetX) && Number.isFinite(evt == null ? void 0 : evt.offsetY)) {
+    return clamp(evt.offsetX, evt.offsetY);
+  }
+  return clamp(0, 0);
 }
 function isPointerInAnyGrid(chart, offsetX, offsetY) {
   const gridCount = modelGridCount(chartModel(chart));
@@ -3819,8 +3836,48 @@ function pixelToData(chart, paramId, offsetX, offsetY, loose = false) {
   }
   return null;
 }
+function axisPairToPixel(chart, xAxisIndex, yAxisIndex, value, depth) {
+  try {
+    const model = chartModel(chart);
+    if (!model) return null;
+    const xComp = model.getComponent("xAxis", xAxisIndex || 0);
+    const yComp = model.getComponent("yAxis", yAxisIndex || 0);
+    const xAxis = xComp && xComp.axis;
+    const yAxis = yComp && yComp.axis;
+    if (!xAxis || !yAxis) return null;
+    const x = xAxis.toGlobalCoord(xAxis.dataToCoord(value, true));
+    const y = yAxis.toGlobalCoord(yAxis.dataToCoord(depth, true));
+    if (Number.isFinite(x) && Number.isFinite(y)) return [x, y];
+  } catch (e) {
+  }
+  return null;
+}
+function axisPairFromPixel(chart, xAxisIndex, yAxisIndex, offsetX, offsetY) {
+  try {
+    const model = chartModel(chart);
+    if (!model) return null;
+    const xComp = model.getComponent("xAxis", xAxisIndex || 0);
+    const yComp = model.getComponent("yAxis", yAxisIndex || 0);
+    const xAxis = xComp && xComp.axis;
+    const yAxis = yComp && yComp.axis;
+    if (!xAxis || !yAxis) return null;
+    const value = xAxis.coordToData(xAxis.toLocalCoord(offsetX), true);
+    const depth = yAxis.coordToData(yAxis.toLocalCoord(offsetY), true);
+    if (!Number.isFinite(value) || !Number.isFinite(depth)) return null;
+    return {
+      value,
+      depth,
+      xAxisIndex: xAxisIndex || 0,
+      yAxisIndex: yAxisIndex || 0
+    };
+  } catch (e) {
+    return null;
+  }
+}
 function dataToPixel(chart, paramId, value, depth) {
   const finder = findSeriesForDepth(chart, paramId, depth);
+  const live = axisPairToPixel(chart, finder.xAxisIndex, finder.yAxisIndex, value, depth);
+  if (live) return live;
   const finders = [
     { xAxisIndex: finder.xAxisIndex, yAxisIndex: finder.yAxisIndex },
     { seriesIndex: finder.seriesIndex },
@@ -3871,49 +3928,62 @@ class TrendLineManager {
     this.dragSession = null;
     this._panLockedByHover = false;
     this._raf = null;
-    this._zoomRaf = null;
-    this._zoomPending = false;
-    this._zoomEndTimer = null;
-    this._graphicIds = /* @__PURE__ */ Object.create(null);
-    this._zrElCache = /* @__PURE__ */ new WeakMap();
+    this._seriesIds = /* @__PURE__ */ Object.create(null);
+    this._graphicCleared = /* @__PURE__ */ new WeakSet();
     this._ignoreClickUntil = 0;
+    this._destroyed = false;
   }
   destroy() {
+    this._destroyed = true;
     this._clearClickTimer();
-    this._endDrag();
-    Array.from(this.binds.keys()).forEach((laneId) => this.unbindChart(laneId));
+    try {
+      this._unbindDragWindow();
+    } catch (e) {
+    }
+    this._panLockedByHover = false;
+    Array.from(this.binds.keys()).forEach((laneId) => {
+      try {
+        this.unbindChart(laneId);
+      } catch (e) {
+      }
+    });
     if (this._raf) {
       cancelAnimationFrame(this._raf);
       this._raf = null;
     }
-    if (this._zoomRaf) {
-      cancelAnimationFrame(this._zoomRaf);
-      this._zoomRaf = null;
-    }
-    if (this._zoomEndTimer) {
-      clearTimeout(this._zoomEndTimer);
-      this._zoomEndTimer = null;
-    }
     this.store = /* @__PURE__ */ Object.create(null);
-    this._graphicIds = /* @__PURE__ */ Object.create(null);
+    this._seriesIds = /* @__PURE__ */ Object.create(null);
+    this.binds.clear();
+    this.host = null;
+  }
+  _alive() {
+    return !this._destroyed && !!this.host;
   }
   /** 从模板 line.trendSegments 回显；已有 store 的曲线不覆盖，避免编辑中被模板刷新冲掉。8.21 */
   hydrateFromTemplate(template) {
+    if (!this._alive()) return;
+    const hasEcho = Array.isArray(this.host.lineListData) && this.host.lineListData.length;
     const lanes = template && template.lanes || [];
+    const alive = /* @__PURE__ */ new Set();
     lanes.forEach((lane) => {
       (lane.lines || []).forEach((line) => {
         if (!lane.laneId || !line.paramId) return;
         const key = makeTrendKey(lane.laneId, line.paramId);
+        alive.add(key);
         if (this.store[key]) return;
-        if (line.trendSegments && line.trendSegments.length) {
-          this.store[key] = { segments: this._prepareEchoSegments(line.paramId, line.trendSegments) };
-        } else {
+        if (!hasEcho || !line.trendSegments || !line.trendSegments.length) {
           this.store[key] = { segments: [] };
+          return;
         }
+        this.store[key] = { segments: this._prepareEchoSegments(line.paramId, line.trendSegments) };
       });
     });
+    Object.keys(this.store).forEach((key) => {
+      if (!alive.has(key)) delete this.store[key];
+    });
   }
   getChart(laneId) {
+    if (!this._alive()) return null;
     const ref = this.host.getChartRefByLaneId(laneId);
     const chart = ref && ref.chart;
     if (!chart || chart.isDisposed()) return null;
@@ -3921,6 +3991,7 @@ class TrendLineManager {
   }
   /** isDraw 可编辑，或已有控制点（只读回显）的曲线。8.21 */
   listDrawableTargets() {
+    if (!this._alive()) return [];
     const lanes = this.host.currentTemplate && this.host.currentTemplate.lanes || [];
     const list = [];
     lanes.forEach((lane) => {
@@ -3982,45 +4053,62 @@ class TrendLineManager {
   /** 捕获阶段监听 mousedown，保证拖控制点比图表其它逻辑先拿到。8.21 */
   bindChart(laneId, chart) {
     this.unbindChart(laneId);
-    if (!chart || chart.isDisposed()) return;
-    const onMouseDown = (e) => this.onMouseDown(e, laneId);
+    if (!this._alive() || !chart || chart.isDisposed()) return;
     const onZrDown = (e) => this.onZrMouseDown(e, laneId);
     const onZrMove = (e) => this.onZrHover(e, laneId);
     const onDblClick = (e) => this.handleDblClick(e, laneId);
-    const dom = chart.getDom();
-    if (dom) dom.addEventListener("mousedown", onMouseDown, true);
     const zr = chart.getZr();
     zr.on("mousedown", onZrDown);
     zr.on("mousemove", onZrMove);
     zr.on("dblclick", onDblClick);
     const onZoom = () => {
+      if (this.host && this.host._isPanning) return;
       if (this.host && typeof this.host.startChartZoom === "function") {
         this.host.startChartZoom();
       }
-      this.scheduleZoomRender();
     };
     if (typeof chart.on === "function") chart.on("datazoom", onZoom);
-    this.binds.set(laneId, { chart, onMouseDown, onZrDown, onZrMove, onDblClick, onZoom, dom });
+    this.binds.set(laneId, { chart, onZrDown, onZrMove, onDblClick, onZoom, dom: chart.getDom() });
     this.updateCursor(laneId);
   }
   unbindChart(laneId) {
     const bind = this.binds.get(laneId);
     if (!bind) return;
+    const session = this.dragSession;
+    if (session && (session.chart === bind.chart || session.target && session.target.laneId === laneId)) {
+      this._unbindDragWindow();
+    }
     if (bind.dom && bind.onMouseDown) {
       bind.dom.removeEventListener("mousedown", bind.onMouseDown, true);
     }
     if (bind.dom && bind.onZoom) {
       bind.dom.removeEventListener("wheel", bind.onZoom);
     }
-    if (bind.chart && !bind.chart.isDisposed()) {
-      const zr = bind.chart.getZr();
-      if (bind.onZrDown) zr.off("mousedown", bind.onZrDown);
-      if (bind.onZrMove) zr.off("mousemove", bind.onZrMove);
-      if (bind.onDblClick) zr.off("dblclick", bind.onDblClick);
-      if (bind.onZoom) {
-        zr.off("mousewheel", bind.onZoom);
-        if (typeof bind.chart.off === "function") bind.chart.off("datazoom", bind.onZoom);
+    const chart = bind.chart;
+    try {
+      if (chart && typeof chart.getZr === "function") {
+        const zr = chart.getZr();
+        if (zr) {
+          if (bind.onZrDown) zr.off("mousedown", bind.onZrDown);
+          if (bind.onZrMove) zr.off("mousemove", bind.onZrMove);
+          if (bind.onDblClick) zr.off("dblclick", bind.onDblClick);
+          if (bind.onZoom) zr.off("mousewheel", bind.onZoom);
+        }
+      }
+      if (chart && bind.onZoom && typeof chart.off === "function") {
+        chart.off("datazoom", bind.onZoom);
       }
+    } catch (e) {
+    }
+    delete this._seriesIds[laneId];
+    if (bind) {
+      bind.chart = null;
+      bind.dom = null;
+      bind.onZrDown = null;
+      bind.onZrMove = null;
+      bind.onDblClick = null;
+      bind.onZoom = null;
+      bind.onMouseDown = null;
     }
     this.binds.delete(laneId);
   }
@@ -4041,10 +4129,11 @@ class TrendLineManager {
   /** 图表重绘后对齐叠加层；拖拽中跳过，避免和 _onDragMove 抢 setOption。8.21 */
   // 只排一帧，不再连刷两次 renderAll（会闪）。8.24
   scheduleRender() {
-    if (this.dragSession) return;
+    if (!this._alive() || this.dragSession) return;
     if (this._raf) return;
     this._raf = requestAnimationFrame(() => {
       this._raf = null;
+      if (!this._alive()) return;
       this.renderAll();
     });
   }
@@ -4057,385 +4146,338 @@ class TrendLineManager {
     }
     return false;
   }
-  /** 缩放过程用 ZR 就地改像素，结束后再整层重画，避免 replaceMerge 把线冲掉。8.22 */
+  // 趋势线已是笛卡尔 series，dataZoom 带着走；这些入口留给旧调用方，不再像素跟帧。8.25
   scheduleZoomRender() {
-    if (this.dragSession || !this.hasAnyKnots()) return;
-    this._zoomPending = true;
-    if (this._zoomEndTimer) clearTimeout(this._zoomEndTimer);
-    this._zoomEndTimer = setTimeout(() => {
-      this._zoomPending = false;
-      if (this._zoomRaf) {
-        cancelAnimationFrame(this._zoomRaf);
-        this._zoomRaf = null;
-      }
-      this.scheduleRender();
-    }, 140);
-    if (this._zoomRaf) return;
-    const tick = () => {
-      if (this.dragSession) {
-        this._zoomRaf = null;
-        return;
-      }
-      this._patchAllPositions();
-      if (this._zoomPending) {
-        this._zoomRaf = requestAnimationFrame(tick);
-      } else {
-        this._zoomRaf = null;
-      }
-    };
-    this._zoomRaf = requestAnimationFrame(tick);
   }
-  /** 缩放帧：优先 ZR setShape，元素被冲掉时才回退 renderLane。8.22 */
-  _patchAllPositions() {
-    const lanes = this.host.currentTemplate && this.host.currentTemplate.lanes || [];
-    lanes.forEach((lane) => this._patchLanePositions(lane.laneId));
+  beginPanFollow() {
   }
-  _patchLanePositions(laneId) {
-    const chart = this.getChart(laneId);
-    if (!chart) return;
-    const targets = this.listDrawableTargets().filter((t) => t.laneId === laneId);
-    const hasKnots = targets.some((t) => (t.segments || []).some((s) => (s.knots || []).length));
-    if (!hasKnots) return;
-    const patches = [];
-    targets.forEach((target) => {
-      patches.push(...this._buildPatches(chart, target));
-    });
-    if (!patches.length) return;
-    if (!this._applyPatchesViaZr(chart, patches) && !this._zoomPending) {
-      this.renderLane(laneId);
-    }
+  tickPanFollow() {
   }
-  _buildPatches(chart, target) {
-    const patches = [];
-    const { paramId, key, segments, line } = target;
-    const canMirror = this._canMirror(line, segments);
-    segments.forEach((seg) => {
-      const knots = seg.knots || [];
-      for (let i = 0; i < knots.length - 1; i++) {
-        const p1 = knots[i];
-        const p2 = knots[i + 1];
-        const px1 = this._knotPixel(chart, target, p1);
-        const px2 = this._knotPixel(chart, target, p2);
-        if (!px1 || !px2) continue;
-        patches.push({
-          id: `trend_line_${key}_${seg.id}_${i}`,
-          shape: { x1: px1[0], y1: px1[1], x2: px2[0], y2: px2[1] }
-        });
-        if (canMirror) {
-          const mx1 = this._knotPixel(chart, target, p1, "mirror");
-          const mx2 = this._knotPixel(chart, target, p2, "mirror");
-          if (mx1 && mx2) {
-            patches.push({
-              id: `trend_mirror_${key}_${seg.id}_${i}`,
-              shape: { x1: mx1[0], y1: mx1[1], x2: mx2[0], y2: mx2[1] }
-            });
-          }
-        }
-      }
-      knots.forEach((knot, i) => {
-        const px = this._knotPixel(chart, target, knot);
-        if (px) {
-          patches.push({
-            id: `trend_point_${key}_${seg.id}_${i}`,
-            shape: { cx: px[0], cy: px[1], r: 4 }
-          });
-        }
-        if (canMirror) {
-          const mx = this._knotPixel(chart, target, knot, "mirror");
-          if (mx) {
-            patches.push({
-              id: `trend_mirror_point_${key}_${seg.id}_${i}`,
-              shape: { cx: mx[0], cy: mx[1], r: 4 }
-            });
-          }
-        }
-      });
-    });
-    return patches;
+  endPanFollow() {
   }
-  _invalidateZrElCache(chart) {
-    if (chart && this._zrElCache) this._zrElCache.delete(chart);
+  endFollowView() {
   }
-  _indexGraphicZrEls(chart, map) {
-    const zr = chart.getZr();
-    if (!zr || !zr.storage || typeof zr.storage.traverse !== "function") return;
-    zr.storage.traverse((el) => {
-      const elId = el.id ?? el.anid ?? el.name ?? el.__ecGraphicId;
-      if (elId == null) return;
-      map.set(String(elId), el);
-    });
+  _patchAllPositions() {
   }
-  _findGraphicZrEl(chart, id) {
-    if (!chart || id == null) return null;
-    let map = this._zrElCache.get(chart);
-    if (!map) {
-      map = /* @__PURE__ */ new Map();
-      this._zrElCache.set(chart, map);
-      this._indexGraphicZrEls(chart, map);
-    }
-    const key = String(id);
-    if (map.has(key)) return map.get(key);
-    map.clear();
-    this._indexGraphicZrEls(chart, map);
-    if (map.has(key)) return map.get(key);
-    for (const [elId, el] of map) {
-      if (elId.endsWith(key)) return el;
+  _isTrendSeriesOpt(series) {
+    if (!series) return false;
+    const name = Array.isArray(series.name) ? series.name[0] : series.name;
+    if (name === "trend") return true;
+    const id = String(series.id || "");
+    return id.indexOf("trend_") === 0;
+  }
+  _findCurveSeriesInOption(option, paramId) {
+    const list = option && option.series || [];
+    for (let i = 0; i < list.length; i++) {
+      const s = list[i];
+      if (!s || this._isTrendSeriesOpt(s)) continue;
+      const type = Array.isArray(s.type) ? s.type[0] : s.type;
+      if (type && type !== "line") continue;
+      const name = Array.isArray(s.name) ? s.name[0] : s.name;
+      if (name === "helper" || name === "log-grid" || name === "推荐值") continue;
+      if (String(s.paramId) === String(paramId)) return s;
     }
     return null;
   }
-  _graphicPixel(el) {
-    const cx = el.shape && el.shape.cx || 0;
-    const cy = el.shape && el.shape.cy || 0;
-    return [cx + (el.x || 0), cy + (el.y || 0)];
+  _firstKnotDepth(target) {
+    const segs = target && target.segments || [];
+    for (let i = 0; i < segs.length; i++) {
+      const knot = (segs[i].knots || [])[0];
+      if (knot && Number.isFinite(Number(knot.depth))) return Number(knot.depth);
+    }
+    return 0;
   }
-  _applyKnotPixel(chart, target, knot, role, offsetX, offsetY) {
-    const data = this._pixelToTrend(chart, target, offsetX, offsetY, true);
-    if (!data) return false;
-    const range = this._drawValueRange(target, chart, data.depth);
-    let depth = snapDepthToEdge(data.depth, range.depthMin, range.depthMax, DEPTH_EDGE_SNAP);
-    if (data.value == null) return false;
-    const clickX = Math.max(range.valueMin, Math.min(range.valueMax, data.value));
-    const all = this._allKnots(target.key);
-    const idx = all.indexOf(knot);
-    if (idx > 0) depth = Math.max(depth, all[idx - 1].depth);
-    if (idx >= 0 && idx < all.length - 1) depth = Math.min(depth, all[idx + 1].depth);
-    knot.depth = parseFloat(depth.toFixed(3));
-    this._applyPointerValue(chart, target, knot, knot.depth, clickX, role);
-    return true;
+  _curveAxisOf(chart, target) {
+    const info = findSeriesForDepth(chart, target.paramId, this._firstKnotDepth(target));
+    return {
+      xAxisIndex: info && info.xAxisIndex != null ? info.xAxisIndex : 0,
+      yAxisIndex: info && info.yAxisIndex != null ? info.yAxisIndex : 0
+    };
   }
-  /** 控制点交给 ZR 拖，不再和 dataZoom 抢 DOM mousedown。8.22 */
-  _bindPointInteractions(chart, laneId) {
-    const targets = this.listDrawableTargets().filter((t) => t.laneId === laneId && t.editable);
-    targets.forEach((target) => {
-      const canMirror = this._canMirror(target.line, target.segments);
-      (target.segments || []).forEach((seg) => {
-        (seg.knots || []).forEach((knot, i) => {
-          this._bindOnePointEl(
-            chart,
-            target,
-            knot,
-            `trend_point_${target.key}_${seg.id}_${i}`,
-            "main"
-          );
-          if (canMirror && knot.mirrorValue != null && Number.isFinite(Number(knot.mirrorValue))) {
-            this._bindOnePointEl(
-              chart,
-              target,
-              knot,
-              `trend_mirror_point_${target.key}_${seg.id}_${i}`,
-              "mirror"
-            );
-          }
+  _buildOneTrendSeries(id, data, lineStyle, pointStyle, xAxisIndex, yAxisIndex) {
+    return {
+      id,
+      name: "trend",
+      type: "line",
+      data,
+      xAxisIndex,
+      yAxisIndex,
+      clip: true,
+      animation: false,
+      silent: true,
+      large: false,
+      z: TREND_LINE_Z,
+      zlevel: 0,
+      symbol: "circle",
+      symbolSize: 8,
+      showSymbol: true,
+      hoverAnimation: false,
+      legendHoverLink: false,
+      connectNulls: false,
+      tooltip: { show: false },
+      emphasis: { disabled: true },
+      lineStyle: {
+        color: lineStyle.stroke,
+        width: lineStyle.lineWidth,
+        type: lineStyle.lineDash || "solid"
+      },
+      itemStyle: {
+        color: pointStyle.fill,
+        borderColor: pointStyle.stroke,
+        borderWidth: pointStyle.lineWidth
+      }
+    };
+  }
+  _knotPoint(x, depth) {
+    return { value: [x, depth], symbol: "circle", symbolSize: 8 };
+  }
+  _segSeriesData(knots, role) {
+    const raw = [];
+    for (let i = 0; i < (knots || []).length; i++) {
+      const knot = knots[i];
+      const x = this._knotDrawX(knot, role);
+      const depth = Number(knot && knot.depth);
+      if (x == null || !Number.isFinite(depth)) continue;
+      raw.push([x, depth]);
+    }
+    if (raw.length < 2) {
+      return raw.map((p) => this._knotPoint(p[0], p[1]));
+    }
+    const data = [];
+    for (let i = 0; i < raw.length - 1; i++) {
+      const a = raw[i];
+      const b = raw[i + 1];
+      data.push(this._knotPoint(a[0], a[1]));
+      const span = Math.abs(b[1] - a[1]);
+      const n = Math.min(160, Math.max(0, Math.floor(span / 4)));
+      for (let k = 1; k < n; k++) {
+        const t = k / n;
+        data.push({
+          value: [a[0] + (b[0] - a[0]) * t, a[1] + (b[1] - a[1]) * t],
+          symbol: "none"
         });
-      });
+      }
+    }
+    const last = raw[raw.length - 1];
+    data.push(this._knotPoint(last[0], last[1]));
+    return data;
+  }
+  /** 曲线仍 weakFilter；趋势线点太稀，滤掉窗外控制点后穿过视窗的线会断。8.25 */
+  applyDataZoomSkipTrend(option) {
+    if (!option) return;
+    const raw = option.dataZoom;
+    if (!raw) return;
+    const list = Array.isArray(raw) ? raw : [raw];
+    const indexes = [];
+    const series = option.series || [];
+    for (let i = 0; i < series.length; i++) {
+      if (!this._isTrendSeriesOpt(series[i])) indexes.push(i);
+    }
+    if (!indexes.length) return;
+    list.forEach((dz) => {
+      if (dz) dz.seriesIndex = indexes;
     });
   }
-  _bindOnePointEl(chart, target, knot, id, role) {
-    const el = this._findGraphicZrEl(chart, id);
-    if (!el) return;
-    el.silent = false;
-    el.draggable = true;
-    el.cursor = "grab";
-    if (el.off && el.__trendDragBound) {
-      el.off("mousedown", el.__trendOnDown);
-      el.off("drag", el.__trendOnDrag);
-      el.off("dragend", el.__trendOnEnd);
+  dataZoomSeriesIndex(chart) {
+    if (!chart || chart.isDisposed()) return null;
+    try {
+      const list = chart.getModel().getSeries() || [];
+      const indexes = [];
+      for (let i = 0; i < list.length; i++) {
+        const sm = list[i];
+        const opt = sm && sm.option || {};
+        const name = Array.isArray(sm.name) ? sm.name[0] : sm.name;
+        if (this._isTrendSeriesOpt({ name, id: opt.id })) continue;
+        if (sm.seriesIndex != null) indexes.push(sm.seriesIndex);
+      }
+      return indexes.length ? indexes : null;
+    } catch (e) {
+      return null;
     }
-    const onDown = (e) => {
-      this._clearClickTimer();
-      this.activeKey = target.key;
-      this.dragSession = { chart, target, knot, role, graphic: true };
-      this._setPanLocked(true);
-      if (e && typeof e.stop === "function") e.stop();
-      if (e && e.event) {
-        e.event.preventDefault();
-        e.event.stopPropagation();
-      }
-    };
-    const onDrag = () => {
-      if (!this.dragSession) {
-        this.dragSession = { chart, target, knot, role, graphic: true };
-        this._setPanLocked(true);
-      }
-      const [x, y] = this._graphicPixel(el);
-      if (!this._applyKnotPixel(chart, target, knot, role, x, y)) return;
-      el.x = 0;
-      el.y = 0;
-      this._patchLanePositions(target.laneId);
-    };
-    const onEnd = () => {
-      if (!this.dragSession) return;
-      const sessionTarget = this.dragSession.target;
-      this.dragSession = null;
-      this._setPanLocked(false, true);
-      this._ignoreClickUntil = Date.now() + 300;
-      this._emitChange(sessionTarget, { redraw: false });
-    };
-    el.__trendOnDown = onDown;
-    el.__trendOnDrag = onDrag;
-    el.__trendOnEnd = onEnd;
-    el.__trendDragBound = true;
-    el.on("mousedown", onDown);
-    el.on("drag", onDrag);
-    el.on("dragend", onEnd);
   }
-  _applyPatchesViaZr(chart, patches) {
-    if (!patches.length) return false;
-    let applied = 0;
-    patches.forEach(({ id, shape }) => {
-      const el = this._findGraphicZrEl(chart, id);
-      if (!el || typeof el.setShape !== "function") return;
-      el.setShape(shape);
-      applied += 1;
+  /** 笛卡尔 [曲线值, 井深]；对数道 X 已是 lg。和曲线共用轴，dataZoom 同一帧带走。8.25 */
+  _buildTrendSeries(target, xAxisIndex, yAxisIndex) {
+    const list = [];
+    const { key, segments, line } = target;
+    const canMirror = this._canMirror(line, segments);
+    const doubleLine = this._useGammaStyle(line, segments);
+    const mainLineStyle = doubleLine ? TREND_DOUBLE_LINE_STYLE : TREND_LINE_STYLE;
+    const mainPointStyle = doubleLine ? TREND_DOUBLE_POINT_STYLE : TREND_POINT_STYLE;
+    (segments || []).forEach((seg) => {
+      const knots = seg.knots || [];
+      if (!knots.length) return;
+      list.push(
+        this._buildOneTrendSeries(
+          `trend_${key}_${seg.id}`,
+          this._segSeriesData(knots, "main"),
+          mainLineStyle,
+          mainPointStyle,
+          xAxisIndex,
+          yAxisIndex
+        )
+      );
+      if (!canMirror) return;
+      const mirror = this._segSeriesData(knots, "mirror");
+      if (!mirror.length) return;
+      list.push(
+        this._buildOneTrendSeries(
+          `trend_mirror_${key}_${seg.id}`,
+          mirror,
+          TREND_MIRROR_LINE_STYLE,
+          TREND_MIRROR_POINT_STYLE,
+          xAxisIndex,
+          yAxisIndex
+        )
+      );
     });
-    const zr = chart.getZr && chart.getZr();
-    if (applied > 0 && zr && typeof zr.refresh === "function") zr.refresh();
-    return applied > 0;
+    return list;
   }
-  // 只 merge 新图形，不动已有线。8.24
-  _addGraphicElements(chart, elements) {
-    if (!elements.length) return;
-    this._invalidateZrElCache(chart);
-    chart.setOption(
-      {
-        graphic: elements.map((el) => ({ ...el, $action: "merge" }))
-      },
-      { silent: true, lazyUpdate: false }
-    );
+  /** 刷 option 时给该道补上趋势 series，所有有控制点的泳道都会走。8.25 */
+  appendSeriesToOption(option, lane) {
+    if (!option || !lane) return option;
+    if (!Array.isArray(option.series)) option.series = [];
+    option.series = option.series.filter((s) => !this._isTrendSeriesOpt(s));
+    const targets = this.listDrawableTargets().filter((t) => t.laneId === lane.laneId);
+    const added = [];
+    targets.forEach((target) => {
+      const curve = this._findCurveSeriesInOption(option, target.paramId);
+      if (!curve) return;
+      const xAxisIndex = curve.xAxisIndex == null ? 0 : Number(curve.xAxisIndex);
+      const yAxisIndex = curve.yAxisIndex == null ? 0 : Number(curve.yAxisIndex);
+      added.push(...this._buildTrendSeries(target, xAxisIndex, yAxisIndex));
+    });
+    option.series.push(...added);
+    this._seriesIds[lane.laneId] = added.map((s) => s.id);
+    this.applyDataZoomSkipTrend(option);
+    return option;
   }
-  // 按 id 删除，不 replaceMerge 整层 graphic。8.24
-  _removeGraphicIds(chart, ids) {
-    if (!ids.length) return;
-    this._invalidateZrElCache(chart);
-    chart.setOption(
-      {
-        graphic: ids.map((id) => ({ id, $action: "remove" }))
-      },
-      { silent: true, lazyUpdate: false }
-    );
+  _clearLeftoverGraphic(chart) {
+    if (!chart || chart.isDisposed() || this._graphicCleared.has(chart)) return;
+    this._graphicCleared.add(chart);
+    try {
+      chart.setOption({ graphic: [] }, { replaceMerge: ["graphic"], silent: true, lazyUpdate: false });
+    } catch (e) {
+    }
   }
   renderAll(forceReplace = false) {
     const lanes = this.host.currentTemplate && this.host.currentTemplate.lanes || [];
     lanes.forEach((lane) => this.renderLane(lane.laneId, forceReplace));
   }
-  /** 已有线只改 ZR 形状；新点/新线段单独 merge 进去，绝不整层 graphic 替换。8.24 */
+  /** 用笛卡尔 series 画趋势线；平移/缩放交给 dataZoom，不跟像素。8.25 */
   renderLane(laneId, forceReplace = false) {
+    if (!this._alive()) return;
     const chart = this.getChart(laneId);
     if (!chart) return;
+    this._clearLeftoverGraphic(chart);
     const targets = this.listDrawableTargets().filter((t) => t.laneId === laneId);
-    const elements = [];
+    const next = [];
     targets.forEach((target) => {
-      elements.push(...this._buildElements(chart, target));
+      const axis = this._curveAxisOf(chart, target);
+      next.push(...this._buildTrendSeries(target, axis.xAxisIndex, axis.yAxisIndex));
     });
-    const hasKnots = targets.some((t) => (t.segments || []).some((s) => (s.knots || []).length));
-    if (hasKnots && !elements.length) return;
-    const nextIds = elements.map((el) => el.id);
-    const prevIds = this._graphicIds[laneId] || [];
-    const prevSet = new Set(prevIds);
+    const nextIds = next.map((s) => s.id);
     const nextSet = new Set(nextIds);
-    const added = elements.filter((el) => !prevSet.has(el.id));
-    const kept = elements.filter((el) => prevSet.has(el.id));
-    const removedIds = prevIds.filter((id) => !nextSet.has(id));
-    if (forceReplace) {
-      this._removeGraphicIds(chart, prevIds);
-      this._addGraphicElements(chart, elements);
-    } else {
-      if (kept.length) {
-        this._applyPatchesViaZr(
-          chart,
-          kept.map((el) => ({ id: el.id, shape: el.shape }))
-        );
+    const liveIds = this._chartTrendSeriesIds(chart);
+    const prevIds = [.../* @__PURE__ */ new Set([...this._seriesIds[laneId] || [], ...liveIds])];
+    const replace = !!(forceReplace && !this.dragSession);
+    const patch = next.map((s) => ({
+      ...s,
+      data: s.data || [],
+      $action: replace ? "replace" : "merge"
+    }));
+    prevIds.forEach((id) => {
+      if (!nextSet.has(id)) patch.push({ id, $action: "remove" });
+    });
+    if (patch.length) {
+      try {
+        chart.setOption({ series: patch }, { silent: true, lazyUpdate: false });
+      } catch (e) {
       }
-      if (removedIds.length) this._removeGraphicIds(chart, removedIds);
-      if (added.length) this._addGraphicElements(chart, added);
     }
-    this._graphicIds[laneId] = nextIds;
-    this._bindPointInteractions(chart, laneId);
-    this.updateCursor(laneId);
-  }
-  _buildElements(chart, target) {
-    const elements = [];
-    const { paramId, key, editable, segments, line } = target;
-    const canMirror = this._canMirror(line, segments);
-    const doubleLine = this._useGammaStyle(line, segments);
-    const mainLineStyle = doubleLine ? TREND_DOUBLE_LINE_STYLE : TREND_LINE_STYLE;
-    const mainPointStyle = doubleLine ? TREND_DOUBLE_POINT_STYLE : TREND_POINT_STYLE;
-    segments.forEach((seg) => {
-      const knots = seg.knots || [];
-      for (let i = 0; i < knots.length - 1; i++) {
-        const p1 = knots[i];
-        const p2 = knots[i + 1];
-        const px1 = this._knotPixel(chart, target, p1);
-        const px2 = this._knotPixel(chart, target, p2);
-        if (!px1 || !px2) continue;
-        elements.push({
-          type: "line",
-          id: `trend_line_${key}_${seg.id}_${i}`,
-          shape: { x1: px1[0], y1: px1[1], x2: px2[0], y2: px2[1] },
-          style: { ...mainLineStyle },
-          z: TREND_LINE_Z,
-          silent: true
-        });
-        if (canMirror) {
-          const mx1 = this._knotPixel(chart, target, p1, "mirror");
-          const mx2 = this._knotPixel(chart, target, p2, "mirror");
-          if (mx1 && mx2) {
-            elements.push({
-              type: "line",
-              id: `trend_mirror_${key}_${seg.id}_${i}`,
-              shape: { x1: mx1[0], y1: mx1[1], x2: mx2[0], y2: mx2[1] },
-              style: { ...TREND_MIRROR_LINE_STYLE },
-              z: TREND_LINE_Z - 1,
-              silent: true
-            });
+    this._seriesIds[laneId] = nextIds;
+    if (!this.dragSession) this._syncCachedOption(laneId);
+    if (this.dragSession) {
+      this.updateCursor(laneId);
+      return;
+    }
+    const idsChanged = nextIds.length !== prevIds.length || nextIds.some((id, i) => id !== prevIds[i]);
+    if (idsChanged) {
+      const skip = this.dataZoomSeriesIndex(chart);
+      if (skip && skip.length) {
+        try {
+          const dz = chart.getModel().getComponent("dataZoom", 0);
+          const opt = dz && dz.option;
+          const next2 = { seriesIndex: skip };
+          if (opt) {
+            if (opt.start != null) next2.start = opt.start;
+            if (opt.end != null) next2.end = opt.end;
+            if (opt.startValue != null) next2.startValue = opt.startValue;
+            if (opt.endValue != null) next2.endValue = opt.endValue;
           }
+          chart.setOption({ dataZoom: [next2] }, { silent: true, lazyUpdate: true });
+        } catch (e) {
         }
       }
-      knots.forEach((knot, i) => {
-        const px = this._knotPixel(chart, target, knot);
-        if (!px) return;
-        elements.push({
-          type: "circle",
-          id: `trend_point_${key}_${seg.id}_${i}`,
-          shape: { cx: px[0], cy: px[1], r: 4 },
-          style: { ...mainPointStyle },
-          z: TREND_POINT_Z,
-          zlevel: 10,
-          silent: !editable,
-          draggable: !!editable,
-          cursor: editable ? "grab" : "default"
-        });
-        if (canMirror) {
-          const mx = this._knotPixel(chart, target, knot, "mirror");
-          if (mx) {
-            elements.push({
-              type: "circle",
-              id: `trend_mirror_point_${key}_${seg.id}_${i}`,
-              shape: { cx: mx[0], cy: mx[1], r: 4 },
-              style: { ...TREND_MIRROR_POINT_STYLE },
-              z: TREND_POINT_Z,
-              zlevel: 10,
-              silent: !editable,
-              draggable: !!editable,
-              cursor: editable ? "grab" : "default"
-            });
-          }
-        }
-      });
-    });
-    return elements;
+    }
+    this.updateCursor(laneId);
+  }
+  /** 把当前 store 写回 allOptions，避免随后 notMerge 用旧趋势 series 把点盖回去。8.25 */
+  _syncCachedOption(laneId) {
+    const host = this.host;
+    if (!host || typeof host.getOptionsByLineId !== "function") return null;
+    const option = host.getOptionsByLineId(laneId);
+    if (!option || !Array.isArray(option.series)) return null;
+    const lanes = host.currentTemplate && host.currentTemplate.lanes || [];
+    const lane = lanes.find((l) => l.laneId === laneId);
+    if (!lane) return null;
+    this.appendSeriesToOption(option, lane);
+    return option;
+  }
+  /** 删点后走整份 option 替换，ECharts 才会丢掉缩短后的旧 data。8.25 */
+  _flushLane(laneId) {
+    const option = this._syncCachedOption(laneId);
+    if (option && this.host && typeof this.host.flushLaneChartOption === "function") {
+      option.__kdTrendSynced = true;
+      try {
+        this.host.flushLaneChartOption(laneId, option);
+      } finally {
+        delete option.__kdTrendSynced;
+      }
+      this.updateCursor(laneId);
+      return;
+    }
+    this.renderLane(laneId, true);
+  }
+  _chartTrendSeriesIds(chart) {
+    if (!chart || chart.isDisposed()) return [];
+    try {
+      const list = chart.getModel().getSeries() || [];
+      const ids = [];
+      for (let i = 0; i < list.length; i++) {
+        const sm = list[i];
+        const opt = sm && sm.option || {};
+        const name = Array.isArray(sm.name) ? sm.name[0] : sm.name;
+        const id = opt.id || sm.id;
+        if (this._isTrendSeriesOpt({ name, id }) && id) ids.push(id);
+      }
+      return ids;
+    } catch (e) {
+      return [];
+    }
   }
   _findKnotAtPointer(chart, target, offsetX, offsetY, radius = TREND_HIT_RADIUS) {
     let best = null;
     let bestDist = radius;
     const canMirror = this._canMirror(target.line, target.segments);
     for (const seg of target.segments || []) {
-      for (const knot of seg.knots || []) {
+      const knots = seg.knots || [];
+      for (let i = 0; i < knots.length; i++) {
+        const knot = knots[i];
         const px = this._knotPixel(chart, target, knot);
         if (px) {
           const dist = Math.hypot(px[0] - offsetX, px[1] - offsetY);
           if (dist <= bestDist) {
-            best = { knot, seg, role: "main" };
+            best = { knot, seg, knotIndex: i, role: "main" };
             bestDist = dist;
           }
         }
@@ -4444,7 +4486,7 @@ class TrendLineManager {
         if (!mx) continue;
         const mirrorDist = Math.hypot(mx[0] - offsetX, mx[1] - offsetY);
         if (mirrorDist <= bestDist) {
-          best = { knot, seg, role: "mirror" };
+          best = { knot, seg, knotIndex: i, role: "mirror" };
           bestDist = mirrorDist;
         }
       }
@@ -4453,6 +4495,11 @@ class TrendLineManager {
   }
   /** 单击空白处加点；延迟执行以便和双击断段区分。命中已有点则不加点。返回 true 表示已消费本次点击。8.21 */
   handleClick(e, laneId) {
+    if (!this._alive()) return false;
+    if (this.dragSession) {
+      this._endDrag(true);
+      return true;
+    }
     const target = this.getTargetByLane(laneId);
     if (!target || !target.editable) return false;
     if (Date.now() < this._ignoreClickUntil) return true;
@@ -4465,6 +4512,7 @@ class TrendLineManager {
     this._clearClickTimer();
     this.clickTimer = setTimeout(() => {
       this.clickTimer = null;
+      if (!this._alive()) return;
       this._addPoint(chart, target, offsetX, offsetY);
     }, TREND_CLICK_DELAY_MS);
     return true;
@@ -4486,7 +4534,7 @@ class TrendLineManager {
     }
     return true;
   }
-  /** 右键命中控制点时弹出「删除控制点」；先结束可能误触发的拖拽并重绘，避免线段被 replaceMerge 丢掉。8.21 */
+  /** 右键命中控制点时弹出「删除控制点」。打开菜单时不要 setOption，否则会吞掉菜单点击。8.21 */
   handleContextMenu(e, laneId) {
     const target = this.getTargetByLane(laneId);
     if (!target || !target.editable) return false;
@@ -4500,14 +4548,23 @@ class TrendLineManager {
     this.host.showTrendKnotContextMenu(e, {
       key: target.key,
       knot: hit.knot,
+      segId: hit.seg && hit.seg.id,
+      knotIndex: hit.knotIndex,
+      depth: hit.knot.depth,
+      value: hit.knot.value,
+      plotValue: hit.knot.plotValue,
       laneId
     });
-    this.renderLane(laneId);
     return true;
   }
   /** 指针靠近控制点时先停地应力平移，按下时才来得及拖点。8.22 */
   onZrHover(e, laneId) {
-    if (this.dragSession) return;
+    if (!this._alive()) return;
+    if (this.dragSession) {
+      e.__ecRoamConsumed = true;
+      if (typeof e.stop === "function") e.stop();
+      return;
+    }
     if (this.host && typeof this.host.isChartBusy === "function" && this.host.isChartBusy()) {
       return;
     }
@@ -4530,38 +4587,32 @@ class TrendLineManager {
       this.host.setInsideDataZoomPanEnabled(!locked);
     }
   }
-  /** zr 里拦住 dataZoom 的按下，否则图会跟着点一起拖。8.22 */
+  /** 左键拖点与右键删点同一套命中（zr offset + _findKnotAtPointer）。8.25 */
   onZrMouseDown(e, laneId) {
+    if (!this._alive()) return;
     if (e.which != null && e.which !== 1 && e.event && e.event.button !== 0) return;
+    if (this.dragSession) {
+      e.__ecRoamConsumed = true;
+      if (typeof e.stop === "function") e.stop();
+      this._endDrag(true);
+      return;
+    }
     const target = this.getTargetByLane(laneId);
     const chart = this.getChart(laneId);
-    if (!target || !target.editable || !chart || this.dragSession) return;
+    if (!target || !target.editable || !chart) return;
     const { offsetX, offsetY } = eventOffsetInChart(chart, e);
-    if (!this._findKnotAtPointer(chart, target, offsetX, offsetY)) return;
+    const hit = this._findKnotAtPointer(chart, target, offsetX, offsetY);
+    if (!hit) return;
+    e.__ecRoamConsumed = true;
     if (typeof e.stop === "function") e.stop();
     e.cancelBubble = true;
     if (e.event) {
       e.event.preventDefault();
       e.event.stopPropagation();
     }
-  }
-  /** 仅左键拖拽控制点。右键 mousedown 会先于 contextmenu，绝不能当拖拽处理。8.21 */
-  onMouseDown(nativeEvent, laneId) {
-    if (nativeEvent.button !== 0) return;
-    const target = this.getTargetByLane(laneId);
-    if (!target || !target.editable || this.dragSession) return;
-    const chart = this.getChart(laneId);
-    if (!chart) return;
-    const { offsetX, offsetY } = eventOffsetInChart(chart, nativeEvent);
-    const hit = this._findKnotAtPointer(chart, target, offsetX, offsetY);
-    if (!hit) return;
-    nativeEvent.stopPropagation();
-    nativeEvent.stopImmediatePropagation();
-    nativeEvent.preventDefault();
     this._clearClickTimer();
     this.activeKey = target.key;
-    this._setPanLocked(true);
-    this._startDrag(chart, target, hit.knot, nativeEvent, hit.role);
+    this._startDrag(chart, target, hit.knot, e, hit.role);
   }
   /** 沿深度增大方向追加控制点；曲线值限制在该线 min/max 内。8.21 */
   _addPoint(chart, target, offsetX, offsetY) {
@@ -4657,6 +4708,7 @@ class TrendLineManager {
   }
   /** 清空全部趋势线控制点并重绘。8.22 */
   resetAllTrendLines() {
+    if (this.dragSession) this._endDrag(false);
     const prev = this.listDrawableTargets().filter(
       (t) => (t.segments || []).some((s) => (s.knots || []).length)
     );
@@ -4670,25 +4722,39 @@ class TrendLineManager {
         segments: []
       });
     });
-    this.renderAll(true);
+    this._flushTrendLanes(prev);
   }
   /** 清空指定曲线的控制点；不传 key 则清当前编辑曲线。8.21 */
   resetTrendLine(key) {
     const target = key ? this.listDrawableTargets().find((t) => t.key === key) : this.getActiveTarget() || this.listDrawableTargets().find((t) => t.editable);
     if (!target) return;
+    if (this.dragSession) this._endDrag(false);
     this.store[target.key] = { segments: [] };
-    this.renderLane(target.laneId, true);
+    this._flushLane(target.laneId);
     this._emitChange(target, { redraw: false });
   }
+  /** 把 store 已空的泳道整份 option 刷进图，线段才会从画面上消失。8.25 */
+  _flushTrendLanes(prev) {
+    const laneIds = /* @__PURE__ */ new Set();
+    (prev || []).forEach((t) => t.laneId && laneIds.add(t.laneId));
+    Object.keys(this._seriesIds).forEach((id) => laneIds.add(id));
+    this.binds.forEach((_, laneId) => {
+      const chart = this.getChart(laneId);
+      if (chart && this._chartTrendSeriesIds(chart).length) laneIds.add(laneId);
+    });
+    if (!laneIds.size) {
+      this.renderAll(true);
+      return;
+    }
+    laneIds.forEach((laneId) => this._flushLane(laneId));
+  }
   /** 删除一个控制点。段内只剩 0～1 个点时整段丢掉（画不出线）。8.21 */
   deleteKnot(payload) {
-    if (!payload || !payload.key || !payload.knot) return;
+    if (!payload || !payload.key) return;
     const bucket = this.store[payload.key];
     if (!bucket) return;
     bucket.segments = bucket.segments.map((seg) => {
-      const idx = seg.knots.findIndex(
-        (k) => k === payload.knot || Math.abs(k.depth - payload.knot.depth) < 0.05 && Math.abs(k.value - payload.knot.value) < 0.01
-      );
+      const idx = this._findKnotIndex(seg, payload);
       if (idx < 0) return seg;
       const knots = seg.knots.filter((_, i) => i !== idx);
       if (knots.length <= 1) return { ...seg, knots: [] };
@@ -4696,9 +4762,32 @@ class TrendLineManager {
     }).filter((s) => s.knots.length > 0);
     const target = this.listDrawableTargets().find((t) => t.key === payload.key);
     const laneId = target && target.laneId || payload.laneId;
-    if (laneId) this.renderLane(laneId, true);
+    if (laneId) this._flushLane(laneId);
     if (target) this._emitChange(target, { redraw: false });
   }
+  _findKnotIndex(seg, payload) {
+    const knots = seg && seg.knots || [];
+    if (!knots.length || !payload) return -1;
+    if (payload.knot) {
+      const byRef = knots.indexOf(payload.knot);
+      if (byRef >= 0) return byRef;
+    }
+    if (payload.segId && seg.id !== payload.segId) return -1;
+    if (Number.isInteger(payload.knotIndex) && payload.knotIndex >= 0 && payload.knotIndex < knots.length) {
+      return payload.knotIndex;
+    }
+    const depth = payload.knot != null ? payload.knot.depth : payload.depth;
+    const value = payload.knot != null ? payload.knot.value : payload.value;
+    const plotValue = payload.knot != null ? payload.knot.plotValue : payload.plotValue;
+    return knots.findIndex((k) => {
+      if (depth == null || Math.abs(Number(k.depth) - Number(depth)) >= 0.05) return false;
+      if (value != null && Math.abs(Number(k.value) - Number(value)) < 0.01) return true;
+      if (plotValue != null && k.plotValue != null && Math.abs(Number(k.plotValue) - Number(plotValue)) < 0.01) {
+        return true;
+      }
+      return value == null;
+    });
+  }
   /** 返回 geosteering trendLinePoint 格式的线段数组；8137 带上 isDouble / calcType。8.22 */
   getTrendLineData(mainId = "demo") {
     const grouped = {};
@@ -4722,12 +4811,14 @@ class TrendLineManager {
     }
     const segs = this._prepareEchoSegments(paramId, segments);
     this.store[key] = { segments: segs };
-    if (found.line) found.line.trendSegments = segs;
     this.renderLane(found.laneId);
   }
   /** 把 geosteering 线段数组灌进对应曲线并画出叠加层。8.21 */
   setTrendLineList(lineList, overwrite = true) {
-    if (!Array.isArray(lineList) || !lineList.length) return;
+    if (!Array.isArray(lineList) || !lineList.length) {
+      this.resetAllTrendLines();
+      return;
+    }
     const grouped = fromTrendLineSavePayload(lineList);
     Object.entries(grouped).forEach(([paramId, segments]) => {
       this.setTrendLineData(paramId, segments, overwrite);
@@ -4763,33 +4854,58 @@ class TrendLineManager {
     const last = target.segments[target.segments.length - 1];
     return !!(last && !last._closed && last.knots && last.knots.length);
   }
-  /** 拖拽开始：在 window 上听 mousemove/mouseup，避免鼠标移出图表丢事件。8.21 */
+  /** 拖拽开始：按下不刷图，避免 setOption 把这次按住掐掉。8.25 */
   _startDrag(chart, target, knot, nativeEvent, role = "main") {
+    this._unbindDragWindow();
     const onMove = (ev) => this._onDragMove(ev);
-    const onUp = () => this._endDrag(true);
+    const onUp = (ev) => {
+      if (ev && ev.button != null && ev.button !== 0) return;
+      this._endDrag(true);
+    };
+    const startStamp = nativeEvent && nativeEvent.timeStamp;
+    const onClickEnd = (ev) => {
+      if (ev && ev.button != null && ev.button !== 0) return;
+      if (startStamp != null && ev.timeStamp === startStamp) return;
+      this._endDrag(true);
+    };
+    const { offsetX, offsetY } = eventOffsetInChart(chart, nativeEvent);
+    const px = this._knotPixel(chart, target, knot, role);
     this.dragSession = {
       chart,
       target,
       knot,
       role,
       onMove,
-      onUp
+      onUp,
+      onClickEnd,
+      grabDX: px ? px[0] - offsetX : 0,
+      grabDY: px ? px[1] - offsetY : 0
     };
-    if (this.host && typeof this.host.setInsideDataZoomPanEnabled === "function") {
-      this.host.setInsideDataZoomPanEnabled(false);
-    }
     window.addEventListener("mousemove", onMove);
     window.addEventListener("mouseup", onUp);
+    window.addEventListener("mousedown", onClickEnd, true);
     this.updateCursor(target.laneId);
-    this._onDragMove(nativeEvent);
   }
-  /** 拖拽时夹在相邻点之间，不能越过前后控制点。8.21 */
+  _unbindDragWindow() {
+    const session = this.dragSession;
+    if (!session) return;
+    window.removeEventListener("mousemove", session.onMove);
+    window.removeEventListener("mouseup", session.onUp);
+    if (session.onClickEnd) {
+      window.removeEventListener("mousedown", session.onClickEnd, true);
+    }
+    this.dragSession = null;
+  }
+  /** 拖拽时点跟着鼠标走；夹在相邻点之间，不能越过前后控制点。8.21 */
   _onDragMove(nativeEvent) {
+    if (!this._alive()) return;
     const session = this.dragSession;
     if (!session) return;
     const { chart, target, knot, role } = session;
-    const { offsetX, offsetY } = eventOffsetInChart(chart, nativeEvent);
-    const data = this._pixelToTrend(chart, target, offsetX, offsetY, true);
+    const pos = eventOffsetInChart(chart, nativeEvent);
+    const offsetX = pos.offsetX + (session.grabDX || 0);
+    const offsetY = pos.offsetY + (session.grabDY || 0);
+    const data = this._pixelToDragTrend(chart, target, offsetX, offsetY);
     if (!data) return;
     const range = this._drawValueRange(target, chart, data.depth);
     let depth = snapDepthToEdge(data.depth, range.depthMin, range.depthMax, DEPTH_EDGE_SNAP);
@@ -4803,19 +4919,33 @@ class TrendLineManager {
     this._applyPointerValue(chart, target, knot, knot.depth, clickX, role);
     this.renderLane(target.laneId);
   }
+  /** 拖点用轴 scale 反算，和画点同一套，避免点落在鼠标旁边。8.25 */
+  _pixelToDragTrend(chart, target, offsetX, offsetY) {
+    const finder = findSeriesForDepth(chart, target.paramId, this._firstKnotDepth(target));
+    const fromAxis = axisPairFromPixel(
+      chart,
+      finder.xAxisIndex,
+      finder.yAxisIndex,
+      offsetX,
+      offsetY
+    );
+    if (fromAxis) return fromAxis;
+    return this._pixelToTrend(chart, target, offsetX, offsetY, true);
+  }
   /** emit=false 只结束拖拽不抛事件（右键菜单用）。8.21 */
   _endDrag(emit) {
     const session = this.dragSession;
     if (!session) return;
-    window.removeEventListener("mousemove", session.onMove);
-    window.removeEventListener("mouseup", session.onUp);
-    this.dragSession = null;
+    this._unbindDragWindow();
+    if (!this._alive()) return;
     this._panLockedByHover = false;
     if (this.host && typeof this.host.setInsideDataZoomPanEnabled === "function") {
       this.host.setInsideDataZoomPanEnabled(true);
     }
     this._ignoreClickUntil = Date.now() + 300;
     this.updateCursor(session.target.laneId);
+    this.renderLane(session.target.laneId, true);
+    this._syncCachedOption(session.target.laneId);
     if (emit) this._emitChange(session.target, { redraw: false });
   }
   _clearClickTimer() {
@@ -4827,6 +4957,7 @@ class TrendLineManager {
   /** 抛 trend-change（拖拽过程中不抛，只在松开时抛）；不写回响应式模板。8.22 */
   // redraw=false：本地已画过，避免再 scheduleRender 把线闪掉。8.24
   _emitChange(target, { redraw = true } = {}) {
+    if (!this._alive() || !target) return;
     const segments = cloneSegments(this.store[target.key] && this.store[target.key].segments || []);
     this.host.$emit("trend-change", {
       paramId: target.paramId,
@@ -4838,8 +4969,12 @@ class TrendLineManager {
   /** 等 Vue / 图表 setOption 完成后再画叠加层。8.22 */
   // 只 nextTick 一次，不再叠 rAF 连刷。8.24
   _scheduleRenderAfterVue() {
-    if (this.host && typeof this.host.$nextTick === "function") {
-      this.host.$nextTick(() => this.scheduleRender());
+    if (!this._alive()) return;
+    if (typeof this.host.$nextTick === "function") {
+      this.host.$nextTick(() => {
+        if (!this._alive()) return;
+        this.scheduleRender();
+      });
     } else {
       this.scheduleRender();
     }
@@ -4956,6 +5091,15 @@ class TrendLineManager {
     return pixelToData(chart, target.paramId, offsetX, offsetY, loose);
   }
   _trendToPixel(chart, target, value, depth) {
+    const finder = findSeriesForDepth(chart, target.paramId, depth);
+    const live = axisPairToPixel(
+      chart,
+      finder.xAxisIndex,
+      finder.yAxisIndex,
+      value,
+      depth
+    );
+    if (live) return live;
     const lane = this._laneById(target.laneId);
     if (isLaneLogScale(lane)) {
       return logTrendDataToPixel(chart, target.paramId, value, depth);
@@ -5183,11 +5327,16 @@ const _sfc_main$6 = {
       type: Boolean,
       default: true
     },
-    // 当前选中的泳道ID（用于在头部显示红色边框）
+    // 当前选中的泳道ID（最后一次点选，兼容旧 emit）
     activeLaneId: {
       type: [String, Number],
       default: null
     },
+    // 地应力可同时选中多道。8.25
+    activeLaneIds: {
+      type: Array,
+      default: () => []
+    },
     // 是否为地应力模式（只有为 true 时才启用泳道选中功能）
     isGeomechanical: {
       type: Boolean,
@@ -5260,6 +5409,10 @@ const _sfc_main$6 = {
       clearTimeout(this.resizeTimer);
       this.resizeTimer = null;
     }
+    if (this._curveConfigCloseTimer) {
+      clearTimeout(this._curveConfigCloseTimer);
+      this._curveConfigCloseTimer = 0;
+    }
     if (this.resizeObserver) {
       this.resizeObserver.disconnect();
       this.resizeObserver = null;
@@ -5288,6 +5441,7 @@ const _sfc_main$6 = {
         return;
       }
       this.$nextTick(() => {
+        if (this._isUnmounted) return;
         const containerRef = this.$refs.containerRef;
         if (!containerRef) {
           return;
@@ -5667,10 +5821,11 @@ const _sfc_main$6 = {
     isLaneTrendDraw(lane) {
       return !!(lane && (lane.lines || []).some((line) => isLineDrawable(line)));
     },
-    // 获取泳道头部样式：地应力选中道，或 isDraw 所在道，红色边框
+    // 获取泳道头部样式：地应力已选中的道都画红框。8.25
     getLaneHeaderStyle(lane) {
       const base = this.headerStyle;
-      const isActive = this.isGeomechanical && this.activeLaneId != null && lane && lane.laneId === this.activeLaneId || this.isLaneTrendDraw(lane);
+      const ids = this.activeLaneIds || [];
+      const isActive = this.isGeomechanical ? !!(lane && ids.some((id) => id === lane.laneId)) : this.isLaneTrendDraw(lane);
       if (!isActive) return base;
       return {
         ...base,
@@ -5683,7 +5838,10 @@ const _sfc_main$6 = {
     },
     closeCurveConfigDialog() {
       this.curveConfigClosing = true;
-      setTimeout(() => {
+      if (this._curveConfigCloseTimer) clearTimeout(this._curveConfigCloseTimer);
+      this._curveConfigCloseTimer = setTimeout(() => {
+        this._curveConfigCloseTimer = 0;
+        if (this._isUnmounted) return;
         this.curveConfigVisible = false;
         this.curveConfigClosing = false;
       }, 300);
@@ -6691,7 +6849,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["modelValue", "onClose"])
   ], 544);
 }
-const KdLaneContainerComponent = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-9d96e270"]]);
+const KdLaneContainerComponent = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-814fbe51"]]);
 const SLIDER_GROUP_ID = "depthSliderGroup";
 function pad2(n) {
   return n < 10 ? "0" + n : "" + n;
@@ -9298,11 +9456,86 @@ const _sfc_main$3 = {
         const model = this.chart.getModel();
         const list = model.queryComponents({ mainType: "graphic" }) || [];
         if (!list.length) return;
-        const graphic = list.map((m) => m.option).filter((item) => item && (item.id || item.elements || item.type));
+        const graphic = list.map((m) => m.option).filter((item) => {
+          if (!item || !(item.id || item.elements || item.type)) return false;
+          const id = String(item.id || "");
+          return id.indexOf("trend_") !== 0;
+        });
         if (graphic.length) options.graphic = graphic;
       } catch (e) {
       }
     },
+    // notMerge 时把笛卡尔趋势 series 带回去，避免先消失再画。8.25
+    // 只拷绘制字段，禁止展开 model.option（会带上坐标系等内部引用，图表拆不掉）。8.25
+    _copyTrendSeriesOption(opt, id) {
+      if (!opt) return null;
+      const ls = opt.lineStyle || {};
+      const is = opt.itemStyle || {};
+      return {
+        id: opt.id || id,
+        name: "trend",
+        type: "line",
+        data: Array.isArray(opt.data) ? opt.data.slice() : [],
+        xAxisIndex: opt.xAxisIndex,
+        yAxisIndex: opt.yAxisIndex,
+        clip: opt.clip,
+        animation: false,
+        silent: true,
+        large: false,
+        z: opt.z,
+        zlevel: 0,
+        symbol: opt.symbol,
+        symbolSize: opt.symbolSize,
+        showSymbol: opt.showSymbol,
+        hoverAnimation: false,
+        legendHoverLink: false,
+        connectNulls: false,
+        tooltip: { show: false },
+        emphasis: { disabled: true },
+        lineStyle: {
+          color: ls.color,
+          width: ls.width,
+          type: ls.type
+        },
+        itemStyle: {
+          color: is.color,
+          borderColor: is.borderColor,
+          borderWidth: is.borderWidth
+        }
+      };
+    },
+    _preserveTrendSeries(options) {
+      if (!options || !this.chart || this.chart.isDisposed()) return;
+      if (options.__kdTrendSynced) return;
+      const incoming = Array.isArray(options.series) ? options.series : [];
+      const hasTrend = incoming.some((s) => {
+        if (!s) return false;
+        const name = Array.isArray(s.name) ? s.name[0] : s.name;
+        if (name === "trend") return true;
+        const id = String(s.id || "");
+        return id.indexOf("trend_") === 0;
+      });
+      if (hasTrend) return;
+      try {
+        const list = this.chart.getModel().getSeries() || [];
+        const trends = [];
+        const seen = /* @__PURE__ */ new Set();
+        for (let i = 0; i < list.length; i++) {
+          const sm = list[i];
+          const opt = sm && sm.option || {};
+          const name = Array.isArray(sm.name) ? sm.name[0] : sm.name;
+          const id = String(opt.id || sm.id || "");
+          if (name !== "trend" && id.indexOf("trend_") !== 0) continue;
+          if (!id || seen.has(id)) continue;
+          seen.add(id);
+          const copied = this._copyTrendSeriesOption(opt, id);
+          if (copied) trends.push(copied);
+        }
+        if (!trends.length) return;
+        options.series = incoming.concat(trends);
+      } catch (e) {
+      }
+    },
     // dataZoom 写进即将下发的 option，不再二次 setOption 打断 Chrome 平移。8.24
     _applySavedDataZoomToOptions(options, savedState) {
       if (!savedState || !options) return;
@@ -9352,6 +9585,7 @@ const _sfc_main$3 = {
         const next = this.getOptionsWithTheme(options, skipClone);
         this._applySavedDataZoomToOptions(next, savedDataZoom);
         this._preserveGraphic(next);
+        this._preserveTrendSeries(next);
         this.delegateMethod("setOption", next, {
           notMerge: !!notMerge,
           lazyUpdate: !!lazyUpdate
@@ -9518,6 +9752,7 @@ const _sfc_main$3 = {
               const next = this.getOptionsWithTheme(val);
               this._applySavedDataZoomToOptions(next, savedDataZoom);
               this._preserveGraphic(next);
+              this._preserveTrendSeries(next);
               this.chart.setOption(next, {
                 notMerge: this.skipClone || val !== oldVal
               });
@@ -9613,7 +9848,7 @@ const _hoisted_1$3 = { class: "echarts" };
 function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", _hoisted_1$3);
 }
-const resizeEcharts = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-c1cce4a1"]]);
+const resizeEcharts = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3], ["__scopeId", "data-v-5b44c8a6"]]);
 const DRAW_POINT_MIN = 600;
 const DRAW_POINT_MAX = 1800;
 function getSeriesDrawThreshold(laneHeightPx) {
@@ -9994,6 +10229,7 @@ const _sfc_main$2 = {
       selectedParamId: null,
       // 当前选中的泳道ID（只有该泳道显示缺失点、区块、区块点）
       activeLaneId: null,
+      activeLaneIds: [],
       currentMarkAreaIndex: -1,
       // 每个泳道的选中点对数组，每对包含两个点形成区块，与 markArea 通过 markAreaId 关联
       laneSelectedPointPairs: {},
@@ -10030,6 +10266,8 @@ const _sfc_main$2 = {
     this._isPanning = false;
     this._isZooming = false;
     this._zoomIdleTimer = 0;
+    this._geoClickTimer = 0;
+    this._laneZrHandlers = /* @__PURE__ */ Object.create(null);
     this._connectDetached = false;
     this._savedConnectGroups = null;
     this._tipHtmlBucket = "";
@@ -10039,7 +10277,7 @@ const _sfc_main$2 = {
       this._pointerRaf = 0;
       const pending = this._pendingPointer;
       if (!pending || !this.pointerInChartArea) return;
-      const { chart, x, y } = pending;
+      const { chart, x, y, clientY } = pending;
       if (!chart || chart.isDisposed()) {
         this._pendingPointer = null;
         return;
@@ -10078,7 +10316,18 @@ const _sfc_main$2 = {
       clearTimeout(this._zoomIdleTimer);
       this._zoomIdleTimer = 0;
     }
-    if (this.trendLineManager) this.trendLineManager.destroy();
+    if (this._geoClickTimer) {
+      clearTimeout(this._geoClickTimer);
+      this._geoClickTimer = 0;
+    }
+    Object.keys(this._laneZrHandlers || {}).forEach((laneId) => {
+      this._unbindLaneZrEvents(laneId);
+    });
+    this._laneZrHandlers = /* @__PURE__ */ Object.create(null);
+    if (this.trendLineManager) {
+      this.trendLineManager.destroy();
+      this.trendLineManager = null;
+    }
     if (this._pointerRaf) {
       cancelAnimationFrame(this._pointerRaf);
       this._pointerRaf = 0;
@@ -10099,6 +10348,7 @@ const _sfc_main$2 = {
     this.attachChartConnect();
     this.unbindChartPointerSync();
     echarts.disConnect(this.group);
+    this.chartRefMap = /* @__PURE__ */ Object.create(null);
     this.clearEcharts();
     if (this.resizeObserver) {
       this.resizeObserver.disconnect();
@@ -10118,6 +10368,7 @@ const _sfc_main$2 = {
     async laneWidthChange(widthMap) {
       this.laneWidthMap = widthMap || {};
       await this.$nextTick();
+      if (this._isUnmounted) return;
       this.updateLanesChartOption();
     },
     // 曲线上方对数刻度：边控关则只藏尺。8.22对数轴
@@ -10182,43 +10433,77 @@ const _sfc_main$2 = {
           flex: "1"
         });
       }
-      const isDrawLane = this.isLaneTrendDrawById(laneId);
-      if (this.isGeomechanical || isDrawLane) {
-        const isActive = this.activeLaneId === laneId || isDrawLane;
+      if (this.isGeomechanical) {
+        style.boxSizing = "border-box";
+        style.border = this.isLaneSelected(laneId) ? "1px solid #F86C59" : "1px solid transparent";
+      } else if (this.isLaneTrendDrawById(laneId)) {
         style.boxSizing = "border-box";
-        style.border = isActive ? "1px solid #F86C59" : "1px solid transparent";
+        style.border = "1px solid #F86C59";
       }
       return style;
     },
+    // 按引用摘掉 click/dblclick，避免 zr.off(类型) 误拆趋势线 dblclick。8.25
+    _unbindLaneZrEvents(laneId) {
+      const rec = this._laneZrHandlers && this._laneZrHandlers[laneId];
+      if (!rec) return;
+      try {
+        const chart = rec.chart;
+        if (chart && typeof chart.getZr === "function" && !chart.isDisposed()) {
+          const zr = chart.getZr();
+          if (zr) {
+            if (rec.onContext) zr.off("contextmenu", rec.onContext);
+            if (rec.onClick) zr.off("click", rec.onClick);
+            if (rec.onDbl) zr.off("dblclick", rec.onDbl);
+          }
+        }
+      } catch (e) {
+      }
+      rec.chart = null;
+      rec.onContext = null;
+      rec.onClick = null;
+      rec.onDbl = null;
+      delete this._laneZrHandlers[laneId];
+    },
+    _bindLaneZrEvents(laneId, chart) {
+      this._unbindLaneZrEvents(laneId);
+      if (!chart || chart.isDisposed()) return;
+      let zr;
+      try {
+        zr = chart.getZr();
+      } catch (e) {
+        return;
+      }
+      if (!zr) return;
+      const onContext = (e) => this.handleChartRightClick(e, laneId);
+      const onClick = (e) => this.handleChartClick(e, laneId);
+      const onDbl = (e) => this.handleChartDblClick(e, laneId);
+      zr.on("contextmenu", onContext);
+      zr.on("click", onClick);
+      zr.on("dblclick", onDbl);
+      this._laneZrHandlers[laneId] = { chart, onContext, onClick, onDbl };
+    },
     setChartRef(laneId, el) {
       if (el) {
-        if (this.chartRefMap[laneId] && this.chartRefMap[laneId].chart) {
-          this.chartRefMap[laneId].chart.getZr().off("contextmenu");
-          this.chartRefMap[laneId].chart.getZr().off("click");
+        const prev = this.chartRefMap[laneId];
+        if (prev && prev.chart && prev.chart !== el.chart) {
+          this._unbindLaneZrEvents(laneId);
         }
         this.chartRefMap[laneId] = el;
-        el.chart && el.chart.getZr().on("contextmenu", (e) => this.handleChartRightClick(e, laneId));
-        el.chart && el.chart.getZr().on("click", (e) => this.handleChartClick(e, laneId));
+        if (el.chart) this._bindLaneZrEvents(laneId, el.chart);
         if (el.chart && this.trendLineManager) {
           this.trendLineManager.bindChart(laneId, el.chart);
         }
       } else if (this.chartRefMap[laneId]) {
         if (this.trendLineManager) this.trendLineManager.unbindChart(laneId);
-        this.chartRefMap[laneId].chart && this.chartRefMap[laneId].chart.getZr().off("contextmenu");
-        this.chartRefMap[laneId].chart && this.chartRefMap[laneId].chart.getZr().off("click");
+        this._unbindLaneZrEvents(laneId);
         delete this.chartRefMap[laneId];
       }
     },
     handleChartInited(laneId, chart) {
-      if (this.chartRefMap[laneId]) {
-        this.chartRefMap[laneId].chart.getZr().off("contextmenu");
-        this.chartRefMap[laneId].chart.getZr().off("click");
-      }
-      chart.getZr().on("contextmenu", (e) => this.handleChartRightClick(e, laneId));
-      chart.getZr().on("click", (e) => this.handleChartClick(e, laneId));
+      this._bindLaneZrEvents(laneId, chart);
       if (this.trendLineManager) {
         this.trendLineManager.bindChart(laneId, chart);
-        this.applyLineListData();
+        if ((this.lineListData || []).length) this.applyLineListData();
         this.trendLineManager.scheduleRender();
       }
       this.scheduleConnectAllCharts();
@@ -10230,14 +10515,24 @@ const _sfc_main$2 = {
       this.getConnectedCharts().forEach((chart) => {
         if (!chart || chart.isDisposed()) return;
         const laneId = this.findLaneIdByChart(chart);
-        chart.setOption({
-          dataZoom: [
-            this.buildInsideDataZoom(
-              !!enabled,
-              this.dataZoomFilterModeForLane(this.findLaneById(laneId))
-            )
-          ]
-        });
+        const next = this.buildInsideDataZoom(
+          !!enabled,
+          this.dataZoomFilterModeForLane(this.findLaneById(laneId))
+        );
+        try {
+          const dz = chart.getModel().getComponent("dataZoom", 0);
+          const opt = dz && dz.option;
+          if (opt) {
+            if (opt.start != null) next.start = opt.start;
+            if (opt.end != null) next.end = opt.end;
+            if (opt.startValue != null) next.startValue = opt.startValue;
+            if (opt.endValue != null) next.endValue = opt.endValue;
+          }
+          const skip = this.trendLineManager && this.trendLineManager.dataZoomSeriesIndex(chart);
+          if (skip && skip.length) next.seriesIndex = skip;
+        } catch (e) {
+        }
+        chart.setOption({ dataZoom: [next] }, { silent: true, lazyUpdate: false });
       });
     },
     getConnectedCharts() {
@@ -10249,7 +10544,7 @@ const _sfc_main$2 = {
     // 趋势线控制点右键菜单（删除控制点） 8.21
     showTrendKnotContextMenu(e, payload) {
       this.currentContextMenuType = "trendKnot";
-      this.currentPointInfo = payload;
+      this.currentPointInfo = markRaw(payload);
       this.currentContextMenuItems = [{ label: "删除控制点", action: "deleteTrendKnot" }];
       this.calculateContextMenuPosition(e);
       this.contextMenuVisible = true;
@@ -10282,6 +10577,85 @@ const _sfc_main$2 = {
     resetAllTrendLines() {
       if (this.trendLineManager) this.trendLineManager.resetAllTrendLines();
     },
+    isLaneSelected(laneId) {
+      return laneId != null && (this.activeLaneIds || []).some((id) => id === laneId);
+    },
+    addLaneSelection(laneId) {
+      if (laneId == null) return false;
+      this.activeLaneId = laneId;
+      if (this.isLaneSelected(laneId)) return false;
+      this.activeLaneIds = this.activeLaneIds.concat([laneId]);
+      return true;
+    },
+    removeLaneSelection(laneId) {
+      if (!this.isLaneSelected(laneId)) return;
+      this.activeLaneIds = (this.activeLaneIds || []).filter((id) => id !== laneId);
+      if (this.activeLaneId === laneId) {
+        this.activeLaneId = this.activeLaneIds.length ? this.activeLaneIds[this.activeLaneIds.length - 1] : null;
+      }
+    },
+    // 退出编辑：清掉全部选中红框，不挂新监听。8.25
+    clearActiveLane() {
+      this._clearGeoClickTimer();
+      this._geoSelectClickAt = 0;
+      this._geoSelectLaneId = null;
+      this._lastBlankClickTime = null;
+      this._lastBlankClickLaneId = null;
+      const ids = (this.activeLaneIds || []).slice();
+      if (this.selectedPoints.length > 0 && this.selectedLaneId) {
+        if (this.laneSelectedPointPairs[this.selectedLaneId]) {
+          this.laneSelectedPointPairs[this.selectedLaneId].pop();
+        }
+        this.selectedPoints = [];
+        this.selectedLaneId = null;
+        this.selectedParamId = null;
+      }
+      this.activeLaneIds = [];
+      this.activeLaneId = null;
+      if (!ids.length) return;
+      this.updateLanesChartOption().then(() => {
+        if (this._isUnmounted) return;
+        ids.forEach((id) => this.showSelectedPointScatter(id));
+      });
+    },
+    // 切趋势线：只保留当前曲线所在道；单击其它道仍可再选中。8.25
+    selectLaneByParamId(paramId) {
+      if (!this.isGeomechanical) return;
+      if (paramId == null || paramId === "") {
+        this.clearActiveLane();
+        return;
+      }
+      const lanes = this.currentTemplate && this.currentTemplate.lanes || [];
+      let laneId = null;
+      for (let i = 0; i < lanes.length; i++) {
+        const lane = lanes[i];
+        if ((lane.lines || []).some((line) => String(line.paramId) === String(paramId))) {
+          laneId = lane.laneId;
+          break;
+        }
+      }
+      if (!laneId) return;
+      const prevIds = (this.activeLaneIds || []).slice();
+      if (prevIds.length === 1 && prevIds[0] === laneId) {
+        this.activeLaneId = laneId;
+        return;
+      }
+      if (this.selectedPoints.length > 0 && this.selectedLaneId && this.selectedLaneId !== laneId) {
+        if (this.laneSelectedPointPairs[this.selectedLaneId]) {
+          this.laneSelectedPointPairs[this.selectedLaneId].pop();
+        }
+        this.selectedPoints = [];
+        this.selectedLaneId = null;
+        this.selectedParamId = null;
+      }
+      this.activeLaneIds = [laneId];
+      this.activeLaneId = laneId;
+      this.updateLanesChartOption().then(() => {
+        if (this._isUnmounted) return;
+        prevIds.forEach((id) => this.showSelectedPointScatter(id));
+        this.showSelectedPointScatter(laneId);
+      });
+    },
     // 根据 paramId 判断曲线是否可见（isUsed === '1'）
     isLineVisibleByParamId(paramId) {
       const lanes = this.currentTemplate && this.currentTemplate.lanes || [];
@@ -10400,7 +10774,7 @@ const _sfc_main$2 = {
           const sm = seriesList[s];
           const option = sm.option || {};
           const name = this.unwrapEchartsValue(sm.name);
-          if (name === "helper" || name === "log-grid") continue;
+          if (name === "helper" || name === "log-grid" || name === "trend") continue;
           const type = sm.subType || this.unwrapEchartsValue(option.type);
           if (type && type !== "line") continue;
           const tip = option.tooltip;
@@ -10561,6 +10935,7 @@ const _sfc_main$2 = {
       if (!series || !Array.isArray(series.data) || !series.data.length) return false;
       if (this.seriesDisplayName(series) === "helper") return false;
       if (this.seriesDisplayName(series) === "log-grid") return false;
+      if (this.seriesDisplayName(series) === "trend") return false;
       const type = this.seriesTypeName(series);
       if (type && type !== "line") return false;
       if (this.seriesTooltipHidden(series)) return false;
@@ -10715,8 +11090,8 @@ const _sfc_main$2 = {
       el.style.transform = `translate3d(0, ${top}px, 0)`;
       if (!this.crosshairVisible) this.crosshairVisible = true;
     },
-    schedulePointerSync(chart, x, y) {
-      this._pendingPointer = { chart, x, y };
+    schedulePointerSync(chart, x, y, clientY) {
+      this._pendingPointer = { chart, x, y, clientY };
       if (this._pointerRaf) return;
       this._pointerRaf = requestAnimationFrame(this._flushPointerSync);
     },
@@ -10856,6 +11231,7 @@ const _sfc_main$2 = {
     },
     startChartPan() {
       if (!this.isGeomechanical || this._isPanning) return;
+      if (this._chartPanLocked) return;
       this._isPanning = true;
       this.attachChartConnect();
       this.hideLaneTooltipsForPan();
@@ -10879,6 +11255,7 @@ const _sfc_main$2 = {
       this._zoomIdleTimer = 0;
       if (!this._isZooming) return;
       this._isZooming = false;
+      if (!this._isPanning && this.trendLineManager) this.trendLineManager.endFollowView();
       this.restorePointerAfterInteract();
     },
     hideAllLaneTooltips(event) {
@@ -10955,7 +11332,8 @@ const _sfc_main$2 = {
           this.schedulePointerSync(
             chart,
             e.offsetX ?? ((_a = e.event) == null ? void 0 : _a.offsetX),
-            e.offsetY ?? ((_b = e.event) == null ? void 0 : _b.offsetY)
+            e.offsetY ?? ((_b = e.event) == null ? void 0 : _b.offsetY),
+            native.clientY
           );
         };
         zr.on("mousedown", onDown);
@@ -10995,11 +11373,13 @@ const _sfc_main$2 = {
       if (this.trendLineManager) this.trendLineManager.hydrateFromTemplate(template);
       this.applyLineListData();
       await this.$nextTick();
+      if (this._isUnmounted) return;
       this.updateLanesChartOption();
     },
     // 线段变化
     async lineChange() {
       await this.$nextTick();
+      if (this._isUnmounted) return;
       this.updateLanesChartOption();
     },
     // 初始化窗口大小范围以及windowSize默认值
@@ -11174,10 +11554,10 @@ const _sfc_main$2 = {
       ref.mergeOptions(option, true, false, true);
     },
     // 判断指定泳道是否应该显示tooltip内容
-    // 地应力模式下：如果没有选中泳道，所有泳道正常显示；如果有选中泳道，只有选中的泳道显示
+    // 地应力：无选中时所有泳道显示；有选中时已选中的多道都显示。8.25
     shouldShowTooltipContent(laneId) {
       if (!this.showTooltip) return false;
-      if (this.isGeomechanical && this.activeLaneId && laneId !== this.activeLaneId) {
+      if (this.isGeomechanical && (this.activeLaneIds || []).length && !this.isLaneSelected(laneId)) {
         return false;
       }
       return true;
@@ -11633,7 +12013,7 @@ const _sfc_main$2 = {
             return { data: [[x, group.min], [x, group.max]] };
           }
           const type = sm.subType || this.unwrapEchartsValue(opt.type);
-          if (name === "log-grid" || type !== "line") return {};
+          if (name === "log-grid" || name === "trend" || type !== "line") return {};
           const paramId = this.unwrapEchartsValue(opt.paramId);
           if (paramId == null) return {};
           const cacheKey = `${gi}:${paramId}:${isLog ? 1 : 0}`;
@@ -11665,7 +12045,6 @@ const _sfc_main$2 = {
         } catch (e) {
         }
       });
-      if (this.trendLineManager) this.trendLineManager.scheduleZoomRender();
     },
     // 处理键盘按下事件
     handleKeyDown(e) {
@@ -12250,6 +12629,7 @@ const _sfc_main$2 = {
     },
     // 更新泳道图表选项
     async updateLanesChartOption(transferData) {
+      if (this._isUnmounted) return;
       if (this.isUpdatingChart) {
         this.pendingChartUpdate = true;
         return;
@@ -12567,7 +12947,7 @@ const _sfc_main$2 = {
                   if (rangeAreaSeries) {
                     option.series.push(rangeAreaSeries);
                   }
-                  if (lineInfo.isUsed === "1" && this.isGeomechanical && lane.laneId === this.activeLaneId) {
+                  if (lineInfo.isUsed === "1" && this.isGeomechanical && this.isLaneSelected(lane.laneId)) {
                     const boundaryPoints = this.findMissingDataBoundaryPoints(
                       this.plotSeries(groupSeriesData, isLogScale)
                     );
@@ -12720,12 +13100,17 @@ const _sfc_main$2 = {
             option.tooltip.extraCssText = "pointer-events: none !important;";
             option.tooltip.formatter = () => this.renderLaneTooltipHtml(laneId);
           }
+          if (this.trendLineManager) this.trendLineManager.appendSeriesToOption(option, lane);
           this.updateOptionsByLineId(lane.laneId, option);
         }
       } catch (error) {
         console.error("updateLanesChartOption error:", error);
       } finally {
         this.isUpdatingChart = false;
+        if (this._isUnmounted) {
+          this.pendingChartUpdate = false;
+          return;
+        }
         this.scheduleConnectAllCharts();
         const lanesToRefresh = new Set(
           Object.keys(this.laneSelectedPointPairs || {})
@@ -12733,6 +13118,7 @@ const _sfc_main$2 = {
         if (this.selectedLaneId) lanesToRefresh.add(this.selectedLaneId);
         if (lanesToRefresh.size > 0) {
           this.$nextTick(() => {
+            if (this._isUnmounted) return;
             lanesToRefresh.forEach((lid) => {
               this.showSelectedPointScatter(lid);
             });
@@ -12741,13 +13127,10 @@ const _sfc_main$2 = {
         if (this.pendingChartUpdate) {
           this.pendingChartUpdate = false;
           this.$nextTick(() => {
+            if (this._isUnmounted) return;
             this.updateLanesChartOption(transferData);
           });
         }
-        if (this.trendLineManager) {
-          this.trendLineManager.scheduleZoomRender();
-          this.$nextTick(() => this.trendLineManager.scheduleZoomRender());
-        }
       }
     },
     /**
@@ -13040,85 +13423,172 @@ const _sfc_main$2 = {
       }
       return boundaryPoints;
     },
-    async handleChartClick(e, laneId) {
-      var _a, _b, _c;
-      const chartRef = this.getChartRefByLaneId(laneId);
-      if (!chartRef || !chartRef.chart) return;
-      if (this.trendLineManager && this.trendLineManager.handleClick(e, laneId)) {
-        return;
-      }
-      if (!this.isGeomechanical) return;
-      const wasActiveLane = this.activeLaneId === laneId;
-      if (this.activeLaneId !== laneId) {
-        const prevActiveLaneId = this.activeLaneId;
-        this.activeLaneId = laneId;
-        await this.updateLanesChartOption();
-        if (prevActiveLaneId) {
-          this.showSelectedPointScatter(prevActiveLaneId);
+    // 只把点击附近的点转成像素。全量 convertToPixel 会堵住主线程，双击 500ms 对不上。8.25
+    findClosestGeoLineHit(chart, option, pointInPixel, pixelThreshold, laneId) {
+      var _a;
+      const threshold = pixelThreshold || 10;
+      const px = pointInPixel[0];
+      const py = pointInPixel[1];
+      const seriesList = option && option.series || [];
+      let closest = null;
+      let closestDistance = threshold;
+      for (let i = 0; i < seriesList.length; i++) {
+        const series2 = seriesList[i];
+        if (!series2 || series2.type !== "line") continue;
+        const name = Array.isArray(series2.name) ? series2.name[0] : series2.name;
+        if (name === "helper" || name === "log-grid" || name === "trend") continue;
+        const id = String(series2.id || "");
+        if (id.indexOf("trend_") === 0) continue;
+        let clickData;
+        try {
+          clickData = chart.convertFromPixel({ seriesIndex: i }, [px, py]);
+        } catch (err) {
+          continue;
         }
-      }
-      const chart = chartRef.chart;
-      const option = this.readChartOptionRefs(chart);
-      const pointInPixel = [
-        e.offsetX || ((_a = e.event) == null ? void 0 : _a.offsetX),
-        e.offsetY || ((_b = e.event) == null ? void 0 : _b.offsetY)
-      ];
-      let clickedPoint = null;
-      let closestPoint = null;
-      let closestDistance = 10;
-      const axisKey = this.currentToolBarConfig.axisTypeList && this.currentToolBarConfig.axisTypeList[this.formCache.axisType] || (this.formCache.axisType === "time" ? "time" : "depth");
-      for (let i = 0; i < option.series.length; i++) {
-        const series = option.series[i];
-        if (series.name === "helper" || series.name === "log-grid") continue;
-        if (series.type !== "line") continue;
-        const data = series.data || [];
+        if (!clickData || clickData.length < 2) continue;
+        let yTol = Infinity;
+        try {
+          const offset = chart.convertFromPixel({ seriesIndex: i }, [px, py + threshold]);
+          if (offset && offset.length >= 2) {
+            const span = Math.abs(offset[1] - clickData[1]);
+            if (Number.isFinite(span) && span > 0) yTol = span * 1.25;
+          }
+        } catch (err) {
+          yTol = Infinity;
+        }
+        const data = series2.data || [];
         for (let j = 0; j < data.length; j++) {
-          const item = data[j];
-          if (!item) continue;
-          let pointValue;
-          pointValue = Array.isArray(item) ? item : item.value || [];
-          if (!pointValue || !Array.isArray(pointValue) || pointValue.length < 2)
-            continue;
-          const point = chart.convertToPixel({ seriesIndex: i }, pointValue);
+          const item2 = data[j];
+          if (!item2) continue;
+          const pointValue2 = Array.isArray(item2) ? item2 : item2.value || [];
+          if (!pointValue2 || pointValue2.length < 2) continue;
+          if (Number.isFinite(yTol) && Math.abs(pointValue2[1] - clickData[1]) > yTol) continue;
+          const point = chart.convertToPixel({ seriesIndex: i }, pointValue2);
           if (!point) continue;
-          const distance = Math.sqrt(
-            Math.pow(point[0] - pointInPixel[0], 2) + Math.pow(point[1] - pointInPixel[1], 2)
-          );
+          const distance = Math.hypot(point[0] - px, point[1] - py);
           if (distance < closestDistance) {
             closestDistance = distance;
-            const axisValue = pointValue[1];
-            const originalData = this.realTimeData.find(
-              (d) => d[axisKey] == axisValue
-            );
-            const paramId = item.paramId || series.paramId;
-            const lane = (this.currentTemplate && this.currentTemplate.lanes || []).find(
-              (l) => l.laneId === laneId
-            );
-            const originalX = (item.rowData && item.rowData[paramId]) ?? (originalData && originalData[paramId]);
-            option.xAxis && option.xAxis[series.xAxisIndex ?? 0] || {};
-            const useOriginal = originalX != null && Number(originalX) > 0;
-            const drawX = isLaneLogScale(lane) ? toLaneDrawX(
-              useOriginal ? originalX : pointValue[0],
-              lane
-            ) : pointValue[0];
-            closestPoint = {
-              ...item,
-              value: [drawX, pointValue[1], pointValue[2]],
-              seriesIndex: i,
-              dataIndex: j,
-              paramId,
-              lineId: item.lineId || series.lineId,
-              color: series.color,
-              laneId,
-              depth: (originalData == null ? void 0 : originalData.depth) || null,
-              timestamp: ((_c = originalData == null ? void 0 : originalData.timestamp) == null ? void 0 : _c.toString()) || null
-            };
+            closest = { item: item2, series: series2, seriesIndex: i, dataIndex: j, pointValue: pointValue2, distance };
           }
         }
       }
-      if (closestPoint && closestDistance < 10) {
-        clickedPoint = closestPoint;
+      if (!closest) return null;
+      const axisKey = this.currentToolBarConfig.axisTypeList && this.currentToolBarConfig.axisTypeList[this.formCache.axisType] || (this.formCache.axisType === "time" ? "time" : "depth");
+      const { item, series, seriesIndex, dataIndex, pointValue } = closest;
+      const originalData = item && item.rowData || (this.realTimeData || []).find((d) => d[axisKey] == pointValue[1]);
+      const paramId = item && item.paramId || series.paramId;
+      const lane = (this.currentTemplate && this.currentTemplate.lanes || []).find(
+        (l) => l.laneId === laneId
+      );
+      const originalX = (item.rowData && item.rowData[paramId]) ?? (originalData && originalData[paramId]);
+      option.xAxis && option.xAxis[series.xAxisIndex ?? 0] || {};
+      const useOriginal = originalX != null && Number(originalX) > 0;
+      const drawX = isLaneLogScale(lane) ? toLaneDrawX(
+        useOriginal ? originalX : pointValue[0],
+        lane
+      ) : pointValue[0];
+      return {
+        ...item,
+        value: [drawX, pointValue[1], pointValue[2]],
+        seriesIndex,
+        dataIndex,
+        paramId,
+        lineId: item && item.lineId || series.lineId,
+        color: series.color,
+        laneId,
+        depth: (originalData == null ? void 0 : originalData.depth) || null,
+        timestamp: ((_a = originalData == null ? void 0 : originalData.timestamp) == null ? void 0 : _a.toString()) || null
+      };
+    },
+    _clearGeoClickTimer() {
+      if (this._geoClickTimer) {
+        clearTimeout(this._geoClickTimer);
+        this._geoClickTimer = 0;
+      }
+    },
+    // 地应力：双击已选中泳道，只取消这一道，其它选中保留。8.25
+    handleChartDblClick(e, laneId) {
+      if (this._isUnmounted || !this.isGeomechanical) return;
+      this._clearGeoClickTimer();
+      if (!this.isLaneSelected(laneId)) return;
+      if (this._geoSelectClickAt && this._geoSelectLaneId === laneId && Date.now() - this._geoSelectClickAt < 500) {
+        return;
+      }
+      this.deselectGeoLane(laneId);
+    },
+    async deselectGeoLane(laneId) {
+      const id = laneId != null ? laneId : this.activeLaneId;
+      this._lastBlankClickTime = null;
+      this._lastBlankClickLaneId = null;
+      if (!id || !this.isLaneSelected(id)) return;
+      if (this.selectedPoints.length > 0 && this.selectedLaneId === id) {
+        if (this.laneSelectedPointPairs[this.selectedLaneId]) {
+          this.laneSelectedPointPairs[this.selectedLaneId].pop();
+        }
+        this.selectedPoints = [];
+        this.selectedLaneId = null;
+        this.selectedParamId = null;
+      }
+      this.removeLaneSelection(id);
+      await this.updateLanesChartOption();
+      if (this._isUnmounted) return;
+      this.showSelectedPointScatter(id);
+    },
+    async handleChartClick(e, laneId) {
+      var _a, _b, _c, _d;
+      if (this._isUnmounted) return;
+      const clickAt = Date.now();
+      const chartRef = this.getChartRefByLaneId(laneId);
+      if (!chartRef || !chartRef.chart) return;
+      const wasActiveLane = this.isLaneSelected(laneId);
+      const trendConsumed = this.trendLineManager && this.trendLineManager.handleClick(e, laneId);
+      if (!this.isGeomechanical) return;
+      if (!wasActiveLane) {
+        this._geoSelectClickAt = clickAt;
+        this._geoSelectLaneId = laneId;
+        this.addLaneSelection(laneId);
+        await this.updateLanesChartOption();
+        if (this._isUnmounted) return;
+        this.showSelectedPointScatter(laneId);
+      }
+      if (trendConsumed) return;
+      if (wasActiveLane) {
+        this._clearGeoClickTimer();
+        const offsetX = e.offsetX || ((_a = e.event) == null ? void 0 : _a.offsetX);
+        const offsetY = e.offsetY || ((_b = e.event) == null ? void 0 : _b.offsetY);
+        this._geoClickTimer = setTimeout(() => {
+          this._geoClickTimer = 0;
+          if (this._isUnmounted) return;
+          this.processGeoPointOrBlank(laneId, offsetX, offsetY, clickAt, true);
+        }, 280);
+        return;
       }
+      const pointInPixel = [
+        e.offsetX || ((_c = e.event) == null ? void 0 : _c.offsetX),
+        e.offsetY || ((_d = e.event) == null ? void 0 : _d.offsetY)
+      ];
+      await this.processGeoPointOrBlank(
+        laneId,
+        pointInPixel[0],
+        pointInPixel[1],
+        clickAt,
+        false
+      );
+    },
+    async processGeoPointOrBlank(laneId, offsetX, offsetY, clickAt, wasActiveLane) {
+      if (this._isUnmounted) return;
+      const chartRef = this.getChartRefByLaneId(laneId);
+      if (!chartRef || !chartRef.chart) return;
+      const chart = chartRef.chart;
+      const option = this.readChartOptionRefs(chart);
+      const closestPoint = this.findClosestGeoLineHit(
+        chart,
+        option,
+        [offsetX, offsetY],
+        10,
+        laneId
+      );
+      const clickedPoint = closestPoint || null;
       if (clickedPoint) {
         this._lastBlankClickTime = null;
         this._lastBlankClickLaneId = null;
@@ -13177,18 +13647,19 @@ const _sfc_main$2 = {
           this.showSelectedPointScatter(laneId);
         }
         if (wasActiveLane) {
-          const now = Date.now();
+          const now = clickAt;
           if (this._lastBlankClickLaneId === laneId && this._lastBlankClickTime && now - this._lastBlankClickTime < 500) {
             this._lastBlankClickTime = null;
             this._lastBlankClickLaneId = null;
-            if (this.selectedPoints.length > 0 && this.selectedLaneId) {
+            if (this.selectedPoints.length > 0 && this.selectedLaneId === laneId) {
               this.laneSelectedPointPairs[this.selectedLaneId].pop();
               this.selectedPoints = [];
               this.selectedLaneId = null;
               this.selectedParamId = null;
             }
-            this.activeLaneId = null;
+            this.removeLaneSelection(laneId);
             await this.updateLanesChartOption();
+            if (this._isUnmounted) return;
           } else {
             this._lastBlankClickTime = now;
             this._lastBlankClickLaneId = laneId;
@@ -13199,12 +13670,13 @@ const _sfc_main$2 = {
         }
       }
       await this.$nextTick();
+      if (this._isUnmounted) return;
       this.showSelectedPointScatter(laneId);
     },
     // 收集某泳道所有需要展示 scatter 的点：已完成区块的两个点 + 进行中的第一个点
-    // 仅在地应力模式下的当前激活泳道才收集并显示
+    // 地应力已选中的泳道都收集并显示。8.25
     collectScatterPointsForLane(laneId) {
-      if (!this.isGeomechanical || laneId !== this.activeLaneId) return [];
+      if (!this.isGeomechanical || !this.isLaneSelected(laneId)) return [];
       const points = [];
       const pairs = this.laneSelectedPointPairs[laneId] || [];
       pairs.forEach((pair) => {
@@ -13333,15 +13805,9 @@ const _sfc_main$2 = {
         return;
       }
       if (!this.isGeomechanical) return;
-      if (this.activeLaneId !== laneId) {
-        const prevActiveLaneId = this.activeLaneId;
-        this.activeLaneId = laneId;
+      if (!this.isLaneSelected(laneId)) {
+        this.addLaneSelection(laneId);
         this.updateLanesChartOption();
-        if (prevActiveLaneId) {
-          this.$nextTick(() => {
-            this.showSelectedPointScatter(prevActiveLaneId);
-          });
-        }
       }
       const chart = chartRef.chart;
       const pointInPixel = [
@@ -13956,7 +14422,7 @@ const _sfc_main$2 = {
       for (let i = 0; i < currentMarkAreaData.length; i++) {
         const areaItem = currentMarkAreaData[i];
         if (!areaItem.data || areaItem.data.length < 2) continue;
-        if (lineInfo.laneId !== this.activeLaneId && areaItem.type === "markArea")
+        if (!this.isLaneSelected(lineInfo.laneId) && areaItem.type === "markArea")
           continue;
         const hasTimestamp = areaItem.data[0].timestamp;
         const sortedData = hasTimestamp ? [...areaItem.data].sort(
@@ -14410,7 +14876,7 @@ const _sfc_main$2 = {
                     }
                   }
                   seriesIndex++;
-                  if (lineInfo.isUsed === "1" && this.isGeomechanical && lane.laneId === this.activeLaneId) {
+                  if (lineInfo.isUsed === "1" && this.isGeomechanical && this.isLaneSelected(lane.laneId)) {
                     const boundaryPoints = this.findMissingDataBoundaryPoints(
                       this.plotSeries(seriesData, isLogScale)
                     );
@@ -14493,10 +14959,6 @@ const _sfc_main$2 = {
       } finally {
         this.isUpdatingChart = false;
         this.scheduleConnectAllCharts();
-        if (this.trendLineManager) {
-          this.trendLineManager.scheduleZoomRender();
-          this.$nextTick(() => this.trendLineManager.scheduleZoomRender());
-        }
       }
     },
     // 清空所有图表实例
@@ -14522,6 +14984,7 @@ const _sfc_main$2 = {
         this.markAreaLineData = [];
         this.laneSelectedPointPairs = {};
         this.activeLaneId = null;
+        this.activeLaneIds = [];
         this.lineRange = {};
         this.pendingRequestData = null;
         this.initialRealTimeData = {};
@@ -15012,7 +15475,8 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
         visibleData: $data.visibleData,
         headerData: $data.headerData,
         lineRange: $data.lineRange,
-        activeLaneId: $data.activeLaneId
+        activeLaneId: $data.activeLaneId,
+        activeLaneIds: $data.activeLaneIds
       }), createSlots({ _: 2 }, [
         renderList($props.headerSlotName, (lane) => {
           return {
@@ -15112,7 +15576,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1040, ["onTemplateChange", "onLineChange", "onLaneWidthChange", "onParamsChange", "visibleData", "headerData", "lineRange", "activeLaneId"])
+      ]), 1040, ["onTemplateChange", "onLineChange", "onLaneWidthChange", "onParamsChange", "visibleData", "headerData", "lineRange", "activeLaneId", "activeLaneIds"])
     ], 512),
     withDirectives(createElementVNode("div", _hoisted_2$2, null, 512), [
       [vShow, $data.crosshairVisible]
@@ -15155,7 +15619,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
             ], 40, _hoisted_3$1)) : (openBlock(), createElementBlock("div", {
               key: 1,
               class: "context-menu-item",
-              onClick: ($event) => $options.handleContextMenuItemClick(item)
+              onClick: withModifiers(($event) => $options.handleContextMenuItemClick(item), ["stop"])
             }, [
               createElementVNode("span", null, toDisplayString(item.label), 1)
             ], 8, _hoisted_5))
@@ -15167,7 +15631,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 544);
 }
-const chartContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-22f7e692"]]);
+const chartContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-9a816c60"]]);
 const _sfc_main$1 = {
   name: "ParameterPanel",
   props: {
@@ -16313,6 +16777,12 @@ const _sfc_main = {
         this.$refs.chartContainer.resetAllTrendLines();
       }
     },
+    // 退出编辑时清掉泳道选中。8.25
+    clearActiveLane() {
+      if (this.$refs.chartContainer && this.$refs.chartContainer.clearActiveLane) {
+        this.$refs.chartContainer.clearActiveLane();
+      }
+    },
     // 新增：更新form数据缓存
     updateForm(content) {
       let key = cloneDeep(content.key);
@@ -16682,7 +17152,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ])])) : createCommentVNode("", true)
   ]);
 }
-const FrameLayoutComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-76b2334b"]]);
+const FrameLayoutComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-51f78d28"]]);
 KdLaneContainerComponent.install = function(app) {
   app.component(KdLaneContainerComponent.name, KdLaneContainerComponent);
 };