evui 3.3.63 → 3.3.65

package/dist/evui.common.js

@@ -8012,7 +8012,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.3.63\"}");
+module.exports = JSON.parse("{\"a\":\"3.3.65\"}");
 
 /***/ }),
 
@@ -37243,8 +37243,13 @@ var scale_Scale = /*#__PURE__*/function () {
       var range = scrollbarOpt !== null && scrollbarOpt !== void 0 && scrollbarOpt.use ? scrollbarOpt === null || scrollbarOpt === void 0 ? void 0 : scrollbarOpt.range : this.range;
 
       if ((range === null || range === void 0 ? void 0 : range.length) === 2) {
-        maxValue = range[1] > +minMax.max ? +minMax.max : range[1];
-        minValue = range[0] < +minMax.min ? +minMax.min : range[0];
+        if (this.options.type === 'heatMap') {
+          maxValue = range[1] > +minMax.max ? +minMax.max : range[1];
+          minValue = range[0] < +minMax.min ? +minMax.min : range[0];
+        } else {
+          maxValue = range[1];
+          minValue = range[0];
+        }
       } else {
         maxValue = minMax.max;
         minValue = minMax.min;
@@ -38450,8 +38455,6 @@ var scale_step_StepScale = /*#__PURE__*/function (_Scale) {
         } else {
           interval = oriSteps;
         }
-      } else if (numberOfSteps > maxSteps * 2) {
-        interval *= 2;
       }
 
       return {
@@ -41069,6 +41072,7 @@ var plugins_legend_gradient_modules = {
 
 
 
+
 var plugins_scrollbar_module = {
   /**
    * init scrollbar information
@@ -41100,49 +41104,48 @@ var plugins_scrollbar_module = {
     });
 
     if (!scrollbarOpt.isInit) {
-      var _axisOpt$2, _axisOpt$3;
+      var _axisOpt$2, _axisOpt$3, _axisOpt$3$range, _axisOpt$4;
 
       scrollbarOpt.type = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$2 = axisOpt[0]) === null || _axisOpt$2 === void 0 ? void 0 : _axisOpt$2.type;
-      scrollbarOpt.range = (axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$3 = axisOpt[0]) === null || _axisOpt$3 === void 0 ? void 0 : _axisOpt$3.range) || null;
+      scrollbarOpt.range = axisOpt !== null && axisOpt !== void 0 && (_axisOpt$3 = axisOpt[0]) !== null && _axisOpt$3 !== void 0 && (_axisOpt$3$range = _axisOpt$3.range) !== null && _axisOpt$3$range !== void 0 && _axisOpt$3$range.length ? _toConsumableArray(axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$4 = axisOpt[0]) === null || _axisOpt$4 === void 0 ? void 0 : _axisOpt$4.range) : null;
+      this.initScrollbarRange(dir);
       this.createScrollbarLayout(dir);
       this.createScrollbar(dir);
       this.createScrollEvent(dir);
       scrollbarOpt.isInit = true;
     }
   },
-  checkValidRange: function checkValidRange(dir) {
+  initScrollbarRange: function initScrollbarRange(dir) {
     var _scrollbarOpt$range;
 
     var scrollbarOpt = this.scrollbar[dir];
     var axesType = scrollbarOpt.type;
+    var labels = this.options.type === 'heatMap' ? this.data.labels[dir] : this.data.labels;
 
-    if ((_scrollbarOpt$range = scrollbarOpt.range) !== null && _scrollbarOpt$range !== void 0 && _scrollbarOpt$range.length) {
+    if ((_scrollbarOpt$range = scrollbarOpt.range) !== null && _scrollbarOpt$range !== void 0 && _scrollbarOpt$range.length && labels.length) {
       var _scrollbarOpt$range2 = _slicedToArray(scrollbarOpt.range, 2),
           min = _scrollbarOpt$range2[0],
           max = _scrollbarOpt$range2[1];
 
-      if (!(truthyNumber(min) && truthyNumber(max))) {
-        return true;
-      }
+      var limitMin;
+      var limitMax;
 
-      if (axesType === 'step') {
-        var labels = this.options.type === 'heatMap' ? this.data.labels[dir] : this.data.labels;
+      if (truthyNumber(min) && truthyNumber(max)) {
+        if (axesType === 'step') {
+          limitMin = 0;
+          limitMax = labels.length - 1;
+        } else {
+          var _this$minMax$dir;
 
-        if (min < 0 || max > labels.length - 1) {
-          return true;
+          var minMax = (_this$minMax$dir = this.minMax[dir]) === null || _this$minMax$dir === void 0 ? void 0 : _this$minMax$dir[0];
+          limitMin = +minMax.min;
+          limitMax = +minMax.max;
         }
-      } else {
-        var _this$minMax$dir;
-
-        var minMax = (_this$minMax$dir = this.minMax[dir]) === null || _this$minMax$dir === void 0 ? void 0 : _this$minMax$dir[0];
 
-        if (+min < +minMax.min || +max > +minMax.max) {
-          return true;
-        }
+        scrollbarOpt.range[0] = +min < limitMin ? limitMin : +min;
+        scrollbarOpt.range[1] = +max > limitMax ? limitMax : +max;
       }
     }
-
-    return false;
   },
 
   /**
@@ -41159,7 +41162,7 @@ var plugins_scrollbar_module = {
    * @param updateData is update data
    */
   updateScrollbarInfo: function updateScrollbarInfo(dir, updateData) {
-    var _newOpt$, _newOpt$$scrollbar, _newOpt$2, _newOpt$0$scrollbar, _newOpt$3, _newOpt$4, _axisOpt$4, _newOpt$0$scrollbar2;
+    var _newOpt$, _newOpt$$scrollbar, _newOpt$2, _newOpt$0$scrollbar, _newOpt$3, _newOpt$4, _axisOpt$5, _newOpt$0$scrollbar2;
 
     var _this$options = this.options,
         axesX = _this$options.axesX,
@@ -41175,12 +41178,13 @@ var plugins_scrollbar_module = {
     }
 
     var axisOpt = dir === 'x' ? this.axesX : this.axesY;
-    var isUpdateAxesRange = !lodash_es_isEqual(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$4 = newOpt[0]) === null || _newOpt$4 === void 0 ? void 0 : _newOpt$4.range, axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$4 = axisOpt[0]) === null || _axisOpt$4 === void 0 ? void 0 : _axisOpt$4.range);
+    var isUpdateAxesRange = !lodash_es_isEqual(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$4 = newOpt[0]) === null || _newOpt$4 === void 0 ? void 0 : _newOpt$4.range, axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$5 = axisOpt[0]) === null || _axisOpt$5 === void 0 ? void 0 : _axisOpt$5.range);
 
     if (isUpdateAxesRange || updateData) {
-      var _newOpt$5;
+      var _newOpt$5, _newOpt$5$range, _newOpt$6;
 
-      this.scrollbar[dir].range = (newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$5 = newOpt[0]) === null || _newOpt$5 === void 0 ? void 0 : _newOpt$5.range) || null;
+      this.scrollbar[dir].range = newOpt !== null && newOpt !== void 0 && (_newOpt$5 = newOpt[0]) !== null && _newOpt$5 !== void 0 && (_newOpt$5$range = _newOpt$5.range) !== null && _newOpt$5$range !== void 0 && _newOpt$5$range.length ? _toConsumableArray(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$6 = newOpt[0]) === null || _newOpt$6 === void 0 ? void 0 : _newOpt$6.range) : null;
+      this.initScrollbarRange(dir);
     }
 
     this.scrollbar[dir].use = !!(newOpt !== null && newOpt !== void 0 && (_newOpt$0$scrollbar2 = newOpt[0].scrollbar) !== null && _newOpt$0$scrollbar2 !== void 0 && _newOpt$0$scrollbar2.use);
@@ -41193,18 +41197,10 @@ var plugins_scrollbar_module = {
     var _this$scrollbar$x, _this$scrollbar$x2, _this$scrollbar$y, _this$scrollbar$y2;
 
     if ((_this$scrollbar$x = this.scrollbar.x) !== null && _this$scrollbar$x !== void 0 && _this$scrollbar$x.use && (_this$scrollbar$x2 = this.scrollbar.x) !== null && _this$scrollbar$x2 !== void 0 && _this$scrollbar$x2.isInit) {
-      if (this.checkValidRange('x')) {
-        return;
-      }
-
       this.setScrollbarPosition('x');
     }
 
     if ((_this$scrollbar$y = this.scrollbar.y) !== null && _this$scrollbar$y !== void 0 && _this$scrollbar$y.use && (_this$scrollbar$y2 = this.scrollbar.y) !== null && _this$scrollbar$y2 !== void 0 && _this$scrollbar$y2.isInit) {
-      if (this.checkValidRange('y')) {
-        return;
-      }
-
       this.setScrollbarPosition('y');
     }
   },
@@ -41412,9 +41408,9 @@ var plugins_scrollbar_module = {
       var _range = +max - +min;
 
       if (axesType === 'time') {
-        var _axisOpt$5, _this$labelRange$dir, _this$labelRange$dir$;
+        var _axisOpt$6, _this$labelRange$dir, _this$labelRange$dir$;
 
-        interval = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$5 = axisOpt[0]) === null || _axisOpt$5 === void 0 ? void 0 : _axisOpt$5.getInterval({
+        interval = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$6 = axisOpt[0]) === null || _axisOpt$6 === void 0 ? void 0 : _axisOpt$6.getInterval({
           minValue: minMax.min,
           maxValue: minMax.max,
           maxSteps: (_this$labelRange$dir = this.labelRange[dir]) === null || _this$labelRange$dir === void 0 ? void 0 : (_this$labelRange$dir$ = _this$labelRange$dir[0]) === null || _this$labelRange$dir$ === void 0 ? void 0 : _this$labelRange$dir$.max