@easyv/charts 1.4.36 → 1.4.37

package/lib/hooks/useAxes.js

@@ -102,6 +102,7 @@ var _default = function _default(_ref) {
     var xAxisPositions = [];
     axes.forEach(function (item) {
       var _item$config$label = item.config.label,
+          extent = _item$config$label.extent,
           _item$config$label$sh = _item$config$label.showLast,
           showLast = _item$config$label$sh === void 0 ? false : _item$config$label$sh,
           _item$config$label$de = _item$config$label.decimal,
@@ -316,15 +317,15 @@ var _default = function _default(_ref) {
 
         var range = _direction === "horizontal" ? [_start, _end] : _direction === "vertical" ? [_end, _start] : [0, 0];
         var newDomain = domain;
+        var fixedDomain = extent && extent.min != "" && extent.max != ""; //判断配置项中是否强制了最大最小值，如果已经被强制了，就不计算newDomain
 
-        if (type !== "ordinal" && !isNaN(domain[1]) && !auto) {
+        if (type !== "ordinal" && !isNaN(domain[1]) && !auto && !fixedDomain) {
           newDomain = getNewDomain(domain, mode, _step);
         }
 
         var scaler = scales[type]().domain(newDomain).range(range);
         scaler.type = type;
-        if (type !== "ordinal") scaler.clamp(true); //scaler.nice().clamp(true)
-
+        if (type !== "ordinal") scaler.clamp(true);
         var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
         var _ticks = allTicks;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.4.36",
+  "version": "1.4.37",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/hooks/useAxes.js

@@ -72,7 +72,7 @@ export default ({
     axes.forEach((item) => {
       const {
         config: {
-          label: { showLast = false, decimal = 0 },
+          label: { extent, showLast = false, decimal = 0 },
         },
         type,
         orientation,
@@ -96,7 +96,6 @@ export default ({
         clipPosition
       } = item;
       //如果是断轴类型，输出一套完全不同的values
-
       /**
        * 获取轴的：朝向direction，起点位置start，终点位置end
        * @param {*} orientation
@@ -331,13 +330,15 @@ export default ({
             ? [end, start]
             : [0, 0];
         let newDomain = domain;
-        if (type !== "ordinal" && !isNaN(domain[1]) && !auto) {
+        const fixedDomain = extent && extent.min!="" && extent.max!="";   //判断配置项中是否强制了最大最小值，如果已经被强制了，就不计算newDomain
+        if (type !== "ordinal" && !isNaN(domain[1]) && !auto && !fixedDomain) {
           newDomain = getNewDomain(domain, mode, _step);
         }
         let scaler = scales[type]().domain(newDomain).range(range);
 
         scaler.type = type;
-        if (type !== "ordinal") scaler.clamp(true); //scaler.nice().clamp(true)
+        if (type !== "ordinal") scaler.clamp(true);
+        
         const allTicks = ticks
           ? ticks
           : scaler.ticks
@@ -417,7 +418,6 @@ export default ({
         });
       }
     });
-
     tmp.get("x") && (tmp.get("x").positions = xAxisPositions);
     return tmp;
   }, [axes]);