impr

Author: huanghaiyang

src/modules/render/RenderQueue.ts

@@ -62,11 +62,10 @@ export default class RenderQueue implements IRenderQueue {
           await task.destroy();
         }
         task = null;
-        this.queue = null;
-        this.running = false;
-        return;
       }
     }
+    this.queue = null;
+    this.running = false;
   }
 }
 

src/modules/render/mask/task/MaskTaskBase.ts

@@ -6,21 +6,20 @@ export default abstract class MaskTaskBase extends RenderTaskBase implements IMa
   // 模型
   model: IMaskModel;
   // 画布
-  protected _canvas: HTMLCanvasElement;
-
-  get data(): IMaskModel {
-    return this.model;
-  }
-
-  get canvas(): HTMLCanvasElement {
-    return this._canvas;
-  }
+  canvas: HTMLCanvasElement;
 
   constructor(model: IMaskModel, params?: any) {
     super();
     this.model = model;
     if (params) {
-      this._canvas = params.canvas as HTMLCanvasElement;
+      this.canvas = params.canvas as HTMLCanvasElement;
     }
   }
+
+  destroy(): Promise<void> {
+    this.model = null;
+    this.id = null;
+    this.canvas = null;
+    return Promise.resolve();
+  }
 }

src/modules/render/mask/task/MaskTaskCircleTransformer.ts

@@ -8,12 +8,12 @@ export default class MaskTaskCircleTransformer extends MaskTaskBase {
    * 运行任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
+    if (!this.canvas || !this.model) return;
 
-    let { point } = this.data;
+    let { point } = this.model;
 
     if (!point) return;
-    let { radius } = this.data;
+    let { radius } = this.model;
     const strokeStyle = { ...ControllerStyle.strokes[0] };
     const fillStyle = { ...ControllerStyle.fills[0] };
     radius /= CanvasUtils.scale;

src/modules/render/mask/task/MaskTaskCursorPosition.ts

@@ -7,9 +7,9 @@ export default class MaskTaskCursorPosition extends MaskTaskBase {
    * 运行绘制任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
+    if (!this.canvas || !this.model) return;
 
-    let { text, point } = this.data;
+    let { text, point } = this.model;
     await CanvasUtils.drawRotateTextWithScale(this.canvas, text, point, CursorPositionStyle, CursorPositionStyle.fills[0]);
   }
 }

src/modules/render/mask/task/MaskTaskIconCursor.ts

@@ -12,15 +12,6 @@ import RotateNE from "@/assets/svg/rotate-ne.svg";
 export default class MaskTaskIconCursor extends MaskTaskBase {
   type: CursorTypes = CursorTypes.vertices;
 
-  /**
-   * 获取模型
-   *
-   * @returns
-   */
-  get data(): IIconModel {
-    return this.model as IIconModel;
-  }
-
   /**
    * 获取图标
    *
@@ -58,14 +49,14 @@ export default class MaskTaskIconCursor extends MaskTaskBase {
    * 运行绘制任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
+    if (!this.canvas || !this.model) return;
 
     let {
       point: { x, y },
       width,
       height,
       scale,
-    } = this.data;
+    } = this.model as IIconModel;
     await CanvasUtils.drawImgLike(
       this.canvas,
       this.img,
@@ -76,7 +67,7 @@ export default class MaskTaskIconCursor extends MaskTaskBase {
         height,
       },
       {
-        angle: this.data.angle,
+        angle: this.model.angle,
       },
     );
   }

src/modules/render/mask/task/MaskTaskIndicator.ts

@@ -8,13 +8,13 @@ export default class MaskTaskIndicator extends MaskTaskBase {
    * 运行任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
+    if (!this.canvas || !this.model) return;
 
-    let { text, point } = this.data;
+    let { text, point } = this.model;
     point = ElementUtils.calcStageRelativePoint(point);
 
     CanvasUtils.drawRotateTextWithScale(this.canvas, text, point, SelectionIndicatorStyle, SelectionIndicatorStyle.fills[0], {
-      angle: this.data.angle,
+      angle: this.model.angle,
     });
   }
 }

src/modules/render/mask/task/MaskTaskPath.ts

@@ -10,14 +10,14 @@ export default class MaskTaskPath extends MaskTaskBase {
    * 运行任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
+    if (!this.canvas || !this.model) return;
 
     const { width } = SelectionStyle.strokes[0];
     const specialStyles: ElementStyles = {};
-    let { points } = this.data;
+    let { points } = this.model;
     points = ElementUtils.calcStageRelativePoints(points);
 
-    if ([DrawerMaskModelTypes.selection, DrawerMaskModelTypes.path].includes(this.data.type)) {
+    if ([DrawerMaskModelTypes.selection, DrawerMaskModelTypes.path].includes(this.model.type)) {
       specialStyles.fills = [
         {
           colorOpacity: 0,
@@ -31,10 +31,10 @@ export default class MaskTaskPath extends MaskTaskBase {
       {},
       {
         ...SelectionStyle.strokes[0],
-        width: width * this.data.scale,
+        width: width * this.model.scale,
       },
       {
-        isFold: typeof this.data.element?.isFold === "undefined" ? true : this.data.element?.isFold,
+        isFold: typeof this.model.element?.isFold === "undefined" ? true : this.model.element?.isFold,
       },
     );
   }

src/modules/render/mask/task/MaskTaskRotate.ts

@@ -1,14 +1,10 @@
 import MaskTaskBase from "@/modules/render/mask/task/MaskTaskBase";
 import CanvasUtils from "@/utils/CanvasUtils";
 import RotateSvg from "@/assets/svg/rotate.svg";
-import { IRotationModel } from "@/types/IModel";
 import ElementUtils from "@/modules/elements/utils/ElementUtils";
+import { IRotationModel } from "@/types/IModel";
 
 export default class MaskTaskRotate extends MaskTaskBase {
-  get data(): IRotationModel {
-    return this.model as IRotationModel;
-  }
-
   get svg() {
     return RotateSvg;
   }
@@ -17,8 +13,8 @@ export default class MaskTaskRotate extends MaskTaskBase {
    * 运行绘制任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
-    let { point, width, height, scale } = this.data;
+    if (!this.canvas || !this.model) return;
+    let { point, width, height, scale } = this.model as IRotationModel;
     point = ElementUtils.calcStageRelativePoint(point);
 
     await CanvasUtils.drawImgLike(
@@ -31,7 +27,7 @@ export default class MaskTaskRotate extends MaskTaskBase {
         height,
       },
       {
-        angle: this.data.angle,
+        angle: this.model.angle,
       },
     );
   }

src/modules/render/mask/task/MaskTaskTransformer.ts

@@ -9,9 +9,9 @@ export default class MaskTaskTransformer extends MaskTaskBase {
    * 运行任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.data) return;
+    if (!this.canvas || !this.model) return;
     const { width } = ControllerStyle.strokes[0];
-    let { scale, point, leanYAngle, actualAngle } = this.data;
+    let { scale, point, leanYAngle, actualAngle } = this.model;
     point = ElementUtils.calcStageRelativePoint(point);
 
     CanvasUtils.drawPathWithScale(

src/modules/render/shield/task/ElementTaskArbitrary.ts

@@ -1,25 +1,20 @@
 import ElementTaskBase from "@/modules/render/shield/task/ElementTaskBase";
 import CanvasUtils from "@/utils/CanvasUtils";
-import { IElementRect } from "@/types/IElement";
 import { DefaultLineMeterLimit } from "@/styles/ElementStyles";
 import ElementUtils from "@/modules/elements/utils/ElementUtils";
 
 export default class ElementTaskArbitrary extends ElementTaskBase {
-  get node() {
-    return this.element as IElementRect;
-  }
-
   /**
    * 运行任务
    */
   async run(): Promise<void> {
-    if (!this.canvas || !this.node) return;
-    
+    if (!this.canvas || !this.element) return;
+
     let {
       innermostStrokeCoordIndex,
       strokeCoords,
       model: { styles, isFold },
-    } = this.node;
+    } = this.element;
     const strokePoints = ElementUtils.batchCalcStageRelativePoints(strokeCoords);
 
     if (isFold) {