Merge pull request #1954 from VisActor/fix/fix-bug-of-animation-change-state

fix: fix bug of animation change

Author: xuefei1313

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();
     }
   }
 }

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;
   }