@easyv/charts 1.5.18 → 1.5.19

package/lib/components/PieChart.js

@@ -350,6 +350,7 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
 
   var _useContext = (0, _react.useContext)(_context.chartContext),
       id = _useContext.id,
+      isIOS = _useContext.isIOS,
       chartWidth = _useContext.width,
       chartHeight = _useContext.height,
       triggerOnRelative = _useContext.triggerOnRelative,
@@ -796,8 +797,13 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
     }
   }, /*#__PURE__*/_react["default"].createElement(Current, {
     config: current,
-    width: width,
-    height: height,
+    width: chartWidth,
+    height: chartHeight,
+    iosStyle: {
+      marginLeft: marginLeft,
+      marginTop: marginTop,
+      isIOS: isIOS
+    },
     data: _arcs,
     judge: judgeData,
     currentIndex: +currentIndex
@@ -867,6 +873,10 @@ var Current = function Current(_ref9) {
       _ref9$config$value$su2 = _ref9$config$value$su.translate,
       translateSuffixX = _ref9$config$value$su2.x,
       translateSuffixY = _ref9$config$value$su2.y,
+      _ref9$iosStyle = _ref9.iosStyle,
+      isIOS = _ref9$iosStyle.isIOS,
+      marginLeft = _ref9$iosStyle.marginLeft,
+      marginTop = _ref9$iosStyle.marginTop,
       width = _ref9.width,
       height = _ref9.height,
       data = _ref9.data,
@@ -897,17 +907,20 @@ var Current = function Current(_ref9) {
     //foreignObject标签样式，
     width: width,
     height: height,
-    transform: "translate(-".concat(width / 2, "px,-").concat(height / 2, "px)"),
+    position: "relative",
+    overflow: "visible",
     pointerEvents: "none"
   },
       boxStyle = {
     //弹性盒子样式，用于当前值的上下居中对齐等
     width: width,
     height: height,
+    position: "absolute",
     display: "flex",
     flexDirection: "column",
     justifyContent: "center",
-    alignItems: "center"
+    alignItems: "center",
+    transform: isIOS ? "translate(".concat(marginLeft, "px,").concat(marginTop, "px)") : "translate(-".concat(width / 2, "px,-").concat(height / 2, "px)")
   };
   var seriesColor = currentData.series.color;
   seriesColor = seriesColor.type == "pure" ? seriesColor.pure : seriesColor.linear.stops[0].color;

package/package.json

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

package/src/components/PieChart.js

@@ -295,6 +295,7 @@ const Component = memo(
     const { precision: legendPrecision } = legend.config.percent;
     const {
       id,
+      isIOS,
       width: chartWidth,
       height: chartHeight,
       triggerOnRelative,
@@ -826,8 +827,11 @@ const Component = memo(
               >
                 <Current
                   config={current}
-                  width={width}
-                  height={height}
+                  width={chartWidth}
+                  height={chartHeight}
+                  iosStyle={{
+                    marginLeft, marginTop, isIOS
+                  }}
                   data={_arcs}
                   judge={judgeData}
                   currentIndex={+currentIndex}
@@ -910,6 +914,9 @@ const Current = ({
       },
     },
   },
+  iosStyle:{
+    isIOS, marginLeft, marginTop
+  },
   width,
   height,
   data,
@@ -939,17 +946,20 @@ const Current = ({
       //foreignObject标签样式，
       width,
       height,
-      transform: `translate(-${width / 2}px,-${height / 2}px)`,
+      position:"relative",
+      overflow:"visible",
       pointerEvents: "none",
     },
     boxStyle = {
       //弹性盒子样式，用于当前值的上下居中对齐等
       width,
       height,
+      position:"absolute",
       display: "flex",
       flexDirection: "column",
       justifyContent: "center",
       alignItems: "center",
+      transform: isIOS?`translate(${marginLeft}px,${marginTop}px)`:`translate(-${width / 2}px,-${height / 2}px)`,
     };
   let seriesColor = currentData.series.color;
   seriesColor =