@easyv/charts 1.10.30 → 1.10.32

package/lib/components/CartesianChart.js

@@ -372,8 +372,8 @@ var Chart = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     var eventData = {
       data: visibleData
     };
-    triggerOnRelative("dataChange", eventData);
-    onEmit("dataChange", eventData);
+    triggerOnRelative("controlChange", eventData);
+    onEmit("controlChange", eventData);
   }, [control, originData, chartWidth, triggerOnRelative, onEmit]);
   (0, _react.useEffect)(function () {
     if (!control) return;

package/lib/components/PieChart.js

@@ -27,8 +27,8 @@ 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; }

package/lib/components/Tooltip.js

@@ -51,6 +51,66 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     height = _ref.height,
     auto = _ref.auto,
     manual = _ref.manual;
+  var getBigScreenScale = function getBigScreenScale() {
+    // 优先使用全局提供的方法
+    if (typeof window.getScreenScale === "function") {
+      try {
+        var _result = window.getScreenScale();
+        if (Array.isArray(_result) && _result.length >= 6) {
+          return _result;
+        }
+      } catch (e) {
+        console.error("调用全局 getScreenScale 出错:", e);
+      }
+    }
+
+    // 获取容器元素
+    var bigscreenDom = document.getElementById("bigscreen-container");
+
+    // 元素不存在时的处理
+    if (!bigscreenDom) {
+      return [1, 1, window.innerWidth, window.innerHeight, 0, 0];
+    }
+
+    // 确保元素可见（未被隐藏）
+    var isVisible = window.getComputedStyle(bigscreenDom).display !== "none" && window.getComputedStyle(bigscreenDom).visibility !== "hidden";
+    if (!isVisible) {
+      return [1, 1, window.innerWidth, window.innerHeight, 0, 0];
+    }
+
+    // 获取元素的布局矩形（最可靠的尺寸获取方式）
+    var rect = bigscreenDom.getBoundingClientRect();
+
+    // 提取基础尺寸（从布局矩形获取，不受样式影响）
+    var screenWidth = rect.width || window.innerWidth;
+    var screenHeight = rect.height || window.innerHeight;
+    var screenLeft = rect.left || 0;
+    var screenTop = rect.top || 0;
+
+    // 处理缩放
+    var scaleX = 1;
+    var scaleY = 1;
+    try {
+      var computedStyle = window.getComputedStyle(bigscreenDom);
+      var transform = computedStyle.transform;
+      if (transform && transform !== "none") {
+        // 解析 transform matrix
+        var matrix = new DOMMatrix(transform);
+        scaleX = matrix.a; // 缩放X因子
+        scaleY = matrix.d; // 缩放Y因子
+      }
+    } catch (e) {
+      console.error("解析缩放样式出错:", e);
+    }
+
+    // 最终返回值（确保不会有undefined）
+    var result = [isNaN(scaleX) ? 1 : scaleX, isNaN(scaleY) ? 1 : scaleY, isNaN(screenWidth) ? window.innerWidth : screenWidth, isNaN(screenHeight) ? window.innerHeight : screenHeight, isNaN(screenLeft) ? 0 : screenLeft, isNaN(screenTop) ? 0 : screenTop];
+    return result;
+  };
+  var _getBigScreenScale = getBigScreenScale(),
+    _getBigScreenScale2 = (0, _slicedToArray2["default"])(_getBigScreenScale, 2),
+    scaleX = _getBigScreenScale2[0],
+    scaleY = _getBigScreenScale2[1];
   var tooltipRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)({
       width: 0,
@@ -61,17 +121,23 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
     setTooltipSize = _useState2[1];
   var tipPosition = (0, _react.useMemo)(function () {
     var translate3d = isVertical ? _objectSpread(_objectSpread({}, translateTip), {}, {
-      y: translateTip.y + position + marginTop
+      y: translateTip.y / scaleY + position + marginTop / scaleY
     }) : _objectSpread(_objectSpread({}, translateTip), {}, {
-      x: translateTip.x + position + marginLeft
+      x: translateTip.x / scaleX + position + marginLeft / scaleX
     });
-    if (!isVertical && translate3d.x + tooltipSize.width > width) {
-      var newPositon = position + marginLeft - tooltipSize.width - translateTip.x;
+    if (!isVertical && translate3d.x + tooltipSize.width / scaleX > width / scaleX) {
+      var newPositon = position + marginLeft / scaleX - tooltipSize.width / scaleX - translateTip.x / scaleX;
       translate3d.x = newPositon >= 0 ? newPositon : 0;
+      console.log("translate3d", translate3d);
+      console.log("scale", scaleX, scaleY);
+      console.log("width", width, height);
+      console.log("position", position, marginLeft, marginTop);
+      console.log("tooltipSize", tooltipSize);
+      console.log("translateTip", translateTip);
     }
-    if (isVertical && translate3d.y + tooltipSize.height > height) {
-      var _newPositon = position + marginTop - tooltipSize.height - translateTip.y;
-      translate3d.y = _newPositon <= 0 ? _newPositon : height - tooltipSize.height;
+    if (isVertical && translate3d.y + tooltipSize.height / scaleY > height / scaleY) {
+      var _newPositon = position + marginTop / scaleY - tooltipSize.height / scaleY - translateTip.y / scaleY;
+      translate3d.y = _newPositon <= 0 ? _newPositon : height / scaleY - tooltipSize.height / scaleY;
     }
     return (0, _utils.getTranslate3d)(translate3d);
   }, [width, height, marginLeft, marginTop, position, tooltipSize, translateTip]);

package/package.json

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

package/src/components/CartesianChart.js

@@ -362,8 +362,8 @@ const Chart = memo(
         chartWidth,
       );
       const eventData = { data: visibleData };
-      triggerOnRelative("dataChange", eventData);
-      onEmit("dataChange", eventData);
+      triggerOnRelative("controlChange", eventData);
+      onEmit("controlChange", eventData);
     }, [control, originData, chartWidth, triggerOnRelative, onEmit]);
     useEffect(() => {
       if (!control) return;