evui 3.4.200 → 3.4.201

package/dist/evui.common.js

@@ -11171,7 +11171,7 @@ module.exports = exports;
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.200\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.201\"}");
 
 /***/ }),
 
@@ -39247,7 +39247,7 @@ var modules = {
       var baseData = baseDataList[dataIndex];
       var position = isHorizontal ? baseData === null || baseData === void 0 ? void 0 : baseData.x : baseData === null || baseData === void 0 ? void 0 : baseData.y;
       var baseValue = baseData === null || baseData === void 0 ? void 0 : baseData.o;
-      var isPassingValue = baseSeries.passingValue === baseValue;
+      var isPassingValue = !helpers_util.isNullOrUndefined(baseSeries === null || baseSeries === void 0 ? void 0 : baseSeries.passingValue) && (baseSeries === null || baseSeries === void 0 ? void 0 : baseSeries.passingValue) === baseValue;
       var isSameSign = curr >= 0 && baseValue >= 0 || curr < 0 && baseValue < 0;
 
       if (isPassingValue || position == null || !isSameSign || !baseSeries.show) {
@@ -39457,6 +39457,7 @@ var modules = {
     var isHorizontal = this.options.horizontal;
 
     if (data.length) {
+      var usePassingValue = !helpers_util.isNullOrUndefined(passingValue);
       return data.reduce(function (acc, p, index) {
         var _p$x, _p$y, _p$o;
 
@@ -39465,15 +39466,15 @@ var modules = {
         var py = ((_p$y = p.y) === null || _p$y === void 0 ? void 0 : _p$y.value) || p.y;
         var po = ((_p$o = p.o) === null || _p$o === void 0 ? void 0 : _p$o.value) || p.o;
 
-        if (po !== passingValue && px <= minmax.minX) {
+        if (usePassingValue ? po !== passingValue && px <= minmax.minX : px <= minmax.minX) {
           minmax.minX = px === null ? 0 : px;
         }
 
-        if (po !== passingValue && py <= minmax.minY) {
+        if (usePassingValue ? po !== passingValue && py <= minmax.minY : py <= minmax.minY) {
           minmax.minY = py === null ? 0 : py;
         }
 
-        if (po !== passingValue && px >= minmax.maxX) {
+        if (usePassingValue ? po !== passingValue && px >= minmax.maxX : px >= minmax.maxX) {
           minmax.maxX = px === null ? 0 : px;
 
           if (isHorizontal && px !== null) {
@@ -39482,7 +39483,7 @@ var modules = {
           }
         }
 
-        if (po !== passingValue && py >= minmax.maxY) {
+        if (usePassingValue ? po !== passingValue && py >= minmax.maxY : py >= minmax.maxY) {
           minmax.maxY = py === null ? 0 : py;
 
           if (!isHorizontal && py !== null) {
@@ -42456,33 +42457,30 @@ var element_scatter_Scatter = /*#__PURE__*/function () {
   }, {
     key: "defaultScatterDraw",
     value: function defaultScatterDraw(param) {
-      var _this2 = this;
-
       var ctx = param.ctx,
           axesSteps = param.axesSteps,
           duple = param.duple,
           legendHitInfo = param.legendHitInfo;
-      var minmaxY = axesSteps.y[this.yAxisIndex];
-      this.data.forEach(function (item, idx) {
-        var shouldDraw = legendHitInfo ? legendHitInfo.sId === _this2.sId : !duple.has("".concat(item.x).concat(item.y));
+      var minmaxY = axesSteps.y[this.yAxisIndex]; // Adjusted because Real Time Scatter is drawn from the back.
 
-        if (shouldDraw) {
-          if (!duple.has("".concat(item.x).concat(item.y))) {
-            duple.add("".concat(item.x).concat(item.y));
-          }
+      for (var i = 0; i < this.data.length; i++) {
+        var item = this.data[i];
+        var idx = i;
+        var shouldDraw = legendHitInfo ? legendHitInfo.sId === this.sId : duple.get("".concat(item.x).concat(item.y)) === this.sId;
 
-          _this2.calcItem(item, param);
+        if (shouldDraw) {
+          this.calcItem(item, param);
 
           if (item.xp !== null && item.yp !== null) {
-            var overflowColor = item.y > minmaxY.graphMax && _this2.overflowColor;
-            var color = overflowColor || item.dataColor || _this2.color;
-            ctx.strokeStyle = helpers_util.colorStringToRgba(color, _this2.getOpacity(param, color, idx));
-            var pointFillColor = item.dataColor || _this2.pointFill;
-            ctx.fillStyle = helpers_util.colorStringToRgba(pointFillColor, _this2.getOpacity(param, pointFillColor, idx));
-            helpers_canvas.drawPoint(ctx, _this2.pointStyle, _this2.pointSize, item.xp, item.yp);
+            var overflowColor = item.y > minmaxY.graphMax && this.overflowColor;
+            var color = overflowColor || item.dataColor || this.color;
+            ctx.strokeStyle = helpers_util.colorStringToRgba(color, this.getOpacity(param, color, idx));
+            var pointFillColor = item.dataColor || this.pointFill;
+            ctx.fillStyle = helpers_util.colorStringToRgba(pointFillColor, this.getOpacity(param, pointFillColor, idx));
+            helpers_canvas.drawPoint(ctx, this.pointStyle, this.pointSize, item.xp, item.yp);
           }
         }
-      });
+      }
     }
     /**
      * Draw real time scatter chart
@@ -42509,13 +42507,9 @@ var element_scatter_Scatter = /*#__PURE__*/function () {
           var _this$data$this$sId2, _this$data$this$sId2$, _this$data$this$sId3, _this$data$this$sId3$;
 
           var item = (_this$data$this$sId3 = this.data[this.sId]) === null || _this$data$this$sId3 === void 0 ? void 0 : (_this$data$this$sId3$ = _this$data$this$sId3.dataGroup[i]) === null || _this$data$this$sId3$ === void 0 ? void 0 : _this$data$this$sId3$.data[j];
-          var shouldDraw = legendHitInfo ? legendHitInfo.sId === this.sId : !duple.has("".concat(item.x).concat(item.y));
+          var shouldDraw = legendHitInfo ? legendHitInfo.sId === this.sId : duple.get("".concat(item.x).concat(item.y)) === this.sId;
 
           if (shouldDraw) {
-            if (!duple.has("".concat(item.x).concat(item.y))) {
-              duple.add("".concat(item.x).concat(item.y));
-            }
-
             this.calcItem(item, param);
 
             if (item.xp !== null && item.yp !== null) {
@@ -45510,9 +45504,6 @@ var scale_Scale = /*#__PURE__*/function () {
           var mergedPlotLineOpt = lodash_es_defaultsDeep({}, plotLine, PLOT_LINE_OPTION);
           var value = mergedPlotLineOpt.value,
               labelOpt = mergedPlotLineOpt.label;
-
-          _this3.setPlotLineStyle(mergedPlotLineOpt);
-
           var dataPos;
 
           if (_this3.type === 'x') {
@@ -45522,6 +45513,8 @@ var scale_Scale = /*#__PURE__*/function () {
               return;
             }
 
+            _this3.setPlotLineStyle(mergedPlotLineOpt);
+
             _this3.drawXPlotLine(dataPos, minX, maxX, minY, maxY);
           } else {
             dataPos = helpers_canvas.calculateY(value, axisMin, axisMax, yArea, maxY);
@@ -45530,6 +45523,8 @@ var scale_Scale = /*#__PURE__*/function () {
               return;
             }
 
+            _this3.setPlotLineStyle(mergedPlotLineOpt);
+
             _this3.drawYPlotLine(dataPos, minX, maxX, minY, maxY);
           }
 
@@ -54389,6 +54384,7 @@ var element_tip_modules = {
 
 
 
+
 
 
 var chart_core_EvChart = /*#__PURE__*/function () {
@@ -54691,6 +54687,51 @@ var chart_core_EvChart = /*#__PURE__*/function () {
         this.displayCtx.drawImage(this.bufferCanvas, 0, 0);
       }
     }
+    /**
+     * Collect duplicate point keys for scatter overlap detection
+     * @param {Map<string, string>} duple
+     * @param {string[]} chartTypeSet
+     *
+     * @returns {undefined}
+     */
+
+  }, {
+    key: "collectDuplicatePoints",
+    value: function collectDuplicatePoints(duple, chartTypeSet) {
+      var isReverseOrder = !!this.options.seriesReverse;
+
+      for (var jx = isReverseOrder ? chartTypeSet.length - 1 : 0; isReverseOrder ? jx >= 0 : jx < chartTypeSet.length; isReverseOrder ? jx-- : jx++) {
+        var _this$options$realTim;
+
+        var series = this.seriesList[chartTypeSet[jx]];
+
+        if ((_this$options$realTim = this.options.realTimeScatter) !== null && _this$options$realTim !== void 0 && _this$options$realTim.use) {
+          var _series$data$series$s;
+
+          var seriesDatas = (_series$data$series$s = series.data[series.sId]) === null || _series$data$series$s === void 0 ? void 0 : _series$data$series$s.dataGroup;
+
+          for (var i = 0; i < seriesDatas.length; i++) {
+            var _seriesDatas$i;
+
+            var dataItems = ((_seriesDatas$i = seriesDatas[i]) === null || _seriesDatas$i === void 0 ? void 0 : _seriesDatas$i.data) || [];
+
+            for (var j = 0; j < dataItems.length; j++) {
+              var item = dataItems[j];
+              duple.set("".concat(item.x).concat(item.y), series.sId);
+            }
+          }
+        } else {
+          var _this$data$data$chart;
+
+          var _seriesDatas = (_this$data$data$chart = this.data.data[chartTypeSet[jx]]) !== null && _this$data$data$chart !== void 0 ? _this$data$data$chart : [];
+
+          for (var _i = 0; _i < _seriesDatas.length; _i++) {
+            var _item = _seriesDatas[_i];
+            duple.set("".concat(_item.x).concat(_item.y), series.sId);
+          }
+        }
+      }
+    }
     /**
      * Draw each series
      * @param {any} [hitInfo=undefined]   legend mouseover callback (object or undefined)
@@ -54742,13 +54783,21 @@ var chart_core_EvChart = /*#__PURE__*/function () {
           showSeriesCount++;
         }
       });
-      var duple = new Set();
+      /**
+       * new Map<`${x}${y}`, seriesID>
+       */
+
+      var duple = new Map();
       var chartKeys = Object.keys(this.seriesInfo.charts);
 
       for (var ix = 0; ix < chartKeys.length; ix++) {
         var chartType = chartKeys[ix];
         var chartTypeSet = this.seriesInfo.charts[chartType];
 
+        if (chartType === 'scatter') {
+          this.collectDuplicatePoints(duple, chartTypeSet);
+        }
+
         for (var jx = 0; jx < chartTypeSet.length; jx++) {
           var series = this.seriesList[chartTypeSet[jx]];
 
@@ -54827,8 +54876,6 @@ var chart_core_EvChart = /*#__PURE__*/function () {
 
             case 'scatter':
               {
-                var _this$options$realTim;
-
                 var _legendHitInfo4 = hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.legend;
 
                 var _selectInfo = void 0;
@@ -54849,7 +54896,7 @@ var chart_core_EvChart = /*#__PURE__*/function () {
                   }
                 }
 
-                if ((_this$options$realTim = this.options.realTimeScatter) !== null && _this$options$realTim !== void 0 && _this$options$realTim.use) {
+                if (this.options.seriesReverse) {
                   series = this.seriesList[chartTypeSet.at(-1 - jx)];
                 }
 
@@ -56500,7 +56547,8 @@ var DEFAULT_OPTIONS = {
     },
     error: '#FF0000',
     decimalPoint: 0
-  }
+  },
+  seriesReverse: false
 };
 var DEFAULT_DATA = {
   series: {},