Merge pull request #3501 from VisActor/sync/main-1.12.15

[Auto Sync] Sync the code from branch main to branch develop after release 1.12.15

Author: xile611

common/changes/@visactor/vchart/fix-upgrade-vrender-0.20.18_2024-12-05-08-55.json

@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vchartMain","version":"1.12.14","mainProject":"@visactor/vchart","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vchartMain","version":"1.12.15","mainProject":"@visactor/vchart","nextBump":"patch"}]

common/changes/@visactor/vchart/fix-upgrade-vrender-0.20.18_2024-12-05-08-59.json

@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@arco-design/web-react": "2.46.1",
-    "@visactor/openinula-vchart": "workspace:1.12.14",
-    "@visactor/react-vchart": "workspace:1.12.14",
-    "@visactor/vchart": "workspace:1.12.14",
-    "@visactor/vchart-extension": "workspace:1.12.14",
+    "@visactor/openinula-vchart": "workspace:1.12.15",
+    "@visactor/react-vchart": "workspace:1.12.15",
+    "@visactor/vchart": "workspace:1.12.15",
+    "@visactor/vchart-extension": "workspace:1.12.15",
     "@visactor/vchart-theme": "~1.6.6",
     "@visactor/vmind": "1.2.4-alpha.5",
     "@visactor/vutils": "~0.19.2",
@@ -59,4 +59,4 @@
     "react-device-detect": "^2.2.2",
     "minimist": "1.2.8"
   }
-}
+}

common/config/rush/pnpm-lock.yaml

@@ -1,6 +1,6 @@
 {
   name: '@visactor/harmony-vchart',
-  version: '1.12.14',
+  version: '1.12.15',
   description: '@visactor/vchart 针对 harmonyOS 打造的图表库，拥有非常酷炫的动画能力，近20种图表类型，以及原生的渲染性能',
   main: 'Index.ets',
   author: {

common/config/rush/version-policies.json

@@ -31737,10 +31737,11 @@ function placeToCandidates($, bitmap, text) {
   let candidates = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   let clampForce = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : !0;
   let pad = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+  let changePosition = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : !1;
   const validCandidates = candidates.filter(candidate => isValid$1(candidate));
   for (let i = 0; i < validCandidates.length; i++) {
-    const tempText = text.clone();
-    if (tempText.setAttributes(validCandidates[i]), tempText.update(), canPlace($, bitmap, tempText.AABBBounds, clampForce, pad)) return bitmap.setRange(boundToRange($, tempText.AABBBounds, !0)), validCandidates[i];
+    let measureText;
+    if (measureText = changePosition ? text : text.clone(), measureText.setAttributes(validCandidates[i]), canPlace($, bitmap, measureText.AABBBounds, clampForce, pad)) return bitmap.setRange(boundToRange($, measureText.AABBBounds, !0)), validCandidates[i];
   }
   return !1;
 }
@@ -31750,8 +31751,9 @@ function place$2($, bitmap, s, attrs, text, bounds, labeling) {
     overlapPadding = null === (_b = attrs.overlap) || void 0 === _b ? void 0 : _b.overlapPadding;
   if ("bound" === s.type || "position" === s.type) {
     if (isFunction$1(labeling)) {
-      const candidates = ((isFunction$1(s.position) ? s.position(text.attribute) : s.position) || defaultLabelPosition(attrs.type)).map(p => labeling(text.AABBBounds, bounds, p, attrs.offset));
-      return placeToCandidates($, bitmap, text, candidates, clampForce, overlapPadding);
+      const candidates = ((isFunction$1(s.position) ? s.position(text.attribute) : s.position) || defaultLabelPosition(attrs.type)).map(p => labeling(text.AABBBounds, bounds, p, attrs.offset)),
+        shouldClone = !1 === s.restorePosition;
+      return placeToCandidates($, bitmap, text, candidates, clampForce, overlapPadding, shouldClone);
     }
     return !1;
   }
@@ -32135,18 +32137,18 @@ function shiftY(texts, option) {
       textInformation.get(text).attempts = attempts;
     };
   function adjustPositionInOneGroup(texts) {
-    var text;
-    if (1 !== texts.length) for (let i = texts.length - 1; i > 0; i--) {
+    for (let i = texts.length - 1; i >= 0; i--) {
       const curText = texts[i],
         upperText = texts[i - 1],
         lowerText = texts[i + 1];
-      if (isIntersect(getY1(upperText) + getHeight(upperText), getY1(curText))) {
+      if (upperText && isIntersect(getY1(upperText) + getHeight(upperText), getY1(curText)) || 0 === getY1(curText) && curText._isClamped) {
         const {
           y: y
         } = labelling(curText);
         lowerText && isIntersect(y + getHeight(curText) / 2, getY1(lowerText)) || y + getHeight(curText) / 2 <= maxY && setY1(curText, getY1(curText) + y - (text = curText, textInformation.get(text).y));
       }
     }
+    var text;
   }
   texts.sort((a, b) => a.attribute.x - b.attribute.x);
   for (const text of texts) {
@@ -32510,12 +32512,35 @@ class LabelBase extends AbstractComponent {
       const text = result[i],
         bounds = text.AABBBounds,
         range = boundToRange(bmpTool, bounds, !0);
-      canPlace(bmpTool, bitmap, bounds, clampForce, text._isClamped ? 0 : overlapPadding) ? bitmap.setRange(range) : hideOnHit ? text.setAttributes({
-        visible: !1
-      }) : bitmap.setRange(range);
+      if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) bitmap.setRange(range);else {
+        if (clampForce) {
+          if (this._processClampForce(text, bmpTool, bitmap)) continue;
+        }
+        hideOnHit ? text.setAttributes({
+          visible: !1
+        }) : bitmap.setRange(range);
+      }
     }
     return result;
   }
+  _processClampForce(text, bmpTool, bitmap) {
+    const {
+      dy = 0,
+      dx = 0
+    } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
+    if (0 === dx && 0 === dy) {
+      if (canPlace(bmpTool, bitmap, text.AABBBounds)) return bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
+    } else if (canPlace(bmpTool, bitmap, {
+      x1: text.AABBBounds.x1 + dx,
+      x2: text.AABBBounds.x2 + dx,
+      y1: text.AABBBounds.y1 + dy,
+      y2: text.AABBBounds.y2 + dy
+    })) return text.setAttributes({
+      x: text.attribute.x + dx,
+      y: text.attribute.y + dy
+    }), bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), !0;
+    return !1;
+  }
   _overlapByStrategy(labels, option, bmpTool, bitmap) {
     var _a;
     const {
@@ -32564,25 +32589,8 @@ class LabelBase extends AbstractComponent {
         break;
       }
       if (!hasPlace && clampForce) {
-        const {
-          dx = 0,
-          dy = 0
-        } = clampText(text, bmpTool.width, bmpTool.height, bmpTool.padding);
-        if (0 === dx && 0 === dy) {
-          if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
-            bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
-            continue;
-          }
-        } else if (canPlace(bmpTool, bitmap, {
-          x1: text.AABBBounds.x1 + dx,
-          x2: text.AABBBounds.x2 + dx,
-          y1: text.AABBBounds.y1 + dy,
-          y2: text.AABBBounds.y2 + dy
-        })) {
-          text.setAttributes({
-            x: text.attribute.x + dx,
-            y: text.attribute.y + dy
-          }), bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, !0)), result.push(text);
+        if (this._processClampForce(text, bmpTool, bitmap)) {
+          result.push(text);
           continue;
         }
       }
@@ -61920,7 +61928,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.12.14";
+const version = "1.12.15";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/lark-vchart",
-  "version": "1.12.14",
+  "version": "1.12.15",
   "description": "VChart 飞书小程序组件",
   "main": "index.js",
   "files": [