evui 3.3.63 → 3.3.64

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.64\"}");
 
 /***/ }),
 
@@ -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;
@@ -41104,13 +41109,14 @@ var plugins_scrollbar_module = {
 
       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;
+      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];
@@ -41121,28 +41127,26 @@ var plugins_scrollbar_module = {
           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') {
+          var labels = this.options.type === 'heatMap' ? this.data.labels[dir] : this.data.labels;
+          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;
   },
 
   /**
@@ -41181,6 +41185,7 @@ var plugins_scrollbar_module = {
       var _newOpt$5;
 
       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.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 +41198,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');
     }
   },