@easyv/charts 1.8.13 → 1.8.14

package/lib/components/PieChart.js

@@ -947,6 +947,7 @@ var Label = function Label(_ref10) {
     _ref10$config$value = _ref10$config.value,
     showValue = _ref10$config$value.show,
     valueFont = _ref10$config$value.font,
+    valueSameColor = _ref10$config$value.sameColor,
     _ref10$config$value$s = _ref10$config$value.suffix,
     showSuffix = _ref10$config$value$s.show,
     text = _ref10$config$value$s.text,
@@ -956,6 +957,7 @@ var Label = function Label(_ref10) {
     suffixTranslateY = _ref10$config$value$s2.y,
     _ref10$config$percent = _ref10$config.percent,
     showPercent = _ref10$config$percent.show,
+    percentSameColor = _ref10$config$percent.sameColor,
     percentFont = _ref10$config$percent.font,
     precision = _ref10$config$percent.precision,
     _ref10$iosStyle = _ref10.iosStyle,
@@ -1048,7 +1050,9 @@ var Label = function Label(_ref10) {
         "float": mode == "horizontal" ? "left" : "none"
       })
     }), showValue && /*#__PURE__*/_react["default"].createElement("span", {
-      style: (0, _utils.getFontStyle)(valueFont)
+      style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(valueFont)), {}, {
+        "color": valueSameColor ? pure : valueFont.color
+      })
     }, data.y, showSuffix && /*#__PURE__*/_react["default"].createElement("span", {
       style: {
         position: "relative",
@@ -1057,7 +1061,9 @@ var Label = function Label(_ref10) {
         top: suffixTranslateY
       }
     }, text)), showPercent && /*#__PURE__*/_react["default"].createElement("span", {
-      style: (0, _utils.getFontStyle)(percentFont)
+      style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(percentFont)), {}, {
+        "color": percentSameColor ? pure : percentFont.color
+      })
     }, (_showValue ? "（" : "") + percent + "%" + (_showValue ? "）" : "")))));
   }));
 };
@@ -1203,7 +1209,8 @@ var RingLabel = function RingLabel(_ref12) {
       })
     }), showValue && /*#__PURE__*/_react["default"].createElement("span", {
       style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(valueFont)), {}, {
-        transform: getTranslate(valueTranslate, x3 >= 0)
+        transform: getTranslate(valueTranslate, x3 >= 0),
+        "color": valueSameColor ? pure : valueFont.color
       })
     }, realData.y, showSuffix && /*#__PURE__*/_react["default"].createElement("span", {
       style: {
@@ -1214,7 +1221,8 @@ var RingLabel = function RingLabel(_ref12) {
       }
     }, text)), showPercent && /*#__PURE__*/_react["default"].createElement("span", {
       style: _objectSpread(_objectSpread({}, (0, _utils.getFontStyle)(percentFont)), {}, {
-        transform: getTranslate(percentTranslate, x3 >= 0)
+        transform: getTranslate(percentTranslate, x3 >= 0),
+        "color": percentSameColor ? pure : percentFont.color
       })
     }, (_showValue ? "（" : "") + percent + "%" + (_showValue ? "）" : "")))));
   }));

package/package.json

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

package/src/components/PieChart.js

@@ -1097,6 +1097,7 @@ const Label = ({
     value: {
       show: showValue,
       font: valueFont,
+      sameColor:valueSameColor,
       suffix: {
         show: showSuffix,
         text,
@@ -1104,7 +1105,7 @@ const Label = ({
         translate: { x: suffixTranslateX, y: suffixTranslateY },
       },
     },
-    percent: { show: showPercent, font: percentFont, precision },
+    percent: { show: showPercent,sameColor:percentSameColor, font: percentFont, precision },
   },
   iosStyle: { isIOS, left, top },
   arcs,
@@ -1238,7 +1239,7 @@ const Label = ({
                       ></TextOverflow>
                     )}
                     {showValue && (
-                      <span style={getFontStyle(valueFont)}>
+                      <span style={{...getFontStyle(valueFont),"color":valueSameColor?pure:valueFont.color}}>
                         {data.y}
                         {showSuffix && (
                           <span
@@ -1255,7 +1256,7 @@ const Label = ({
                       </span>
                     )}
                     {showPercent && (
-                      <span style={getFontStyle(percentFont)}>
+                      <span style={{...getFontStyle(percentFont),"color":percentSameColor?pure:percentFont.color}}>
                         {(_showValue ? "（" : "") +
                           percent +
                           "%" +
@@ -1460,6 +1461,7 @@ const RingLabel = ({
                         style={{
                           ...getFontStyle(valueFont),
                           transform: getTranslate(valueTranslate, x3 >= 0),
+                          "color":valueSameColor?pure:valueFont.color
                         }}
                       >
                         {realData.y}
@@ -1482,6 +1484,7 @@ const RingLabel = ({
                         style={{
                           ...getFontStyle(percentFont),
                           transform: getTranslate(percentTranslate, x3 >= 0),
+                          "color":percentSameColor?pure:percentFont.color
                         }}
                       >
                         {(_showValue ? "（" : "") +