VisActor · xuefei1313 · Oct 13, 2025 · Aug 21, 2025 · Sep 24, 2025 · Sep 29, 2025
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -63,12 +63,12 @@ jobs:
       - name: Build vrender-animate
         run: node common/scripts/install-run-rush.js build --only @visactor/vrender-animate
 
-      - name: Build vrender
-        run: node common/scripts/install-run-rush.js build --only @visactor/vrender
-
       - name: Build vrender-components
         run: node common/scripts/install-run-rush.js build --only @visactor/vrender-components
 
+      - name: Build vrender
+        run: node common/scripts/install-run-rush.js build --only @visactor/vrender
+
       - name: Build bugserver
         run: node common/scripts/install-run-rush.js build --only @internal/bugserver-trigger
 

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.17","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.18","nextBump":"patch"}]
diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "@visactor/vchart": "1.3.0",
     "@visactor/vutils": "1.0.6",
     "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vrender": "workspace:1.0.17",
+    "@visactor/vrender": "workspace:1.0.18",
     "markdown-it": "^13.0.0",
     "highlight.js": "^11.8.0",
     "axios": "^1.4.0",

diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender-utils",
   "entries": [
+    {
+      "version": "1.0.18",
+      "tag": "@visactor/react-vrender-utils_v1.0.18",
+      "date": "Mon, 13 Oct 2025 09:26:25 GMT",
+      "comments": {}
+    },
     {
       "version": "1.0.17",
       "tag": "@visactor/react-vrender-utils_v1.0.17",

diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/react-vrender-utils
 
-This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.
+This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified.
+
+## 1.0.18
+Mon, 13 Oct 2025 09:26:25 GMT
+
+_Version update only_
 
 ## 1.0.17
 Wed, 24 Sep 2025 07:38:57 GMT

diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender-utils",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:1.0.17",
-    "@visactor/react-vrender": "workspace:1.0.17",
+    "@visactor/vrender": "workspace:1.0.18",
+    "@visactor/react-vrender": "workspace:1.0.18",
     "@visactor/vutils": "1.0.6",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender",
   "entries": [
+    {
+      "version": "1.0.18",
+      "tag": "@visactor/react-vrender_v1.0.18",
+      "date": "Mon, 13 Oct 2025 09:26:25 GMT",
+      "comments": {}
+    },
     {
       "version": "1.0.17",
       "tag": "@visactor/react-vrender_v1.0.17",

diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/react-vrender
 
-This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.
+This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified.
+
+## 1.0.18
+Mon, 13 Oct 2025 09:26:25 GMT
+
+_Version update only_
 
 ## 1.0.17
 Wed, 24 Sep 2025 07:38:57 GMT

diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:1.0.17",
+    "@visactor/vrender": "workspace:1.0.18",
     "@visactor/vutils": "1.0.6",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/vrender-animate/CHANGELOG.json b/packages/vrender-animate/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-animate",
   "entries": [
+    {
+      "version": "1.0.18",
+      "tag": "@visactor/vrender-animate_v1.0.18",
+      "date": "Mon, 13 Oct 2025 09:26:25 GMT",
+      "comments": {}
+    },
     {
       "version": "1.0.17",
       "tag": "@visactor/vrender-animate_v1.0.17",

diff --git a/packages/vrender-animate/CHANGELOG.md b/packages/vrender-animate/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender-animate
 
-This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.
+This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified.
+
+## 1.0.18
+Mon, 13 Oct 2025 09:26:25 GMT
+
+_Version update only_
 
 ## 1.0.17
 Wed, 24 Sep 2025 07:38:57 GMT

diff --git a/packages/vrender-animate/package.json b/packages/vrender-animate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-animate",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@visactor/vutils": "1.0.6",
-    "@visactor/vrender-core": "workspace:1.0.17"
+    "@visactor/vrender-core": "workspace:1.0.18"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-animate/src/executor/animate-executor.ts b/packages/vrender-animate/src/executor/animate-executor.ts
@@ -1,4 +1,4 @@
-import type { IGraphic, EasingType, IAnimate } from '@visactor/vrender-core';
+import { type IGraphic, type EasingType, type IAnimate, AnimateStatus } from '@visactor/vrender-core';
 import type {
   IAnimationConfig,
   IAnimationTimeline,
@@ -746,10 +746,12 @@ export class AnimateExecutor implements IAnimateExecutor {
   /**
    * 停止所有由该执行器管理的动画
    */
-  stop(type?: 'start' | 'end' | Record<string, any>): void {
+  stop(type?: 'start' | 'end' | Record<string, any>, callEnd: boolean = true): void {
     // animate.stop会从数组里删除，所以需要while循环，不能forEach
     while (this._animates.length > 0) {
       const animate = this._animates.pop();
+      // 不执行回调时 标记动画为结束状态
+      callEnd === false && (animate.status = AnimateStatus.END);
       animate?.stop(type);
     }
 
@@ -760,7 +762,7 @@ export class AnimateExecutor implements IAnimateExecutor {
     // 如果动画正在运行，触发结束回调
     if (this._started) {
       this._started = false;
-      this.onEnd();
+      callEnd && this.onEnd();
     }
   }
 }
diff --git a/packages/vrender-animate/src/state/animation-state.ts b/packages/vrender-animate/src/state/animation-state.ts
@@ -122,8 +122,9 @@ export class AnimationStateManager {
     }
 
     // 停止动画
+    // 停止的动画应该不触发回调
     shouldStopState.forEach(state => {
-      state.executor.stop();
+      state.executor.stop(null, false);
     });
 
     // 立即应用动画，串行的应用
@@ -225,8 +226,9 @@ export class AnimationStateManager {
 
   clearState(): void {
     // 清空状态
+    // 清空状态时，不触发回调
     this.stateList?.forEach(state => {
-      state.executor.stop();
+      state.executor.stop(null, false);
     });
     this.stateList = null;
   }

diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-components",
   "entries": [
+    {
+      "version": "1.0.18",
+      "tag": "@visactor/vrender-components_v1.0.18",
+      "date": "Mon, 13 Oct 2025 09:26:25 GMT",
+      "comments": {}
+    },
     {
       "version": "1.0.17",
       "tag": "@visactor/vrender-components_v1.0.17",

diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender-components
 
-This log was last generated on Wed, 24 Sep 2025 07:38:57 GMT and should not be manually modified.
+This log was last generated on Mon, 13 Oct 2025 09:26:25 GMT and should not be manually modified.
+
+## 1.0.18
+Mon, 13 Oct 2025 09:26:25 GMT
+
+_Version update only_
 
 ## 1.0.17
 Wed, 24 Sep 2025 07:38:57 GMT

diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -27,9 +27,9 @@
   "dependencies": {
     "@visactor/vutils": "1.0.6",
     "@visactor/vscale": "1.0.6",
-    "@visactor/vrender-core": "workspace:1.0.17",
-    "@visactor/vrender-kits": "workspace:1.0.17",
-    "@visactor/vrender-animate": "workspace:1.0.17"
+    "@visactor/vrender-core": "workspace:1.0.18",
+    "@visactor/vrender-kits": "workspace:1.0.18",
+    "@visactor/vrender-animate": "workspace:1.0.18"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts
@@ -566,7 +566,7 @@ export class LabelBase<T extends BaseLabelAttrs> extends AnimateComponent<T> {
       const text = result[i];
       const bounds = text.AABBBounds;
       const range = boundToRange(bmpTool, bounds, true);
-      if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) {
+      if (canPlace(bmpTool, bitmap, bounds, clampForce || hideOnOverflow, overlapPadding)) {
         bitmap.setRange(range);
       } else {
         if (hideOnOverflow) {
@@ -678,7 +678,7 @@ export class LabelBase<T extends BaseLabelAttrs> extends AnimateComponent<T> {
         continue;
       }
       // 默认位置可以放置
-      if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce, overlapPadding)) {
+      if (canPlace(bmpTool, bitmap, text.AABBBounds, clampForce || hideOnOverflow, overlapPadding)) {
         // 如果配置了限制在图形内部，需要提前判断；
         if (!checkBounds) {
           bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));

diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-core",
   "entries": [
+    {
+      "version": "1.0.18",
+      "tag": "@visactor/vrender-core_v1.0.18",
+      "date": "Mon, 13 Oct 2025 09:26:25 GMT",
+      "comments": {}
+    },
     {
       "version": "1.0.17",
       "tag": "@visactor/vrender-core_v1.0.17",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.17","nextBump":"patch"}]
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"1.0.18","nextBump":"patch"}]