@easyv/charts 1.3.15 → 1.3.17

package/lib/components/PieChart.js

@@ -435,8 +435,9 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
 
     var _series = (0, _toConsumableArray2["default"])(series.values());
 
+    if (_series.length < arcs.length) console.warn("请检查数据中是否存在相同的s");
     return arcs.map(function (arc, index) {
-      return getArc(radius, arc, _series[index]);
+      return getArc(radius, arc, _series[index % _series.length]);
     });
   }, [series, arcs, radius]);
 

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/utils/index.js

@@ -833,7 +833,7 @@ var getDataWithPercent = function getDataWithPercent() {
     }
 
     var sum = valueList.reduce(function (acc, val) {
-      return acc + val.data.y;
+      return acc + val.value;
     }, 0);
 
     if (sum === 0) {
@@ -842,7 +842,7 @@ var getDataWithPercent = function getDataWithPercent() {
 
     var digits = Math.pow(10, precision);
     var votesPerQuota = valueList.map(function (val) {
-      return val.data.y / sum * digits * 100;
+      return val.value / sum * digits * 100;
     });
     var targetSeats = digits * 100;
     var seats = votesPerQuota.map(function (votes) {

package/package.json

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

package/src/components/PieChart.js

@@ -175,22 +175,24 @@ const getArc = (
     ...rest
   },
   series
-) => ({
-  ...rest,
-  type: 'pie',
-  fieldName: series.fieldName,
-  displayName: series.displayName || rest.data.s,
-  series: series,
-  innerRadius: innerRadius * radius,
-  outerRadius: outerRadius * radius,
-  arc: arc()
-    .innerRadius(innerRadius * radius)
-    .outerRadius(outerRadius * radius)
-    .cornerRadius(cornerRadius)
-    .startAngle(startAngle)
-    .endAngle(endAngle)
-    .padAngle(padAngle),
-});
+) => {
+  return {
+    ...rest,
+    type: 'pie',
+    fieldName: series.fieldName,
+    displayName: series.displayName || rest.data.s,
+    series: series,
+    innerRadius: innerRadius * radius,
+    outerRadius: outerRadius * radius,
+    arc: arc()
+      .innerRadius(innerRadius * radius)
+      .outerRadius(outerRadius * radius)
+      .cornerRadius(cornerRadius)
+      .startAngle(startAngle)
+      .endAngle(endAngle)
+      .padAngle(padAngle),
+  } 
+};
 
 const getCircleScale = ({ count, color, width, length } = tick, radius) => {
   let data = [],
@@ -353,7 +355,8 @@ const Component = memo(
       const seriesLength = series.size;
       if (!seriesLength) return [];
       const _series = [...series.values()];
-      return arcs.map((arc, index) => getArc(radius, arc, _series[index]));
+      if(_series.length<arcs.length) console.warn("请检查数据中是否存在相同的s")
+      return arcs.map((arc, index) => getArc(radius, arc, _series[index%_series.length]));
     }, [series, arcs, radius]);
     const onClick = useCallback(
       (e) =>

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/utils/index.js

@@ -663,14 +663,14 @@ const getDataWithPercent = (data = [], precision = 0) => {
       return 0;
     }
     const sum = valueList.reduce( function (acc, val) {
-      return acc + val.data.y;
+      return acc + val.value;
     }, 0);
     if (sum === 0) {
       return 0;
     }
     const digits = Math.pow(10, precision);
     const votesPerQuota = valueList.map(function (val) {
-      return val.data.y / sum * digits * 100;
+      return val.value / sum * digits * 100;
     });
     const targetSeats = digits * 100;
     const seats = votesPerQuota.map(function (votes) {