@easyv/charts 1.10.19 → 1.10.20

package/lib/components/Legend.js

@@ -214,8 +214,10 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
   var isSideLegend = isPieAdaptive && isSidePlacement;
   var isTopBottomAdaptive = isPieAdaptive && isCenterTopOrBottom;
   var fullWidth = (_ref3 = componentWidth !== null && componentWidth !== void 0 ? componentWidth : chartWidth) !== null && _ref3 !== void 0 ? _ref3 : 0;
-  var legendAreaWidth = Math.max(0, fullWidth - marginLeft - marginRight);
-  var sideLegendMaxWidth = isSideLegend ? Math.max(0, position === "left" || _alignment === "left" ? marginLeft : marginRight) : 0;
+  // Adaptive+上下：组件总宽；Adaptive+左右：仅 maxWidth = 总宽 − 左右 chart.margin，宽度由内容撑开
+  var pieLegendFullWidth = Math.max(0, fullWidth);
+  var pieLegendInnerWidth = Math.max(0, fullWidth - marginLeft - marginRight);
+  var sideLegendMaxWidth = isSideLegend ? pieLegendInnerWidth : 0;
   var fixedColumnsPerRow = Math.min(Math.max(1, Number(gridTemplateColumns) || 1), length);
   var isPieTopBottomFixedMultiCol = isPieChart && isFixedWidth && isCenterTopOrBottom && fixedColumnsPerRow > 1;
   var formatterExtra = _objectSpread(_objectSpread(_objectSpread({}, config), {}, {
@@ -231,7 +233,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
   }, isSideLegend && sideLegendMaxWidth > 0 ? {
     adaptiveMaxWidth: sideLegendMaxWidth
   } : {}), isTopBottomAdaptive ? {
-    chartWidth: legendAreaWidth
+    chartWidth: pieLegendFullWidth
   } : {});
   var renderPieSideItem = function renderPieSideItem(series, i) {
     var _series$config;
@@ -336,8 +338,8 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
   if (isTopBottomAdaptive) {
     var topBottomWrapperStyle = _objectSpread(_objectSpread({
       position: "absolute",
-      width: legendAreaWidth || "100%",
-      maxWidth: legendAreaWidth || "100%",
+      width: pieLegendFullWidth || "100%",
+      maxWidth: pieLegendFullWidth || "100%",
       boxSizing: "border-box"
     }, getPosition(position, _alignment, x, y)), {}, {
       height: loop.show ? height : "auto",

package/lib/components/PieChart.js

@@ -322,7 +322,6 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
     chartHeight = _useContext.height,
     triggerOnRelative = _useContext.triggerOnRelative,
     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.19",
+  "version": "1.10.20",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/Legend.js

@@ -232,15 +232,10 @@ export default memo(
     const isSideLegend = isPieAdaptive && isSidePlacement;
     const isTopBottomAdaptive = isPieAdaptive && isCenterTopOrBottom;
     const fullWidth = componentWidth ?? chartWidth ?? 0;
-    const legendAreaWidth = Math.max(0, fullWidth - marginLeft - marginRight);
-    const sideLegendMaxWidth = isSideLegend
-      ? Math.max(
-          0,
-          position === "left" || _alignment === "left"
-            ? marginLeft
-            : marginRight,
-        )
-      : 0;
+    // Adaptive+上下：组件总宽；Adaptive+左右：仅 maxWidth = 总宽 − 左右 chart.margin，宽度由内容撑开
+    const pieLegendFullWidth = Math.max(0, fullWidth);
+    const pieLegendInnerWidth = Math.max(0, fullWidth - marginLeft - marginRight);
+    const sideLegendMaxWidth = isSideLegend ? pieLegendInnerWidth : 0;
     const fixedColumnsPerRow = Math.min(
       Math.max(1, Number(gridTemplateColumns) || 1),
       length,
@@ -265,7 +260,7 @@ export default memo(
       ...(isSideLegend && sideLegendMaxWidth > 0
         ? { adaptiveMaxWidth: sideLegendMaxWidth }
         : {}),
-      ...(isTopBottomAdaptive ? { chartWidth: legendAreaWidth } : {}),
+      ...(isTopBottomAdaptive ? { chartWidth: pieLegendFullWidth } : {}),
     };
 
     const renderPieSideItem = (series, i) => {
@@ -403,8 +398,8 @@ export default memo(
     if (isTopBottomAdaptive) {
       const topBottomWrapperStyle = {
         position: "absolute",
-        width: legendAreaWidth || "100%",
-        maxWidth: legendAreaWidth || "100%",
+        width: pieLegendFullWidth || "100%",
+        maxWidth: pieLegendFullWidth || "100%",
         boxSizing: "border-box",
         ...getPosition(position, _alignment, x, y),
         height: loop.show ? height : "auto",

package/src/components/PieChart.js

@@ -301,7 +301,6 @@ const Component = memo(
       triggerOnRelative,
       onEmit,
     } = useContext(chartContext);
-    // chart.margin 以用户配置为准；Adaptive 仅走 Legend 侧栏/顶底排版，不再 updateConfig 写预设边距
     const [y, setY] = useState(1);
     const radius = (Math.min(chartWidth, chartHeight) / 2) * outerRadius;