@easyv/charts 1.10.20 → 1.10.22

package/lib/components/PieChart.js

@@ -22,18 +22,54 @@ 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"],
   _excluded4 = ["startAngle", "endAngle"];
-/**
- * 饼环图
+/**
+ * 饼环图
  */
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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,
@@ -238,6 +274,7 @@ 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,
@@ -321,7 +358,51 @@ var Component = /*#__PURE__*/(0, _react.memo)(function (_ref5) {
     chartWidth = _useContext.width,
     chartHeight = _useContext.height,
     triggerOnRelative = _useContext.triggerOnRelative,
-    onEmit = _useContext.onEmit;
+    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 prevLegendLayoutKey = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (legendLayoutMode !== "Adaptive") {
+      prevLegendLayoutKey.current = null;
+      return;
+    }
+    if (!updateConfig) return;
+    var layoutKey = "".concat(legendShow, "-").concat(legendAlignment);
+    var prev = prevLegendLayoutKey.current;
+    prevLegendLayoutKey.current = layoutKey;
+
+    // 挂载/刷新：只记录当前图例布局，margin 始终读配置项
+    if (prev === null) return;
+    if (prev === layoutKey) return;
+    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]);
   var _useState = (0, _react.useState)(1),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     y = _useState2[0],

package/lib/utils/index.js

@@ -637,7 +637,7 @@ var reverseGradientStops = function reverseGradientStops(gradient) {
 };
 var getBandBackground = exports.getBandBackground = function getBandBackground(pattern, fill, y) {
   if (!(pattern && pattern.path)) {
-    return (0, _utils.getColor)(y < 0 ? reverseGradientStops(fill) : fill); //小于0颜色翻转
+    return (0, _utils.getColor)(y > 0 ? reverseGradientStops(fill) : fill); //小于0颜色翻转
   }
   try {
     var _pattern$backgroundSi = pattern.backgroundSize,

package/package.json

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