kd-lane-chart-v3 0.1.8 → 0.1.9

package/dist/esm/index.js

@@ -3381,16 +3381,42 @@ function mapGammaLineApiType(lithType, lineRole) {
   return mainType === "grShale" ? "grClean" : "grShale";
 }
 function resolveTrendParamId(type) {
-  const t = String(type || "").trim();
+  let t = String(type || "").trim();
+  if (t.startsWith(":")) t = t.slice(1);
   if (t === "grShale" || t === "grClean") return "8137";
   return t;
 }
+function inferCalcTypeFromSegments(segments) {
+  const segs = segments || [];
+  if (!segs.some((s) => (s.knots || []).length)) return null;
+  const hasMirror = segs.some((s) => {
+    if (s.lithType === "sandstone") return true;
+    return (s.knots || []).some((k) => k.mirrorValue != null && Number.isFinite(Number(k.mirrorValue)));
+  });
+  return hasMirror ? "moxing" : "hand";
+}
+function inferTrendSaveMeta(line, segments) {
+  const segs = segments || [];
+  const hasKnots = segs.some((s) => (s.knots || []).length > 0);
+  if (!hasKnots) return { isDouble: false, calcType: void 0 };
+  const inferredCalc = inferCalcTypeFromSegments(segs);
+  const calcType = line && line.calcType || inferredCalc;
+  const hasMirror = inferredCalc === "moxing";
+  const is8137 = line && String(line.paramId) === "8137";
+  const isDouble = isLineDouble(line) || hasMirror || is8137 && !!calcType;
+  return { isDouble: !!isDouble, calcType };
+}
 function newSegmentId() {
   return `seg_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
 }
 function makeTrendKey(laneId, paramId) {
   return `${laneId}::${paramId}`;
 }
+function paramIdFromTrendKey(key) {
+  const sep = String(key || "").lastIndexOf("::");
+  if (sep < 0) return String(key || "");
+  return key.slice(sep + 2);
+}
 function cloneSegments(segments) {
   return (segments || []).map((seg) => {
     const next = {
@@ -3961,15 +3987,24 @@ class TrendLineManager {
   }
   /** 从模板 line.trendSegments 回显；已有 store 的曲线不覆盖，避免编辑中被模板刷新冲掉。8.21 */
   hydrateFromTemplate(template) {
-    if (!this._alive()) return;
+    if (!this._alive()) return null;
     const hasEcho = Array.isArray(this.host.lineListData) && this.host.lineListData.length;
     const lanes = template && template.lanes || [];
     const alive = /* @__PURE__ */ new Set();
+    const lanesToRefresh = /* @__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);
+        const bucket = this.store[key];
+        if (bucket && this._hasTrendKnots(bucket.segments)) return;
+        const fromLaneId = this._tryMigrateTrendStore(line.paramId, key);
+        if (fromLaneId) {
+          lanesToRefresh.add(fromLaneId);
+          lanesToRefresh.add(lane.laneId);
+          return;
+        }
         if (this.store[key]) return;
         if (!hasEcho || !line.trendSegments || !line.trendSegments.length) {
           this.store[key] = { segments: [] };
@@ -3979,8 +4014,41 @@ class TrendLineManager {
       });
     });
     Object.keys(this.store).forEach((key) => {
-      if (!alive.has(key)) delete this.store[key];
+      if (!alive.has(key)) {
+        const laneId = key.split("::")[0];
+        if (laneId && this._hasTrendKnots(this.store[key] && this.store[key].segments)) {
+          lanesToRefresh.add(laneId);
+        }
+        delete this.store[key];
+      }
     });
+    if (lanesToRefresh.size) {
+      return lanesToRefresh;
+    }
+    return null;
+  }
+  /** 段内是否已有控制点（可画线）。8.26 */
+  _hasTrendKnots(segments) {
+    return (segments || []).some((s) => (s.knots || []).length > 0);
+  }
+  /**
+   * 曲线表头跨泳道拖拽：把旧 laneId::paramId 的 store 迁到新泳道。
+   * @returns {string|null} 迁出方 laneId，无迁移则 null
+   */
+  _tryMigrateTrendStore(paramId, newKey) {
+    const existing = this.store[newKey];
+    if (existing && this._hasTrendKnots(existing.segments)) return null;
+    const pid = String(paramId);
+    const suffix = `::${pid}`;
+    for (const oldKey of Object.keys(this.store)) {
+      if (oldKey === newKey || !oldKey.endsWith(suffix)) continue;
+      const bucket = this.store[oldKey];
+      if (!bucket || !this._hasTrendKnots(bucket.segments)) continue;
+      this.store[newKey] = bucket;
+      if (this.activeKey === oldKey) this.activeKey = newKey;
+      return oldKey.split("::")[0] || null;
+    }
+    return null;
   }
   getChart(laneId) {
     if (!this._alive()) return null;
@@ -4014,7 +4082,9 @@ class TrendLineManager {
   }
   /** 只认当前 isDraw 曲线。8107 和 8011 不在同一泳道，切到 8011 后不能还按 8107 的 activeKey 消费点击。8.21 */
   getTargetByLane(laneId) {
-    const targets = this.listDrawableTargets().filter((t) => t.laneId === laneId);
+    const targets = this.listDrawableTargets().filter(
+      (t) => String(t.laneId) === String(laneId)
+    );
     if (!targets.length) return null;
     if (this.activeKey) {
       const active = targets.find((t) => t.key === this.activeKey && t.editable);
@@ -4337,7 +4407,9 @@ class TrendLineManager {
     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 targets = this.listDrawableTargets().filter(
+      (t) => String(t.laneId) === String(lane.laneId)
+    );
     const added = [];
     targets.forEach((target) => {
       const curve = this._findCurveSeriesInOption(option, target.paramId);
@@ -4369,7 +4441,9 @@ class TrendLineManager {
     const chart = this.getChart(laneId);
     if (!chart) return;
     this._clearLeftoverGraphic(chart);
-    const targets = this.listDrawableTargets().filter((t) => t.laneId === laneId);
+    const targets = this.listDrawableTargets().filter(
+      (t) => String(t.laneId) === String(laneId)
+    );
     const next = [];
     targets.forEach((target) => {
       const axis = this._curveAxisOf(chart, target);
@@ -4792,12 +4866,16 @@ class TrendLineManager {
   getTrendLineData(mainId = "demo") {
     const grouped = {};
     const meta = {};
+    const linesByParam = {};
     this.listDrawableTargets().forEach((t) => {
-      grouped[t.paramId] = cloneSegments(t.segments);
-      meta[t.paramId] = {
-        isDouble: isLineDouble(t.line),
-        calcType: t.line && t.line.calcType
-      };
+      linesByParam[t.paramId] = t.line;
+    });
+    Object.keys(this.store).forEach((key) => {
+      const segments = this.store[key] && this.store[key].segments;
+      if (!this._hasTrendKnots(segments)) return;
+      const paramId = paramIdFromTrendKey(key);
+      grouped[paramId] = cloneSegments(segments);
+      meta[paramId] = inferTrendSaveMeta(linesByParam[paramId], segments);
     });
     return toTrendLineSavePayload(grouped, mainId, meta);
   }
@@ -4816,6 +4894,7 @@ class TrendLineManager {
   /** 把 geosteering 线段数组灌进对应曲线并画出叠加层。8.21 */
   setTrendLineList(lineList, overwrite = true) {
     if (!Array.isArray(lineList) || !lineList.length) {
+      if (!overwrite) return;
       this.resetAllTrendLines();
       return;
     }
@@ -11370,11 +11449,17 @@ const _sfc_main$2 = {
     async templateChange(template) {
       this.currentTemplate = template;
       this.getLatestLineDataByParamCode();
-      if (this.trendLineManager) this.trendLineManager.hydrateFromTemplate(template);
-      this.applyLineListData();
+      let migratedLanes = null;
+      if (this.trendLineManager) {
+        migratedLanes = this.trendLineManager.hydrateFromTemplate(template);
+      }
+      if ((this.lineListData || []).length) this.applyLineListData();
       await this.$nextTick();
       if (this._isUnmounted) return;
-      this.updateLanesChartOption();
+      await this.updateLanesChartOption();
+      if (this.trendLineManager && migratedLanes && migratedLanes.size) {
+        migratedLanes.forEach((laneId) => this.trendLineManager._flushLane(laneId));
+      }
     },
     // 线段变化
     async lineChange() {
@@ -11535,6 +11620,7 @@ const _sfc_main$2 = {
         option.yAxis = [{}];
       }
       const cachedOption = markRaw(option);
+      if (this.trendLineManager) cachedOption.__kdTrendSynced = true;
       if (index2 != -1) {
         this.allOptions.splice(index2, 1, { lineId, option: cachedOption });
       } else {
@@ -15631,7 +15717,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-9a816c60"]]);
+const chartContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-ec0aa0bf"]]);
 const _sfc_main$1 = {
   name: "ParameterPanel",
   props: {