@easyv/charts 1.3.13 → 1.3.14

package/lib/hooks/useAxes.js

@@ -21,6 +21,44 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+var getCount = function getCount(num) {
+  var i = 0,
+      num_ = Math.abs(num);
+  if (num_ < 1) return i;
+
+  while (num_ > 10) {
+    i++;
+    num_ = Math.floor(num_ / 10);
+  }
+
+  return i;
+};
+
+var getNewDomain = function getNewDomain(domain, mode, step) {
+  var newDomain = [];
+  var min = domain[0],
+      max = domain[1];
+  var 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;
+      break;
+
+    case 'step':
+      newDomain = [domain[0], domain[0]];
+
+      while (newDomain[1] < domain[1]) {
+        newDomain[1] += step;
+      }
+
+  }
+
+  return newDomain;
+};
+
 var scales = {
   linear: _d3Scale.scaleLinear,
   log: _d3Scale.scaleLog,
@@ -70,7 +108,13 @@ var _default = function _default(_ref) {
       var start = _paddingOuter / 2;
       var end = length - start;
       var range = direction === 'horizontal' ? [start, end] : direction === 'vertical' ? [end, start] : [0, 0];
-      var scaler = scales[type]().domain(domain).range(range);
+      var newDomain = domain;
+
+      if (type !== 'ordinal' && !isNaN(domain[1])) {
+        newDomain = getNewDomain(domain, mode, step);
+      }
+
+      var scaler = scales[type]().domain(newDomain).range(range);
       scaler.type = type;
       if (type !== 'ordinal') scaler.nice().clamp(true);
       var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
@@ -88,7 +132,7 @@ var _default = function _default(_ref) {
               break;
 
             case 'step':
-              _ticks = (0, _utils2.getYTicksByStep)(_ticks[_ticks.length - 1], _ticks[0], +step);
+              _ticks = (0, _utils2.getYTicksByStep)(newDomain[1], _ticks[0], +step);
               break;
           }
         }

package/package.json

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

package/src/hooks/useAxes.js

@@ -6,6 +6,36 @@ import {
   getYTicks,
 } from '@easyv/utils/lib/common/utils';
 
+const getCount = (num)=>{
+  let i=0, num_ = Math.abs(num);
+  if(num_<1) return i;
+  while(num_>10){
+    i++;
+    num_=Math.floor(num_/10);
+  }
+  return i;
+}
+
+const getNewDomain=(domain, mode, step)=>{
+  let newDomain=[];
+  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;
+      break;
+    case 'step':
+      newDomain = [domain[0],domain[0]];
+      while(newDomain[1]<domain[1]){
+        newDomain[1]+=step
+      }
+      
+  }
+  return newDomain;
+}
+
 const scales = {
   linear: scaleLinear,
   log: scaleLog,
@@ -66,8 +96,11 @@ export default ({ axes, context: { width, height } }) => {
           : direction === 'vertical'
             ? [end, start]
             : [0, 0];
-
-      const scaler = scales[type]().domain(domain).range(range);
+      let newDomain = domain;
+      if(type !== 'ordinal' && !isNaN(domain[1])){
+        newDomain = getNewDomain(domain, mode, step);
+      }
+      const scaler = scales[type]().domain(newDomain).range(range);
       scaler.type = type;
 
       if (type !== 'ordinal') scaler.nice().clamp(true);
@@ -79,7 +112,6 @@ export default ({ axes, context: { width, height } }) => {
           : scaler.domain();
 
       let _ticks = allTicks;
-      
       if (type === 'ordinal') {
         if (carousel === false) {
           _ticks = getTicksOfAxis(_ticks, +tickCount, showLast);
@@ -96,7 +128,7 @@ export default ({ axes, context: { width, height } }) => {
               break;
             case 'step':
               _ticks = getYTicksByStep(
-                _ticks[_ticks.length - 1],
+                newDomain[1],
                 _ticks[0],
                 +step
               );