@easyv/charts 1.4.7 → 1.4.9

package/lib/hooks/useAxes.js

@@ -59,6 +59,17 @@ var getNewDomain = function getNewDomain(domain, mode, step) {
   return newDomain;
 };
 
+var getTickCount = function getTickCount(domain, count, decimal) {
+  var multiple = Math.pow(10, decimal);
+  var gap = domain[1] * multiple - domain[0] * multiple;
+
+  if (gap < count) {
+    return Math.max(2, 1 + gap);
+  }
+
+  return count;
+};
+
 var scales = {
   linear: _d3Scale.scaleLinear,
   log: _d3Scale.scaleLog,
@@ -83,13 +94,16 @@ var _default = function _default(_ref) {
     var tmp = new Map();
     var xAxisPositions = [];
     axes.forEach(function (item) {
-      var _item$config$label$sh = item.config.label.showLast,
+      var _item$config$label = item.config.label,
+          _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,
+          decimal = _item$config$label$de === void 0 ? 0 : _item$config$label$de,
           type = item.type,
           orientation = item.orientation,
           ticks = item.ticks,
           _item$tickCount = item.tickCount,
-          tickCount = _item$tickCount === void 0 ? 1 : _item$tickCount,
+          count = _item$tickCount === void 0 ? 1 : _item$tickCount,
           _item$step = item.step,
           step = _item$step === void 0 ? 1 : _item$step,
           domain = item.domain,
@@ -99,7 +113,9 @@ var _default = function _default(_ref) {
           auto = item.auto,
           mode = item.mode,
           carousel = item.carousel,
-          config = item.config;
+          config = item.config; //计算真正需要的tickCount，如果domain区间太小，不能完全按照count来，需要减少count数
+
+      var tickCount = getTickCount(domain, count, decimal);
       var direction = orientation === 'top' || orientation === 'bottom' ? 'horizontal' : orientation === 'left' || orientation === 'right' ? 'vertical' : '';
       var length = direction === 'horizontal' ? width : direction === 'vertical' ? height : 0;
 
@@ -110,7 +126,7 @@ var _default = function _default(_ref) {
       var range = direction === 'horizontal' ? [start, end] : direction === 'vertical' ? [end, start] : [0, 0];
       var newDomain = domain;
 
-      if (type !== 'ordinal' && !isNaN(domain[1])) {
+      if (type !== 'ordinal' && !isNaN(domain[1]) && !auto) {
         newDomain = getNewDomain(domain, mode, step);
       }
 
@@ -119,7 +135,7 @@ var _default = function _default(_ref) {
       if (type !== 'ordinal') scaler.clamp(true); //scaler.nice().clamp(true)
 
       var allTicks = ticks ? ticks : scaler.ticks ? scaler.ticks(tickCount) : scaler.domain();
-      var _ticks = allTicks;
+      var _ticks = allTicks; // 
 
       if (type === 'ordinal') {
         if (carousel === false) {

package/package.json

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

package/src/hooks/useAxes.js

@@ -30,11 +30,19 @@ const getNewDomain=(domain, mode, step)=>{
       while(newDomain[1]<domain[1]){
         newDomain[1]+=step
       }
-      
   }
   return newDomain;
 }
 
+const getTickCount=(domain, count, decimal)=>{
+  let multiple = Math.pow(10,decimal);
+  let gap = domain[1]*multiple-domain[0]*multiple;
+  if(gap<count){
+    return Math.max(2,1+gap);
+  }
+  return count;
+}
+
 const scales = {
   linear: scaleLinear,
   log: scaleLog,
@@ -56,11 +64,11 @@ export default ({ axes, context: { width, height } }) => {
     const xAxisPositions = [];
     axes.forEach((item) => {
       const {
-        config: { label: { showLast = false } },
+        config: { label: { showLast = false, decimal = 0 } },
         type,
         orientation,
         ticks,
-        tickCount = 1,
+        tickCount :count = 1,
         step = 1,
         domain,
         axisType,
@@ -71,6 +79,8 @@ export default ({ axes, context: { width, height } }) => {
         config,
       } = item;
       
+      //计算真正需要的tickCount，如果domain区间太小，不能完全按照count来，需要减少count数
+      const tickCount = getTickCount(domain,count,decimal); 
       const direction =
         orientation === 'top' || orientation === 'bottom'
           ? 'horizontal'
@@ -95,11 +105,12 @@ export default ({ axes, context: { width, height } }) => {
             ? [end, start]
             : [0, 0];
       let newDomain = domain;
-      if(type !== 'ordinal' && !isNaN(domain[1])){
+      if(type !== 'ordinal' && !isNaN(domain[1]) && !auto){
         newDomain = getNewDomain(domain, mode, step);
       }
       
       const scaler = scales[type]().domain(newDomain).range(range);
+      
       scaler.type = type;
       if (type !== 'ordinal') scaler.clamp(true); //scaler.nice().clamp(true)
       const allTicks = ticks
@@ -108,6 +119,7 @@ export default ({ axes, context: { width, height } }) => {
           ? scaler.ticks(tickCount)
           : scaler.domain();
       let _ticks = allTicks;
+      // 
       if (type === 'ordinal') {
         if (carousel === false) {
           _ticks = getTicksOfAxis(_ticks, +tickCount, showLast);