@easyv/charts 1.10.35 → 1.10.36

package/lib/components/PieChart.js

@@ -237,6 +237,17 @@ var getLabelColumnHeight = function getLabelColumnHeight(_ref2) {
   return height || 12;
 };
 
+// 大屏 transform:scale 后 getBoundingClientRect 会带缩放；offsetHeight 不受 transform 影响，与 SVG 坐标一致
+var getLabelDomHeight = function getLabelDomHeight(el) {
+  if (!el) return 0;
+  if (el.offsetHeight) return el.offsetHeight;
+  var rect = el.getBoundingClientRect();
+  if (!rect.height) return 0;
+  // offsetHeight 不可用时，用宽高比估算当前 scaleY 再还原
+  var scaleY = el.offsetWidth > 0 && rect.width > 0 ? rect.width / el.offsetWidth : 1;
+  return Math.round(rect.height / (scaleY || 1));
+};
+
 // 水平布局：同侧重叠时按半高之和推开
 var resolveLabelY = function resolveLabelY(y2, side, placedYBySide, labelHeight) {
   var placed = placedYBySide[side];
@@ -1207,7 +1218,7 @@ var Label = function Label(_ref19) {
       Object.keys(labelElsRef.current).forEach(function (key) {
         var el = labelElsRef.current[key];
         if (!el) return;
-        var h = Math.round(el.getBoundingClientRect().height);
+        var h = getLabelDomHeight(el);
         if (!h) return;
         next[key] = h;
         if (prev[key] !== h) changed = true;
@@ -1422,7 +1433,7 @@ var RingLabel = function RingLabel(_ref21) {
       Object.keys(labelElsRef.current).forEach(function (key) {
         var el = labelElsRef.current[key];
         if (!el) return;
-        var h = Math.round(el.getBoundingClientRect().height);
+        var h = getLabelDomHeight(el);
         if (!h) return;
         next[key] = h;
         if (prev[key] !== h) changed = true;

package/package.json

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

package/src/components/PieChart.js

@@ -215,6 +215,18 @@ const getLabelColumnHeight = ({
   return height || 12;
 };
 
+// 大屏 transform:scale 后 getBoundingClientRect 会带缩放；offsetHeight 不受 transform 影响，与 SVG 坐标一致
+const getLabelDomHeight = (el) => {
+  if (!el) return 0;
+  if (el.offsetHeight) return el.offsetHeight;
+  const rect = el.getBoundingClientRect();
+  if (!rect.height) return 0;
+  // offsetHeight 不可用时，用宽高比估算当前 scaleY 再还原
+  const scaleY =
+    el.offsetWidth > 0 && rect.width > 0 ? rect.width / el.offsetWidth : 1;
+  return Math.round(rect.height / (scaleY || 1));
+};
+
 // 水平布局：同侧重叠时按半高之和推开
 const resolveLabelY = (y2, side, placedYBySide, labelHeight) => {
   const placed = placedYBySide[side];
@@ -1324,7 +1336,7 @@ const Label = ({
       Object.keys(labelElsRef.current).forEach((key) => {
         const el = labelElsRef.current[key];
         if (!el) return;
-        const h = Math.round(el.getBoundingClientRect().height);
+        const h = getLabelDomHeight(el);
         if (!h) return;
         next[key] = h;
         if (prev[key] !== h) changed = true;
@@ -1615,7 +1627,7 @@ const RingLabel = ({
       Object.keys(labelElsRef.current).forEach((key) => {
         const el = labelElsRef.current[key];
         if (!el) return;
-        const h = Math.round(el.getBoundingClientRect().height);
+        const h = getLabelDomHeight(el);
         if (!h) return;
         next[key] = h;
         if (prev[key] !== h) changed = true;