@easyv/charts 1.3.16 → 1.3.18

package/lib/hooks/useAnimateData.js

@@ -55,7 +55,7 @@ var _default = function _default(data, dataAnimation) {
                 };
                 var delta = current.y - y;
                 return _objectSpread(_objectSpread({}, current), {}, {
-                  y: Math.floor(y + delta * v)
+                  y: y + delta * v
                 });
               });
             } else {
@@ -65,7 +65,7 @@ var _default = function _default(data, dataAnimation) {
                 };
                 var delta = oldCurrent.y - current.y;
                 return _objectSpread(_objectSpread({}, current), {}, {
-                  y: Math.floor(oldCurrent.y + delta * v)
+                  y: oldCurrent.y + delta * v
                 });
               });
             }

package/lib/hooks/useAxes.js

@@ -110,7 +110,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 (mode != "count" && type !== 'ordinal' && !isNaN(domain[1])) {
         newDomain = getNewDomain(domain, mode, step);
       }
 
@@ -128,7 +128,9 @@ var _default = function _default(_ref) {
         if (auto === false) {
           switch (mode) {
             case 'count':
-              _ticks = (0, _utils2.getYTicks)(_ticks[_ticks.length - 1], _ticks[0], +tickCount);
+              _ticks = (0, _utils2.getYTicks)(domain[1], domain[0], // _ticks[_ticks.length - 1],
+              // _ticks[0],
+              +tickCount);
               break;
 
             case 'step':

package/package.json

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

package/src/components/CartesianChart.js

@@ -67,7 +67,6 @@ const Chart = memo(
     } = useContext(chartContext);
 
     const svg = createRef();
-
     const axes = useAxes({ axes: axesConfig, context });
     const axisX = useCarouselAxisX(axes.get('x'), animation);
 
@@ -138,7 +137,6 @@ const Chart = memo(
               bandLength={bandLength}
             />
           )}
-          
           {[...axes.values()].reverse().map((item, index) => {
             const config = item.axisType == 'x' ? axisX : item;
             return (

package/src/hooks/useAnimateData.ts

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { animate, linear } from 'popmotion';
+import { animate, easeIn, easeOut, linear } from 'popmotion';
 
 /**
  * 图表数据动画
@@ -36,7 +36,7 @@ export default (data: DataType[], dataAnimation: DataAnimation) => {
                 const delta: number = current.y - y;
                 return {
                   ...current,
-                  y: Math.floor(y + delta * v),
+                  y: y + delta * v,
                 };
               });
             } else {
@@ -45,7 +45,7 @@ export default (data: DataType[], dataAnimation: DataAnimation) => {
                 const delta = oldCurrent.y - current.y;
                 return {
                   ...current,
-                  y: Math.floor(oldCurrent.y + delta * v),
+                  y:oldCurrent.y + delta * v,
                 };
               });
             }

package/src/hooks/useAxes.js

@@ -97,20 +97,18 @@ export default ({ axes, context: { width, height } }) => {
             ? [end, start]
             : [0, 0];
       let newDomain = domain;
-      if(type !== 'ordinal' && !isNaN(domain[1])){
+      if(mode != "count" && 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);
-
       const allTicks = ticks
         ? ticks
         : scaler.ticks
           ? scaler.ticks(tickCount)
           : scaler.domain();
-
       let _ticks = allTicks;
       if (type === 'ordinal') {
         if (carousel === false) {
@@ -121,8 +119,10 @@ export default ({ axes, context: { width, height } }) => {
           switch (mode) {
             case 'count':
               _ticks = getYTicks(
-                _ticks[_ticks.length - 1],
-                _ticks[0],
+                domain[1],
+                domain[0],
+                // _ticks[_ticks.length - 1],
+                // _ticks[0],
                 +tickCount
               );
               break;
@@ -155,7 +155,6 @@ export default ({ axes, context: { width, height } }) => {
           }
         }
       }
-
       tmp.set(axisType, {
         ...item,
         scaler,