evui 3.4.100 → 3.4.102

package/dist/evui.common.js

@@ -11149,7 +11149,7 @@ module.exports = exports;
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.100\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.102\"}");
 
 /***/ }),
 
@@ -35039,6 +35039,7 @@ function uniqBy(array, iteratee) {
 
 
 
+
 
 
 var uses_this = undefined;
@@ -36045,11 +36046,19 @@ var uses_sortEvent = function sortEvent(params) {
               bCol = _getColumnValue.bCol;
 
           if ((!aCol || typeof aCol === 'string') && (!bCol || typeof bCol === 'string')) {
-            var _aCol, _bCol;
-
             aCol = aCol || '';
             bCol = bCol || '';
-            return sortFn((_aCol = aCol) === null || _aCol === void 0 ? void 0 : _aCol.toLowerCase(), (_bCol = bCol) === null || _bCol === void 0 ? void 0 : _bCol.toLowerCase());
+            var lowerA = aCol.toLowerCase();
+            var lowerB = bCol.toLowerCase();
+
+            if (aCol !== bCol && lowerA === lowerB) {
+              var diffIndex = Array.from(aCol).findIndex(function (char, idx) {
+                return char !== bCol[idx];
+              });
+              return sortFn(aCol[diffIndex], bCol[diffIndex]);
+            }
+
+            return sortFn(lowerA, lowerB);
           }
 
           return 0;
@@ -36063,11 +36072,11 @@ var uses_sortEvent = function sortEvent(params) {
               bCol = _getColumnValue2.bCol;
 
           if (!aCol || typeof aCol === 'string' || typeof aCol === 'number') {
-            var _aCol2, _bCol2;
+            var _aCol, _bCol;
 
             aCol = aCol === '' ? null : aCol;
             bCol = bCol === '' ? null : bCol;
-            return numberSortFn((_aCol2 = aCol) !== null && _aCol2 !== void 0 ? _aCol2 : null, (_bCol2 = bCol) !== null && _bCol2 !== void 0 ? _bCol2 : null);
+            return numberSortFn((_aCol = aCol) !== null && _aCol !== void 0 ? _aCol : null, (_bCol = bCol) !== null && _bCol !== void 0 ? _bCol : null);
           }
 
           return 0;
@@ -43716,6 +43725,18 @@ var element_heatmap_HeatMap = /*#__PURE__*/function () {
       h: 0
     };
     this.type = 'heatMap';
+    this.currentLabelInfo = {
+      x: {
+        steps: 0,
+        min: 0,
+        max: 0
+      },
+      y: {
+        steps: 0,
+        min: 0,
+        max: 0
+      }
+    };
   }
   /**
    * create series color axis
@@ -43991,9 +44012,17 @@ var element_heatmap_HeatMap = /*#__PURE__*/function () {
       var minmaxY = axesSteps.y[this.yAxisIndex];
       this.size.w = xArea / minmaxX.oriSteps;
       this.size.h = yArea / minmaxY.oriSteps;
-      this.filterdCount = {
-        x: minmaxX.oriSteps,
-        y: minmaxY.oriSteps
+      this.currentLabelInfo = {
+        x: {
+          steps: minmaxX.oriSteps,
+          min: minmaxX.graphMin,
+          max: minmaxX.graphMax
+        },
+        y: {
+          steps: minmaxY.oriSteps,
+          min: minmaxY.graphMin,
+          max: minmaxY.graphMax
+        }
       };
 
       var getOpacity = function getOpacity(item, opacity, index) {
@@ -44381,10 +44410,8 @@ var element_heatmap_HeatMap = /*#__PURE__*/function () {
       };
 
       if (labels.x.length && labels.y.length) {
-        var _this$filterdCount$x, _this$filterdCount, _this$filterdCount$y, _this$filterdCount2;
-
-        var labelXCount = (_this$filterdCount$x = (_this$filterdCount = this.filterdCount) === null || _this$filterdCount === void 0 ? void 0 : _this$filterdCount.x) !== null && _this$filterdCount$x !== void 0 ? _this$filterdCount$x : labels.x.length;
-        var labelYCount = (_this$filterdCount$y = (_this$filterdCount2 = this.filterdCount) === null || _this$filterdCount2 === void 0 ? void 0 : _this$filterdCount2.y) !== null && _this$filterdCount$y !== void 0 ? _this$filterdCount$y : labels.y.length;
+        var labelXCount = this.currentLabelInfo.x.steps || labels.x.length;
+        var labelYCount = this.currentLabelInfo.y.steps || labels.y.length;
         var x1 = range.x1,
             x2 = range.x2,
             y1 = range.y1,
@@ -44433,10 +44460,17 @@ var element_heatmap_HeatMap = /*#__PURE__*/function () {
 
       return blockRange;
     }
+  }, {
+    key: "getFilteredLabel",
+    value: function getFilteredLabel(labels, count, min, max) {
+      return labels.length !== count ? labels.filter(function (label) {
+        return min <= label && label <= max;
+      }) : labels;
+    }
   }, {
     key: "findSelectionRange",
     value: function findSelectionRange(rangeInfo) {
-      var xcp = rangeInfo.xcp,
+      var xsp = rangeInfo.xsp,
           ycp = rangeInfo.ycp,
           width = rangeInfo.width,
           height = rangeInfo.height,
@@ -44451,26 +44485,38 @@ var element_heatmap_HeatMap = /*#__PURE__*/function () {
           labelY = _this$labels.y;
 
       if (labelX.length && labelY.length) {
-        var gapX = (x2 - x1) / labelX.length;
-        var gapY = (y2 - y1) / labelY.length;
-        var xsp = xcp;
-        var xep = xcp + width;
+        var _this$currentLabelInf = this.currentLabelInfo,
+            _this$currentLabelInf2 = _this$currentLabelInf.x,
+            xCurrentCount = _this$currentLabelInf2.steps,
+            xMin = _this$currentLabelInf2.min,
+            xMax = _this$currentLabelInf2.max,
+            _this$currentLabelInf3 = _this$currentLabelInf.y,
+            yCurrentCount = _this$currentLabelInf3.steps,
+            yMin = _this$currentLabelInf3.min,
+            yMax = _this$currentLabelInf3.max;
+        var labelXCount = xCurrentCount || labelX.x.length;
+        var labelYCount = yCurrentCount || labelY.y.length;
+        var gapX = (x2 - x1) / labelXCount;
+        var gapY = (y2 - y1) / labelYCount;
+        var xep = xsp + width;
         var ysp = ycp;
-        var yep = ycp + height;
+        var yep = ysp + height;
         var xIndex = {
           min: Math.floor((xsp - x1) / gapX),
           max: Math.floor((xep - x1 - gapX) / gapX)
         };
-        var lastIndexY = labelY.length - 1;
+        var lastIndexY = labelYCount - 1;
         var yIndex = {
           min: lastIndexY - Math.floor((yep - y1 - gapY) / gapY),
           max: lastIndexY - Math.floor((ysp - y1) / gapY)
         };
+        var filteredLabelX = this.getFilteredLabel(labelX, labelXCount, xMin, xMax);
+        var filteredLabelY = this.getFilteredLabel(labelY, labelYCount, yMin, yMax);
         selectionRange = {
-          xMin: labelX[xIndex.min],
-          xMax: labelX[xIndex.max],
-          yMin: labelY[yIndex.min],
-          yMax: labelY[yIndex.max]
+          xMin: filteredLabelX[xIndex.min],
+          xMax: filteredLabelX[xIndex.max],
+          yMin: filteredLabelY[yIndex.min],
+          yMax: filteredLabelY[yIndex.max]
         };
       }
 
@@ -50453,13 +50499,21 @@ var plugins_interaction_modules = {
     };
 
     this.onWheel = function (e) {
-      var _this$tooltipDOM, _this$tooltipDOM$styl;
+      var _this$tooltipDOM, _this$tooltipDOM$styl, _this$tooltipDOM2;
 
       var isTooltipVisible = ((_this$tooltipDOM = _this.tooltipDOM) === null || _this$tooltipDOM === void 0 ? void 0 : (_this$tooltipDOM$styl = _this$tooltipDOM.style) === null || _this$tooltipDOM$styl === void 0 ? void 0 : _this$tooltipDOM$styl.display) === 'block';
+      var customTooltip = (_this$tooltipDOM2 = _this.tooltipDOM) === null || _this$tooltipDOM2 === void 0 ? void 0 : _this$tooltipDOM2.querySelector(_this.options.tooltip.htmlScrollTarget);
 
-      if (isTooltipVisible) {
+      if (isTooltipVisible || customTooltip && customTooltip.scrollHeight > customTooltip.clientHeight) {
         e.preventDefault();
-        _this.tooltipBodyDOM.scrollTop += e.deltaY;
+
+        if (isTooltipVisible) {
+          _this.tooltipBodyDOM.scrollTop += e.deltaY;
+        }
+
+        if (customTooltip) {
+          customTooltip.scrollTop += e.deltaY;
+        }
       }
     };
 
@@ -52226,7 +52280,8 @@ var plugins_tooltip_modules = {
           sId: sId,
           data: hitInfoItems[sId].data,
           color: hitInfoItems[sId].color,
-          name: hitInfoItems[sId].name
+          name: hitInfoItems[sId].name,
+          dataId: hitInfoItems[sId].id
         });
       });
       var userCustomTooltipBody = helpers_util.htmlToElement(opt === null || opt === void 0 ? void 0 : (_opt$formatter3 = opt.formatter) === null || _opt$formatter3 === void 0 ? void 0 : _opt$formatter3.html(seriesList));