@easyv/charts 1.7.22 → 1.7.24

package/lib/components/CartesianChart.js

@@ -24,13 +24,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * 轴类图表
  */
 var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
-  var _ref$config = _ref.config,
+  var width = _ref.width,
+    height = _ref.height,
+    _ref$config = _ref.config,
     axesConfig = _ref$config.axes,
     background = _ref$config.background,
     _ref$config$chart = _ref$config.chart,
-    _ref$config$chart$dim = _ref$config$chart.dimension.chartDimension,
-    height = _ref$config$chart$dim.height,
-    width = _ref$config$chart$dim.width,
     _ref$config$chart$mar = _ref$config$chart.margin,
     marginLeft = _ref$config$chart$mar.marginLeft,
     marginTop = _ref$config$chart$mar.marginTop,

package/lib/components/Chart.js

@@ -39,11 +39,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
     config = _ref2.config,
     _ref2$config = _ref2.config,
     axes = _ref2$config.axes,
-    _ref2$config$chart = _ref2$config.chart,
-    _ref2$config$chart$di = _ref2$config$chart.dimension.chartDimension,
-    height = _ref2$config$chart$di.height,
-    width = _ref2$config$chart$di.width,
-    _ref2$config$chart$ma = _ref2$config$chart.margin,
+    _ref2$config$chart$ma = _ref2$config.chart.margin,
     marginRight = _ref2$config$chart$ma.marginRight,
     marginLeft = _ref2$config$chart$ma.marginLeft,
     marginBottom = _ref2$config$chart$ma.marginBottom,
@@ -54,6 +50,8 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref2) {
     emit = _ref2.emit,
     emitEvent = _ref2.emitEvent,
     props = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
+  var width = props.width,
+    height = props.height;
   var isIOS = (0, _react.useRef)(/iPad|iPhone|iPod|iOS|CriOS/i.test(navigator.userAgent));
   var svg = /*#__PURE__*/(0, _react.createRef)();
   var chartWidth = width - marginLeft - marginRight;

package/lib/components/Label.js

@@ -152,7 +152,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
       "data-data": JSON.stringify(data)
     }, showIcon && !isNaN(attr.y) && /*#__PURE__*/React.createElement(Icon, {
       cx: attr.x,
-      cy: attr.y,
+      cy: y2,
       config: icon
     }), showLabel && /*#__PURE__*/React.createElement(Label, (0, _extends2["default"])({
       value: showY,

package/lib/components/PieChart.js

@@ -232,11 +232,10 @@ var getCircleScale = function getCircleScale() {
   }));
 };
 var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
-  var _ref5$config = _ref5.config,
+  var width = _ref5.width,
+    height = _ref5.height,
+    _ref5$config = _ref5.config,
     _ref5$config$chart = _ref5$config.chart,
-    _ref5$config$chart$di = _ref5$config$chart.dimension.chartDimension,
-    width = _ref5$config$chart$di.width,
-    height = _ref5$config$chart$di.height,
     label = _ref5$config$chart.label,
     _ref5$config$chart$le = _ref5$config$chart.legend,
     _ref5$config$chart$le2 = _ref5$config$chart$le.formatter,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.7.22",
+  "version": "1.7.24",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "standard-version": "^9.3.2"
   },
   "dependencies": {
-    "@easyv/utils": "^0.0.45",
+    "@easyv/utils": "^0.0.50",
     "d3v7": "npm:d3@^7.0.0",
     "gitignore": "^0.7.0",
     "mrm": "^4.0.0",

package/src/components/CartesianChart.js

@@ -33,13 +33,11 @@ import {
 
 const Chart = memo(
   ({
+    width, height,
     config: {
       axes: axesConfig,
       background,
       chart: {
-        dimension: {
-          chartDimension: { height, width },
-        },
         margin: { marginLeft, marginTop, marginRight, marginBottom },
         animation,
         legend,

package/src/components/Chart.js

@@ -26,9 +26,6 @@ const Chart = memo(
     config: {
       axes,
       chart: {
-        dimension: {
-          chartDimension: { height, width },
-        },
         margin: { marginRight, marginLeft, marginBottom, marginTop },
       },
       interaction,
@@ -39,6 +36,7 @@ const Chart = memo(
     emitEvent,
     ...props
   }) => {
+    const { width, height } = props;
     const isIOS = useRef(/iPad|iPhone|iPod|iOS|CriOS/i.test(navigator.userAgent));
     const svg = createRef();
     const chartWidth = width - marginLeft - marginRight;

package/src/components/Label.js

@@ -118,7 +118,7 @@ export default memo(
                 data-data={JSON.stringify(data)}
               >
                 {showIcon && !isNaN(attr.y) && (
-                  <Icon cx={attr.x} cy={attr.y} config={icon} />
+                  <Icon cx={attr.x} cy={y2} config={icon} />
                 )}
                 {showLabel && <Label value={showY} config={label} reverse={reverse} {...attr} />}
               </g>

package/src/components/PieChart.js

@@ -247,11 +247,9 @@ const getCircleScale = ({ count, color, width, length } = tick, radius) => {
 
 const Component = memo(
   ({
+    width, height,
     config: {
       chart: {
-        dimension: {
-          chartDimension: { width, height },
-        },
         label,
         legend: { formatter = legendFormatter, ...legend },
         animation: { ringDuration, labelDuration } = {},