@easyv/charts 1.4.36 → 1.4.38

package/lib/hooks/useAxes.js

@@ -35,7 +35,13 @@ var getCount = function getCount(num) {
 };
 
 var getNewDomain = function getNewDomain(domain, mode, step) {
-  var newDomain = [];
+  var extent = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var _extent$min = extent.min,
+      bottom = _extent$min === void 0 ? "" : _extent$min,
+      _extent$max = extent.max,
+      top = _extent$max === void 0 ? "" : _extent$max;
+  var newDomain = []; //能进入这个函数，说明extent中min和max至少有一个是缺失的，如果max存在，意味着纵轴上限被固定
+
   var min = domain[0],
       max = domain[1];
   var minCount = Math.pow(10, getCount(min)),
@@ -43,17 +49,26 @@ var getNewDomain = function getNewDomain(domain, mode, step) {
 
   switch (mode) {
     case "count":
-      newDomain[0] = Math.floor(domain[0] / minCount) * minCount;
-      newDomain[1] = Math.ceil(domain[1] / maxCount) * maxCount;
+      newDomain[0] = bottom != "" ? bottom : Math.floor(domain[0] / minCount) * minCount;
+      newDomain[1] = top != "" ? top : Math.ceil(domain[1] / maxCount) * maxCount;
       break;
 
     case "step":
-      newDomain = [domain[0], domain[0]];
+      if (top != "") {
+        newDomain = [domain[1], domain[1]];
+
+        while (newDomain[0] > domain[0]) {
+          newDomain[0] -= step;
+        }
+      } else {
+        newDomain = [domain[0], domain[0]];
 
-      while (newDomain[1] < domain[1]) {
-        newDomain[1] += step;
+        while (newDomain[1] < domain[1]) {
+          newDomain[1] += step;
+        }
       }
 
+      break;
   }
 
   return newDomain;
@@ -102,6 +117,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 +332,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) {
-          newDomain = getNewDomain(domain, mode, _step);
+        if (type !== "ordinal" && !isNaN(domain[1]) && !auto && !fixedDomain) {
+          newDomain = getNewDomain(domain, mode, _step, extent);
         }
 
         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.38",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/hooks/useAxes.js

@@ -14,22 +14,32 @@ const getCount = (num) => {
   return i;
 };
 
-const getNewDomain = (domain, mode, step) => {
+const getNewDomain = (domain, mode, step, extent={}) => {
+  const { min:bottom="", max:top="" } = extent;
   let newDomain = [];
+  //能进入这个函数，说明extent中min和max至少有一个是缺失的，如果max存在，意味着纵轴上限被固定
   let min = domain[0],
     max = domain[1];
   let minCount = Math.pow(10, getCount(min)),
     maxCount = Math.pow(10, getCount(max));
   switch (mode) {
     case "count":
-      newDomain[0] = Math.floor(domain[0] / minCount) * minCount;
-      newDomain[1] = Math.ceil(domain[1] / maxCount) * maxCount;
+      newDomain[0] = bottom!=""?bottom:Math.floor(domain[0] / minCount) * minCount;
+      newDomain[1] = top!=""?top:Math.ceil(domain[1] / maxCount) * maxCount;
       break;
     case "step":
-      newDomain = [domain[0], domain[0]];
-      while (newDomain[1] < domain[1]) {
-        newDomain[1] += step;
+      if(top!=""){
+        newDomain = [domain[1], domain[1]];
+        while (newDomain[0] > domain[0]) {
+          newDomain[0] -= step;
+        }
+      }else{
+        newDomain = [domain[0], domain[0]];
+        while (newDomain[1] < domain[1]) {
+          newDomain[1] += step;
+        }
       }
+      break;
   }
   return newDomain;
 };
@@ -72,7 +82,7 @@ export default ({
     axes.forEach((item) => {
       const {
         config: {
-          label: { showLast = false, decimal = 0 },
+          label: { extent, showLast = false, decimal = 0 },
         },
         type,
         orientation,
@@ -96,7 +106,6 @@ export default ({
         clipPosition
       } = item;
       //如果是断轴类型，输出一套完全不同的values
-
       /**
        * 获取轴的：朝向direction，起点位置start，终点位置end
        * @param {*} orientation
@@ -331,13 +340,15 @@ export default ({
             ? [end, start]
             : [0, 0];
         let newDomain = domain;
-        if (type !== "ordinal" && !isNaN(domain[1]) && !auto) {
-          newDomain = getNewDomain(domain, mode, _step);
+        const fixedDomain = extent && extent.min!="" && extent.max!="";   //判断配置项中是否强制了最大最小值，如果已经被强制了，就不计算newDomain
+        if (type !== "ordinal" && !isNaN(domain[1]) && !auto && !fixedDomain) {
+          newDomain = getNewDomain(domain, mode, _step, extent);
         }
         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 +428,6 @@ export default ({
         });
       }
     });
-
     tmp.get("x") && (tmp.get("x").positions = xAxisPositions);
     return tmp;
   }, [axes]);