@easyv/charts 1.4.2 → 1.4.4

package/lib/components/Label.js

@@ -169,10 +169,10 @@ var Icon = function Icon(_ref4) {
   }) : mode == 'double' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
     cx: cx,
     cy: cy
-  }, inner)), /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
+  }, outer)), /*#__PURE__*/React.createElement(Circle, (0, _extends2["default"])({
     cx: cx,
     cy: cy
-  }, outer))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("image", {
+  }, inner))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("image", {
     width: width,
     height: height,
     x: cx - width / 2,

package/lib/components/PieChart.js

@@ -205,7 +205,7 @@ var getAngle = function getAngle(_ref2) {
   });
 };
 
-var getArc = function getArc(radius, _ref3, series) {
+var getArc = function getArc(radius, _ref3, series_, index) {
   var _ref3$padAngle = _ref3.padAngle,
       padAngle = _ref3$padAngle === void 0 ? 0 : _ref3$padAngle,
       _ref3$innerRadius = _ref3.innerRadius,
@@ -219,6 +219,9 @@ var getArc = function getArc(radius, _ref3, series) {
       _ref3$endAngle = _ref3.endAngle,
       endAngle = _ref3$endAngle === void 0 ? 360 : _ref3$endAngle,
       rest = (0, _objectWithoutProperties2["default"])(_ref3, _excluded2);
+  var series = series_.find(function (s) {
+    return s.fieldName == rest.data.s;
+  }) || series_[index % series_.length];
   return _objectSpread(_objectSpread({}, rest), {}, {
     type: 'pie',
     fieldName: series.fieldName,
@@ -455,7 +458,7 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
         outerRadius: outerRadius
       });
     });
-  }, [data, arcsFunc, arcsFuncTwo, chart, legendPrecision]);
+  }, [data, arcsFunc, arcsFuncTwo, chart, legendPrecision, order]);
 
   var _arcs = (0, _react.useMemo)(function () {
     var seriesLength = series.size;
@@ -465,7 +468,7 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
 
     if (_series.length < arcs.length) console.warn("请检查数据中是否存在相同的s");
     return arcs.map(function (arc, index) {
-      return getArc(radius, arc, _series[index % _series.length]);
+      return getArc(radius, arc, _series, index);
     });
   }, [series, arcs, radius]);
 

package/package.json

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

package/src/components/Label.js

@@ -146,8 +146,8 @@ const Icon = ({
     <Circle cx={cx} cy={cy} color={color} radius={radius} />
   ) : mode == 'double' ? (
     <>
-      <Circle cx={cx} cy={cy} {...inner} />
       <Circle cx={cx} cy={cy} {...outer} />
+      <Circle cx={cx} cy={cy} {...inner} />
     </>
   ) : (
     <>

package/src/components/PieChart.js

@@ -174,8 +174,10 @@ const getArc = (
     endAngle = 360,
     ...rest
   },
-  series
+  series_,
+  index
 ) => {
+  const series = series_.find(s=>s.fieldName==rest.data.s) || series_[index%series_.length];
   return {
     ...rest,
     type: 'pie',
@@ -336,11 +338,10 @@ const Component = memo(
       });
       if (judgeData == 0) {
         arcs = arcsFuncTwo(data)
-        
       } else {
         arcs = arcsFunc(data)
       }
-    
+      
       //const arcs = arcsFunc(data); 此处是原本的传输饼图data流程
       const legendDataWithPercent = getDataWithPercent(arcs, legendPrecision);
       const _legendDataWithPercent = sortPie(legendDataWithPercent, order);
@@ -372,15 +373,16 @@ const Component = memo(
         innerRadius,
         outerRadius,
       }));
-    }, [data, arcsFunc,arcsFuncTwo, chart, legendPrecision]);
+    }, [data, arcsFunc,arcsFuncTwo, chart, legendPrecision, order]);
 
     const _arcs = useMemo(() => {
       const seriesLength = series.size;
       if (!seriesLength) return [];
       const _series = [...series.values()];
       if(_series.length<arcs.length) console.warn("请检查数据中是否存在相同的s");
-      return arcs.map((arc, index) => getArc(radius, arc, _series[index%_series.length]));
+      return arcs.map((arc, index) => getArc(radius, arc, _series, index));
     }, [series, arcs, radius]);
+
     const onClick = useCallback(
       (e) =>
         onEvent({
@@ -770,9 +772,8 @@ const Current = ({
         fontSize,
         text,
         translate: { x: translateSuffixX, y: translateSuffixY },
-      },
-    },
-    
+      }
+    }
   },
   width,
   height,