@easyv/charts 1.5.27 → 1.5.29

package/lib/components/PieChart.js

@@ -286,8 +286,9 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
       _ref5$config$chart$le2 = _ref5$config$chart$le.formatter,
       formatter = _ref5$config$chart$le2 === void 0 ? _formatter.pieLegendFormatter : _ref5$config$chart$le2,
       legend = (0, _objectWithoutProperties2["default"])(_ref5$config$chart$le, _excluded3),
-      _ref5$config$chart$an = _ref5$config$chart.animation,
-      ringDuration = _ref5$config$chart$an.ringDuration,
+      _ref5$config$chart$an = _ref5$config$chart.animation;
+  _ref5$config$chart$an = _ref5$config$chart$an === void 0 ? {} : _ref5$config$chart$an;
+  var ringDuration = _ref5$config$chart$an.ringDuration,
       labelDuration = _ref5$config$chart$an.labelDuration,
       _ref5$config$chart$ma = _ref5$config$chart.margin,
       marginLeft = _ref5$config$chart$ma.marginLeft,

package/lib/hooks/useExtentData.js

@@ -23,6 +23,17 @@ 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 extentRatio = 0;
+
+var extentRange = function extentRange(value, type) {
+  if (value >= 0) {
+    return type == "min" ? value * (1 - extentRatio) : value * (1 + extentRatio);
+  } else {
+    return type == "min" ? value * (1 + extentRatio) : value * (1 - extentRatio);
+  }
+};
+
 var stackData = function stackData(data, series) {
   var dataMap = (0, _d3v.group)(data, function (d) {
     return d.x;
@@ -43,7 +54,7 @@ var stackData = function stackData(data, series) {
       if (d && d.y !== undefined && !isNaN(d.y)) {
         var currentStack = (0, _utils.getCurrentStack)(stack, stacks);
 
-        if (stack && currentStack) {
+        if (stack && currentStack && currentStack.stack) {
           if (d.y >= 0) {
             currentStack.positive += d.y;
             arr.push(currentStack.positive);
@@ -61,7 +72,7 @@ var stackData = function stackData(data, series) {
     max = Math.max.apply(Math, arr.concat([max]));
   });
   dataMap.clear();
-  return [min || 0, max == undefined ? (min || 0) + 100 : max];
+  return [extentRange(min || 0, "min"), extentRange(max == undefined ? (min || 0) + 100 : max, "max")];
 };
 /**
  * 计算轴的domain

package/package.json

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

package/src/components/PieChart.js

@@ -254,7 +254,7 @@ const Component = memo(
         },
         label,
         legend: { formatter = legendFormatter, ...legend },
-        animation: { ringDuration, labelDuration },
+        animation: { ringDuration, labelDuration } = {},
         margin: { marginLeft, marginTop },
       },
       fan: {

package/src/hooks/useExtentData.js

@@ -8,13 +8,21 @@ import {
   getCurrentStack,
 } from "../utils";
 
+//扩张系数，用于扩大数据的最大最小值范围，达到图表尽量居中显示的效果
+const extentRatio = 0;
+const extentRange = (value, type)=>{
+  if(value>=0){
+    return type=="min"?value*(1-extentRatio):value*(1+extentRatio);
+  }else{
+    return type=="min"?value*(1+extentRatio):value*(1-extentRatio);
+  }
+}
 const stackData = (data, series) => {
   const dataMap = group(data, (d) => d.x);
   const stacks = getStacks(series);
 
   let min, max;
   max = min = d3Min(data, (d) => d.y);
-
   dataMap.forEach((value) => {
     const arr = [];
     resetStacks(stacks);
@@ -23,7 +31,7 @@ const stackData = (data, series) => {
       const stack = series.get(d.s);
       if (d && d.y !== undefined && !isNaN(d.y)) {
         const currentStack = getCurrentStack(stack, stacks);
-        if (stack && currentStack) {
+        if (stack && currentStack && currentStack.stack) {
           if (d.y >= 0) {
             currentStack.positive += d.y;
             arr.push(currentStack.positive);
@@ -40,7 +48,7 @@ const stackData = (data, series) => {
     max = Math.max(...arr, max);
   });
   dataMap.clear();
-  return [min || 0, max==undefined?(min || 0) + 100:max];
+  return [extentRange(min || 0, "min"), extentRange(max==undefined?(min || 0) + 100:max, "max")];
 };
 
 /**