@easyv/charts 1.10.17 → 1.10.19

package/lib/components/CartesianChart.js

@@ -146,7 +146,7 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       cPercent: dragPercent,
       cBarX: controlX
     });
-  }, [JSON.stringify(control)]);
+  }, [JSON.stringify(control), width, height]);
   var svg = (0, _react.useRef)();
   var axes = (0, _hooks.useAxes)({
     axes: axesConfig,

package/lib/components/Control.js

@@ -59,9 +59,9 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(
   };
   var controllerStyle = {
     position: "relative",
-    width: 12,
+    width: 2,
     height: height,
-    padding: "0 5px",
+    // padding: "0 5px",
     cursor: enableStretch ? "col-resize" : "auto",
     background: "rgb(2, 176, 249)",
     WebkitBackgroundClip: "content-box"
@@ -268,9 +268,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(
     ref: ref,
     style: barStyle
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    style: _objectSpread(_objectSpread({}, controllerStyle), {}, {
-      transform: "translateX(-6px)"
-    }),
+    style: _objectSpread({}, controllerStyle),
     onMouseDown: leftDown,
     onTouchStart: leftTouchStart
   }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -279,9 +277,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(
     onTouchStart: touchStart,
     ref: barRef
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    style: _objectSpread(_objectSpread({}, controllerStyle), {}, {
-      transform: "translateX(6px)"
-    }),
+    style: _objectSpread({}, controllerStyle),
     onMouseDown: rightDown,
     onTouchStart: rightTouchStart
   })));

package/lib/components/PieChart.js

@@ -22,7 +22,6 @@ var _formatter = require("../formatter");
 var _piechartModule = _interopRequireDefault(require("../css/piechart.module.css"));
 var _hooks = require("../hooks");
 var _PieTooltip = require("./PieTooltip");
-var _legendPlacement = require("../utils/legendPlacement");
 var _excluded = ["startAngle", "endAngle", "antiClockwise"],
   _excluded2 = ["padAngle", "innerRadius", "outerRadius", "cornerRadius", "startAngle", "endAngle"],
   _excluded3 = ["formatter"],
@@ -35,41 +34,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PI = Math.PI;
-var PIE_ADAPTIVE_MARGINS = {
-  right: {
-    marginTop: 24,
-    marginBottom: 24,
-    marginLeft: 0,
-    marginRight: 200
-  },
-  left: {
-    marginTop: 24,
-    marginBottom: 24,
-    marginLeft: 200,
-    marginRight: 0
-  },
-  top: {
-    marginTop: 110,
-    marginBottom: 24,
-    marginLeft: 24,
-    marginRight: 24
-  },
-  bottom: {
-    marginTop: 24,
-    marginBottom: 110,
-    marginLeft: 24,
-    marginRight: 24
-  },
-  hidden: {
-    marginTop: 24,
-    marginBottom: 24,
-    marginLeft: 24,
-    marginRight: 24
-  }
-};
-var getPieAdaptiveMargin = function getPieAdaptiveMargin(show, alignment) {
-  return (0, _legendPlacement.getPieAdaptiveMarginPreset)(show, alignment, PIE_ADAPTIVE_MARGINS);
-};
 var defaultChart = {
   outerRadius: 1,
   innerRadius: 0,
@@ -274,7 +238,6 @@ var getCircleScale = function getCircleScale() {
   }));
 };
 var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
-  var _legend$config2;
   var width = _ref5.width,
     height = _ref5.height,
     _ref5$config = _ref5.config,
@@ -358,43 +321,8 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
     chartWidth = _useContext.width,
     chartHeight = _useContext.height,
     triggerOnRelative = _useContext.triggerOnRelative,
-    onEmit = _useContext.onEmit,
-    updateConfig = _useContext.updateConfig;
-  var _legend$config = legend.config,
-    legendShow = _legend$config.show,
-    _legend$config$name = _legend$config.name,
-    _legend$config$name2 = _legend$config$name === void 0 ? {} : _legend$config$name,
-    legendLayoutMode = _legend$config$name2.layoutMode;
-  var legendAlignment = (_legend$config2 = legend.config) === null || _legend$config2 === void 0 || (_legend$config2 = _legend$config2.layout) === null || _legend$config2 === void 0 ? void 0 : _legend$config2.alignment;
-  var adaptiveMarginPresetKey = (0, _react.useRef)("");
-  (0, _react.useEffect)(function () {
-    if (legendLayoutMode !== "Adaptive" || !updateConfig) return;
-    var presetKey = "".concat(legendLayoutMode, "-").concat(legendShow, "-").concat(legendAlignment);
-    if (adaptiveMarginPresetKey.current === presetKey) return;
-    adaptiveMarginPresetKey.current = presetKey;
-    var target = getPieAdaptiveMargin(legendShow, legendAlignment);
-    updateConfig({
-      id: id,
-      type: "config",
-      payload: [{
-        path: ["chart", "margin", "marginTop"],
-        field: "value",
-        value: target.marginTop
-      }, {
-        path: ["chart", "margin", "marginBottom"],
-        field: "value",
-        value: target.marginBottom
-      }, {
-        path: ["chart", "margin", "marginLeft"],
-        field: "value",
-        value: target.marginLeft
-      }, {
-        path: ["chart", "margin", "marginRight"],
-        field: "value",
-        value: target.marginRight
-      }]
-    });
-  }, [id, updateConfig, legendLayoutMode, legendShow, legendAlignment]);
+    onEmit = _useContext.onEmit;
+  // chart.margin 以用户配置为准；Adaptive 仅走 Legend 侧栏/顶底排版，不再 updateConfig 写预设边距
   var _useState = (0, _react.useState)(1),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     y = _useState2[0],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.10.17",
+  "version": "1.10.19",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -55,4 +55,4 @@
       "commit": true
     }
   }
-}
+}

package/src/components/CartesianChart.js

@@ -128,7 +128,7 @@ const Chart = memo(
         cPercent: dragPercent,
         cBarX: controlX,
       });
-    }, [JSON.stringify(control)]);
+    }, [JSON.stringify(control), width, height]);
 
     const svg = useRef();
     const axes = useAxes({

package/src/components/Control.jsx

@@ -43,12 +43,12 @@ export default memo(
     };
     const controllerStyle = {
       position: "relative",
-      width: 12,
+      width: 2,
       height,
-      padding: "0 5px",
+      // padding: "0 5px",
       cursor: enableStretch ? "col-resize" : "auto",
       background: "rgb(2, 176, 249)",
-      WebkitBackgroundClip: "content-box"
+      WebkitBackgroundClip: "content-box",
     };
 
     //左手柄的鼠标按下逻辑
@@ -278,7 +278,7 @@ export default memo(
         {/* 控制条 */}
         <div ref={ref} style={barStyle}>
           <div
-            style={{ ...controllerStyle, transform: "translateX(-6px)" }}
+            style={{ ...controllerStyle }}
             onMouseDown={leftDown}
             onTouchStart={leftTouchStart}
           ></div>
@@ -289,7 +289,7 @@ export default memo(
             ref={barRef}
           ></div>
           <div
-            style={{ ...controllerStyle, transform: `translateX(6px)` }}
+            style={{ ...controllerStyle }}
             onMouseDown={rightDown}
             onTouchStart={rightTouchStart}
           ></div>

package/src/components/PieChart.js

@@ -34,21 +34,9 @@ import { pieLegendFormatter as legendFormatter } from "../formatter";
 import ringCss from "../css/piechart.module.css";
 import { useAiDataOfPie } from "../hooks";
 import { PieTooltip } from "./PieTooltip";
-import { getPieAdaptiveMarginPreset } from "../utils/legendPlacement";
 
 const PI = Math.PI;
 
-const PIE_ADAPTIVE_MARGINS = {
-  right: { marginTop: 24, marginBottom: 24, marginLeft: 0, marginRight: 200 },
-  left: { marginTop: 24, marginBottom: 24, marginLeft: 200, marginRight: 0 },
-  top: { marginTop: 110, marginBottom: 24, marginLeft: 24, marginRight: 24 },
-  bottom: { marginTop: 24, marginBottom: 110, marginLeft: 24, marginRight: 24 },
-  hidden: { marginTop: 24, marginBottom: 24, marginLeft: 24, marginRight: 24 },
-};
-
-const getPieAdaptiveMargin = (show, alignment) =>
-  getPieAdaptiveMarginPreset(show, alignment, PIE_ADAPTIVE_MARGINS);
-
 const defaultChart = {
   outerRadius: 1,
   innerRadius: 0,
@@ -312,45 +300,8 @@ const Component = memo(
       height: chartHeight,
       triggerOnRelative,
       onEmit,
-      updateConfig,
     } = useContext(chartContext);
-    const { show: legendShow, name: { layoutMode: legendLayoutMode } = {} } =
-      legend.config;
-    const legendAlignment = legend.config?.layout?.alignment;
-    const adaptiveMarginPresetKey = useRef("");
-    useEffect(() => {
-      if (legendLayoutMode !== "Adaptive" || !updateConfig) return;
-      const presetKey = `${legendLayoutMode}-${legendShow}-${legendAlignment}`;
-      if (adaptiveMarginPresetKey.current === presetKey) return;
-      adaptiveMarginPresetKey.current = presetKey;
-      const target = getPieAdaptiveMargin(legendShow, legendAlignment);
-      updateConfig({
-        id,
-        type: "config",
-        payload: [
-          {
-            path: ["chart", "margin", "marginTop"],
-            field: "value",
-            value: target.marginTop,
-          },
-          {
-            path: ["chart", "margin", "marginBottom"],
-            field: "value",
-            value: target.marginBottom,
-          },
-          {
-            path: ["chart", "margin", "marginLeft"],
-            field: "value",
-            value: target.marginLeft,
-          },
-          {
-            path: ["chart", "margin", "marginRight"],
-            field: "value",
-            value: target.marginRight,
-          },
-        ],
-      });
-    }, [id, updateConfig, legendLayoutMode, legendShow, legendAlignment]);
+    // chart.margin 以用户配置为准；Adaptive 仅走 Legend 侧栏/顶底排版，不再 updateConfig 写预设边距
     const [y, setY] = useState(1);
     const radius = (Math.min(chartWidth, chartHeight) / 2) * outerRadius;