kd-lane-chart-v3 0.1.0 → 0.1.1

package/dist/esm/index.js

@@ -9122,7 +9122,7 @@ const _sfc_main$2 = {
             }
           }
         }
-        return [value, +item[axisKey]];
+        return [value, +item[axisKey], item.timestamp];
       });
     },
     generateSeriesDataCached(data, lineInfo, axisKey, paramCodeMap) {
@@ -9140,7 +9140,7 @@ const _sfc_main$2 = {
             }
           }
         }
-        return [value, +item[axisKey]];
+        return [value, +item[axisKey], item.timestamp];
       });
     },
     generateAllSeriesDataCached(data, lineInfo, axisKey, paramCodeMap) {
@@ -9833,72 +9833,51 @@ const _sfc_main$2 = {
       }
     },
     findBoundaryPointPair(currentPoint) {
-      const chartRef = this.getChartRefByLaneId(currentPoint.laneId);
-      if (!chartRef || !chartRef.chart) {
-        return { topPoint: null, bottomPoint: null };
-      }
-      const option = chartRef.chart.getOption();
       let topPoint = null;
       let bottomPoint = null;
-      for (let i = 0; i < option.series.length; i++) {
-        const series = option.series[i];
-        if (series.type !== "scatter") continue;
-        const data = series.data || [];
-        for (let j = 0; j < data.length; j++) {
-          const point = data[j];
-          if (!point || !point.value) continue;
-          if (point.lineId === currentPoint.lineId && point.paramId === currentPoint.paramId) {
-            if (point.type === "top") {
-              topPoint = point;
-            } else if (point.type === "bottom") {
-              bottomPoint = point;
-            }
-          }
-        }
-      }
-      if (currentPoint.type === "top" && topPoint) {
-        const nextPoint = option.series.filter((s) => s.type === "scatter").flatMap((s) => s.data || []).find(
-          (p) => p && p.value && p.lineId === currentPoint.lineId && p.paramId === currentPoint.paramId && p.type === "bottom" && p.originalIndex > currentPoint.originalIndex
+      if (currentPoint.type === "top") {
+        topPoint = currentPoint;
+        bottomPoint = this.findBoundaryPointFromRealTimeData(
+          currentPoint,
+          "bottom"
         );
-        if (nextPoint) {
-          bottomPoint = nextPoint;
-        } else {
-          bottomPoint = this.findBoundaryPointFromRealTimeData(
-            currentPoint,
-            "bottom"
-          );
-        }
-      } else if (currentPoint.type === "bottom" && bottomPoint) {
-        const prevPoint = option.series.filter((s) => s.type === "scatter").flatMap((s) => s.data || []).find(
-          (p) => p && p.value && p.lineId === currentPoint.lineId && p.paramId === currentPoint.paramId && p.type === "top" && p.originalIndex < currentPoint.originalIndex
-        );
-        if (prevPoint) {
-          topPoint = prevPoint;
-        } else {
-          topPoint = this.findBoundaryPointFromRealTimeData(currentPoint, "top");
-        }
+      } else if (currentPoint.type === "bottom") {
+        bottomPoint = currentPoint;
+        topPoint = this.findBoundaryPointFromRealTimeData(currentPoint, "top");
       }
       return { topPoint, bottomPoint };
     },
     findBoundaryPointFromRealTimeData(currentPoint, targetType) {
-      const axisKey = this.currentToolBarConfig.axisTypeList && this.currentToolBarConfig.axisTypeList[this.formCache.axisType] || (this.formCache.axisType === "time" ? "time" : "depth");
+      const axisType = this.formCache.axisType;
+      const axisKey = this.currentToolBarConfig.axisTypeList && this.currentToolBarConfig.axisTypeList[axisType] || (axisType === "time" ? "time" : "depth");
       const currentYValue = currentPoint.value[1];
       const paramId = currentPoint.paramId;
+      const hasTimestamp = axisType === "depth" && this.realTimeData.length > 0 && this.realTimeData[0] && Object.prototype.hasOwnProperty.call(this.realTimeData[0], "timestamp");
       let searchStartIndex = -1;
-      const tolerance = this.formCache.axisType === "depth" ? 0.01 : 1e3;
+      const tolerance = axisType === "depth" ? 0.01 : 1e3;
       for (let i = 0; i < this.realTimeData.length; i++) {
         const item = this.realTimeData[i];
         let itemYValue = item[axisKey];
-        if (this.formCache.axisType !== "depth") {
+        if (axisType !== "depth") {
           itemYValue = this.toMillisecondTimestamp(itemYValue);
         } else {
           itemYValue = Number(itemYValue);
         }
-        if (Math.abs(itemYValue - currentYValue) < tolerance) {
-          searchStartIndex = i;
-          break;
+        if (hasTimestamp) {
+          const itemTimestamp = this.toMillisecondTimestamp(item.timestamp);
+          const pointTimestamp = currentPoint.timestamp ? this.toMillisecondTimestamp(currentPoint.timestamp) : null;
+          if (Math.abs(itemYValue - currentYValue) < tolerance && (!pointTimestamp || itemTimestamp === pointTimestamp)) {
+            searchStartIndex = i;
+            break;
+          }
+        } else {
+          if (Math.abs(itemYValue - currentYValue) < tolerance) {
+            searchStartIndex = i;
+            break;
+          }
         }
       }
+      console.log("searchStartIndex", searchStartIndex);
       if (searchStartIndex === -1) return null;
       let boundaryPoint = null;
       if (targetType === "bottom") {
@@ -9907,17 +9886,18 @@ const _sfc_main$2 = {
           const value = item[paramId];
           if (value !== null && value !== void 0 && value !== "" && Number.isFinite(+value)) {
             let itemYValue = item[axisKey];
-            if (this.formCache.axisType !== "depth") {
+            if (axisType !== "depth") {
               itemYValue = this.toMillisecondTimestamp(itemYValue);
             } else {
               itemYValue = Number(itemYValue);
             }
             boundaryPoint = {
-              value: [value, itemYValue],
+              value: [value, itemYValue, item.timestamp],
               lineId: currentPoint.lineId,
               paramId,
               type: "bottom",
-              originalIndex: i
+              originalIndex: i,
+              timestamp: hasTimestamp ? item.timestamp : void 0
             };
             break;
           }
@@ -9925,17 +9905,18 @@ const _sfc_main$2 = {
         if (!boundaryPoint) {
           const lastItem = this.realTimeData[this.realTimeData.length - 1];
           let lastYValue = lastItem[axisKey];
-          if (this.formCache.axisType !== "depth") {
+          if (axisType !== "depth") {
             lastYValue = this.toMillisecondTimestamp(lastYValue);
           } else {
             lastYValue = Number(lastYValue);
           }
           boundaryPoint = {
-            value: [lastItem[paramId], lastYValue],
+            value: [lastItem[paramId], lastYValue, lastItem.timestamp],
             lineId: currentPoint.lineId,
             paramId,
             type: "bottom",
-            originalIndex: this.realTimeData.length - 1
+            originalIndex: this.realTimeData.length - 1,
+            timestamp: hasTimestamp ? lastItem.timestamp : void 0
           };
         }
       } else {
@@ -9944,17 +9925,18 @@ const _sfc_main$2 = {
           const value = item[paramId];
           if (value !== null && value !== void 0 && value !== "" && Number.isFinite(+value)) {
             let itemYValue = item[axisKey];
-            if (this.formCache.axisType !== "depth") {
+            if (axisType !== "depth") {
               itemYValue = this.toMillisecondTimestamp(itemYValue);
             } else {
               itemYValue = Number(itemYValue);
             }
             boundaryPoint = {
-              value: [value, itemYValue],
+              value: [value, itemYValue, item.timestamp],
               lineId: currentPoint.lineId,
               paramId,
               type: "top",
-              originalIndex: i
+              originalIndex: i,
+              timestamp: hasTimestamp ? item.timestamp : void 0
             };
             break;
           }
@@ -9962,17 +9944,18 @@ const _sfc_main$2 = {
         if (!boundaryPoint) {
           const firstItem = this.realTimeData[0];
           let firstYValue = firstItem[axisKey];
-          if (this.formCache.axisType !== "depth") {
+          if (axisType !== "depth") {
             firstYValue = this.toMillisecondTimestamp(firstYValue);
           } else {
             firstYValue = Number(firstYValue);
           }
           boundaryPoint = {
-            value: [firstItem[paramId], firstYValue],
+            value: [firstItem[paramId], firstYValue, firstItem.timestamp],
             lineId: currentPoint.lineId,
             paramId,
             type: "top",
-            originalIndex: 0
+            originalIndex: 0,
+            timestamp: hasTimestamp ? firstItem.timestamp : void 0
           };
         }
       }
@@ -10603,6 +10586,7 @@ const _sfc_main$2 = {
                     const formattedBoundaryPoints = boundaryPoints.map(
                       (bp) => ({
                         value: bp.data,
+                        timestamp: bp.data[2],
                         type: bp.type,
                         originalIndex: bp.originalIndex,
                         lineId: lineInfo.lineId,
@@ -11317,7 +11301,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ], 512);
 }
-const chartContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-d90c5e39"]]);
+const chartContainer = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__scopeId", "data-v-2b46ef31"]]);
 const _sfc_main$1 = {
   name: "ParameterPanel",
   props: {