@netless/appliance-plugin 1.1.22-beta.3 → 1.1.22-beta.5

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-CZGYaTCW.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.AutoDrawPlugin=e.AutoDrawPlugin;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EForceStopReason=e.EForceStopReason;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;exports.EScaleType=e.EScaleType;exports.EStrokeType=e.EStrokeType;exports.EToolsKey=e.EToolsKey;exports.ElayerType=e.ElayerType;exports.EmitEventType=e.EmitEventType;exports.EventMessageType=e.EventMessageType;exports.EvevtWorkState=e.EvevtWorkState;exports.EvevtWorkType=e.EvevtWorkType;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.Plugin=e.Plugin;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-C2HIPlQy.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.AutoDrawPlugin=e.AutoDrawPlugin;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EForceStopReason=e.EForceStopReason;exports.EImageType=e.EImageType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EOperationType=e.EOperationType;exports.EPostMessageType=e.EPostMessageType;exports.ERenderFilterType=e.ERenderFilterType;exports.EScaleType=e.EScaleType;exports.EStrokeType=e.EStrokeType;exports.EToolsKey=e.EToolsKey;exports.ElayerType=e.ElayerType;exports.EmitEventType=e.EmitEventType;exports.EventMessageType=e.EventMessageType;exports.EvevtWorkState=e.EvevtWorkState;exports.EvevtWorkType=e.EvevtWorkType;exports.InternalMsgEmitterType=e.InternalMsgEmitterType;exports.Plugin=e.Plugin;exports.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;

package/dist/appliance-plugin.mjs

@@ -1,4 +1,4 @@
-import { H as s, A as p, B as r, z as t, y as l, U as n, k as i, b as o, J as y, m as E, o as T, P as g, c, Q as u, N as v, F as S, a as A, L as k, l as m, K as P, E as M, O as W, I as R, R as w, G as x, w as F, x as I } from "./index-D7QizWai.mjs";
+import { ad as s, a7 as p, aa as r, a9 as t, a8 as l, al as n, T as i, o, ae as E, l as y, E as T, ai as g, n as c, aj as u, m as v, t as S, k, ag as m, a1 as A, af as M, q as P, ah as W, ac as f, ak as h, ab as R, a5 as b, a6 as d } from "./index-ChaMAgdB.mjs";
 export {
   s as ActiveContainerType,
   p as ApplianceMultiPlugin,
@@ -8,23 +8,23 @@ export {
   n as AutoDrawPlugin,
   i as ECanvasShowType,
   o as EDataType,
-  y as EForceStopReason,
-  E as EImageType,
+  E as EForceStopReason,
+  y as EImageType,
   T as EMatrixrRelationType,
   g as EOperationType,
   c as EPostMessageType,
   u as ERenderFilterType,
   v as EScaleType,
   S as EStrokeType,
-  A as EToolsKey,
-  k as ElayerType,
-  m as EmitEventType,
-  P as EventMessageType,
-  M as EvevtWorkState,
+  k as EToolsKey,
+  m as ElayerType,
+  A as EmitEventType,
+  M as EventMessageType,
+  P as EvevtWorkState,
   W as EvevtWorkType,
-  R as InternalMsgEmitterType,
-  w as Plugin,
-  x as ShapeType,
-  F as fullWorkerUrl,
-  I as subWorkerUrl
+  f as InternalMsgEmitterType,
+  h as Plugin,
+  R as ShapeType,
+  b as fullWorkerUrl,
+  d as subWorkerUrl
 };

package/dist/core/enum.d.ts

@@ -105,9 +105,7 @@ export declare enum EPostMessageType {
     /** 前端日志 */
     Console = 20,
     /** 优先激活worker */
-    PriorityWorker = 21,
     /** 优先激活worker */
-    PriorityMainThreadWorker = 22,
     /** 获取图片位图 */
     GetImageBitMap = 23,
     /** 授权可写权限 */

package/dist/core/mainEngine.d.ts

@@ -3,10 +3,11 @@ import { BaseCollectorReducerAction, DiffOneData } from "../collector";
 import { BaseApplianceManager } from "../plugin/baseApplianceManager";
 import { BaseNodeMapItem, IActiveToolsDataType, IActiveWorkDataType, ICameraOpt, IMainMessage, IRectType, IUpdateNodeOpt, IWorkerMessage, IqueryTask, IworkId, ViewWorkerOptions } from "./types";
 import { BaseSubWorkModuleProps } from "../plugin/types";
-import type { IconifyInformation, ImageInformation, PriorityType, _SetTrue } from "../plugin/types";
+import type { IconifyInformation, ImageInformation, _SetTrue } from "../plugin/types";
 import { MethodBuilderMain } from "./msgEvent";
 import { EvevtWorkState } from "./enum";
 import { BaseShapeOptions } from "./tools";
+import { AppViewDisplayerManager, MainViewDisplayerManager } from "../plugin/baseViewContainerManager";
 export declare abstract class MasterController {
     /** 异步同步时间间隔 */
     abstract readonly maxLastSyncTime: number;
@@ -33,7 +34,7 @@ export declare abstract class MasterController {
     /** 主线程和工作线程通信机 */
     protected abstract fullWorker: Worker;
     /** 子线程和工作线程通信机 */
-    protected abstract subWorker: Worker;
+    protected abstract subWorker?: Worker;
     /** 当前选中的工具配置数据 */
     abstract currentToolsData?: IActiveToolsDataType;
     /** 当前工作任务数据 */
@@ -79,7 +80,7 @@ export declare abstract class MasterController {
     /** 更新指定view场景路径下的相机参数 */
     abstract updateCamera(viewId: string, cameraOpt: ICameraOpt): void;
     /**  创建一个新的viewWorker */
-    abstract createViewWorker(viewId: string, options: ViewWorkerOptions): void;
+    abstract createViewWorker(viewId: string, options: ViewWorkerOptions, displayer: MainViewDisplayerManager | AppViewDisplayerManager): void;
     /** 本地发送cursor事件 */
     abstract sendCursorEvent(point: [number | undefined, number | undefined], viewId: string): void;
     /** 获取某个场景路径下的包围盒 */
@@ -116,7 +117,7 @@ export declare class MasterControlForWorker extends MasterController {
     publicMsgEmitter: EventEmitter2;
     taskBatchData: Set<IWorkerMessage>;
     protected fullWorker: Worker;
-    protected subWorker: Worker;
+    protected subWorker?: Worker;
     private fullWorkerUrl;
     private subWorkerUrl;
     methodBuilder?: MethodBuilderMain;
@@ -154,7 +155,6 @@ export declare class MasterControlForWorker extends MasterController {
     private mainThread?;
     private willSelectorWorkId?;
     private isLockSentEventCursor;
-    private subMainThreadWorker?;
     private getVNodeInfoResolveMap;
     private setFontFacesResolve;
     private isLocalWorkActive;
@@ -228,7 +228,7 @@ export declare class MasterControlForWorker extends MasterController {
     setLocalWorkViewId(viewId?: string): void;
     setCurrentToolsData(currentToolsData: IActiveToolsDataType): void;
     private prepareOnceWork;
-    createViewWorker(viewId: string, options: ViewWorkerOptions): void;
+    createViewWorker(viewId: string, options: ViewWorkerOptions, displayer: MainViewDisplayerManager | AppViewDisplayerManager): void;
     destroyViewWorker(viewId: string, isLocal?: boolean): void;
     onServiceDerive(key: string, data: DiffOneData<BaseCollectorReducerAction | undefined>): void;
     pullServiceData(viewId: string, scenePath: string, options?: {
@@ -269,7 +269,6 @@ export declare class MasterControlForWorker extends MasterController {
     setShapeSelectorByWorkId(workId: string, viewId: string): void;
     blurSelector(viewId: string, scenePath: string, workId?: string): void;
     consoleWorkerInfo(): void;
-    setPriority(priority: PriorityType): void;
     sendClearUids(viewId: string, clearUids?: _SetTrue): void;
     getVNodeInfo(uuid: string, viewId: string, workIds: string[]): Promise<{
         uuid: string;

package/dist/core/mainThread/index.d.ts

@@ -15,7 +15,7 @@ export declare class MainThreadManagerImpl implements MainThreadManager {
     private snapshotThread?;
     master: MasterControlForWorker;
     constructor(master: MasterControlForWorker);
-    post(msg: Omit<IBatchMainMessage, "render">): void;
+    post: (msg: Omit<IBatchMainMessage, "render">) => void;
     destroy(): void;
     createMainThread(viewId: string, opt: IMainThreadInitOption): MainThreadEngineImpl;
     createSnapshotThread(viewId: string, opt: IMainThreadInitOption): SnapshotThreadImpl;

package/dist/core/msgEvent/baseForWorker.d.ts

@@ -2,10 +2,11 @@ import { EmitEventType } from "../../plugin/types";
 import { IWorkerMessage } from "../types";
 import { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
 import { ServiceWorkForFullWorker } from "../worker/fullWorkerService";
+import { LocalWorkForSimpleWorker } from "../worker/simpleWorker";
 import type { WorkThreadEngineForFullWorker } from "../worker/workerManager";
 export declare abstract class BaseMsgMethodForWorker {
     abstract readonly emitEventType: EmitEventType;
-    localWork: LocalWorkForFullWorker | undefined;
+    localWork: LocalWorkForFullWorker | LocalWorkForSimpleWorker | undefined;
     serviceWork: ServiceWorkForFullWorker | undefined;
     threadEngine: WorkThreadEngineForFullWorker | undefined;
     registerForWorker(threadEngine: WorkThreadEngineForFullWorker): this;

package/dist/core/tools/arrow.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import { EStrokeType } from "../../plugin/types";
@@ -26,25 +26,8 @@ export declare class ArrowShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        type: EPostMessageType;
-        dataType: EDataType;
-        op: number[];
-        isSync: boolean;
-        index: number;
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-    } | {
-        type: EPostMessageType;
-        dataType: EDataType;
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/tools/base.d.ts

@@ -67,6 +67,7 @@ export declare abstract class BaseShapeTool {
         isSubWorker?: boolean;
         drawCount?: number;
         isMainThread?: boolean;
+        isSimpleWorker?: boolean;
         removeDrawCount?: number;
         smoothSync?: boolean;
     }): BaseConsumeResultType;
@@ -79,6 +80,7 @@ export declare abstract class BaseShapeTool {
     abstract consumeService(props: {
         op: number[];
         isFullWork: boolean;
+        isSimpleWorker?: boolean;
         replaceId?: string;
         workState?: EvevtWorkState;
     }): IRectType | undefined;

package/dist/core/tools/ellipse.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import { EStrokeType } from "../../plugin/types";
@@ -26,25 +26,8 @@ export declare class EllipseShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        op: number[];
-        isSync: boolean;
-        index: number;
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        type: EPostMessageType;
-        dataType: EDataType;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-        type: EPostMessageType;
-        dataType: EDataType;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/tools/image.d.ts

@@ -8,7 +8,7 @@ import type { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
 import type { SubLocalMainThreadImpl } from "../mainThread/subLocalThread";
 import type { SnapshotThreadImpl } from "../mainThread/snapshotThread";
 import type { SubServiceMainThreadImpl } from "../mainThread/subServiceThread";
-import { type WorkThreadEngineForFullWorker, WorkThreadEngineForSubWorker } from "../worker/workerManager";
+import { type WorkThreadEngineForFullWorker, type WorkThreadEngineForSimpleWorker, WorkThreadEngineForSubWorker } from "../worker/workerManager";
 export interface ImageOptions extends BaseShapeOptions {
     /** 图片地址 */
     src: string;
@@ -49,7 +49,7 @@ export declare class ImageShape extends BaseShapeTool {
     consumeService(): IRectType | undefined;
     consumeServiceAsync(props: {
         isFullWork: boolean;
-        worker: LocalWorkForFullWorker | WorkThreadEngineForFullWorker | WorkThreadEngineForSubWorker | SubLocalMainThreadImpl | SnapshotThreadImpl | SubServiceMainThreadImpl;
+        worker: WorkThreadEngineForSimpleWorker | LocalWorkForFullWorker | WorkThreadEngineForFullWorker | WorkThreadEngineForSubWorker | SubLocalMainThreadImpl | SnapshotThreadImpl | SubServiceMainThreadImpl;
         replaceId?: string;
     }): Promise<IRectType | undefined>;
     clearTmpPoints(): void;

package/dist/core/tools/pencil.d.ts

@@ -30,10 +30,23 @@ export declare class PencilShape extends BaseShapeTool {
         data: IWorkerMessage;
         isFullWork?: boolean;
         isSubWorker?: boolean;
+        isSimpleWorker?: boolean;
         drawCount?: number;
         isMainThread?: boolean;
         removeDrawCount?: number;
     }): {
+        type: EPostMessageType;
+        dataType: EDataType;
+        op: number[] | undefined;
+        index: number | undefined;
+        updateNodeOpt: {
+            useAnimation: boolean;
+        };
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        rect?: undefined;
+    } | {
         rect: IRectType | undefined;
         type: EPostMessageType;
         dataType: EDataType;

package/dist/core/tools/polygon.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import { EStrokeType } from "../../plugin/types";
@@ -28,25 +28,8 @@ export declare class PolygonShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        type: EPostMessageType;
-        dataType: EDataType;
-        op: number[];
-        isSync: boolean;
-        index: number;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-        type: EPostMessageType;
-        dataType: EDataType;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/tools/rectangle.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import { EStrokeType } from "../../plugin/types";
@@ -29,25 +29,8 @@ export declare class RectangleShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        type: EPostMessageType;
-        dataType: EDataType;
-        op: number[];
-        isSync: boolean;
-        index: number;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-        type: EPostMessageType;
-        dataType: EDataType;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/tools/selector.d.ts

@@ -1,4 +1,4 @@
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
 import { IWorkerMessage, IMainMessage, IRectType, IUpdateNodeOpt, IServiceWorkItem } from "../types";
 import { Point2d } from "../utils/primitives/Point2d";
@@ -14,6 +14,7 @@ export declare class SelectorShape extends BaseShapeTool {
     readonly toolsType: EToolsKey;
     static selectorBorderId: string;
     protected tmpPoints: Array<Point2d>;
+    protected subTmpPoints: Array<Point2d>;
     protected workOptions: BaseShapeOptions;
     vNodes: VNodeManager;
     selectIds?: string[];
@@ -21,6 +22,7 @@ export declare class SelectorShape extends BaseShapeTool {
     strokeColor?: string;
     fillColor?: string;
     oldSelectRect?: IRectType;
+    oldSubSelectRect?: IRectType;
     canRotate: boolean;
     canTextEdit: boolean;
     canLock: boolean;
@@ -42,33 +44,17 @@ export declare class SelectorShape extends BaseShapeTool {
     consume(props: {
         data: IWorkerMessage;
         isSubWorker?: boolean;
-    }): {
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType | {
         type: EPostMessageType;
+        rect: undefined;
     } | {
         workId: string;
         toolsType: EToolsKey;
         opt: import("./utils").ShapeOptions;
+        rect: IRectType | undefined;
         type: EPostMessageType;
         dataType: EDataType;
-        rect: IRectType | undefined;
-        selectIds: never[] | string[];
-        selectRect: IRectType | undefined;
-        selectorColor: string | undefined;
-        strokeColor: string | undefined;
-        fillColor: string | undefined;
-        textOpt: TextOptions | undefined;
-        canTextEdit: boolean;
-        canRotate: boolean;
-        canLock: boolean;
-        scaleType: EScaleType;
-        willSyncService: boolean;
-        points: [number, number][] | undefined;
-        isLocked: boolean | undefined;
-        toolsTypes: EToolsKey[] | undefined;
-        shapeOpt: ShapeOptType | undefined;
-        thickness: number | undefined;
-        useStroke: boolean | undefined;
-        strokeType: EStrokeType | undefined;
     };
     consumeAll(): {
         workId: string;
@@ -108,6 +94,7 @@ export declare class SelectorShape extends BaseShapeTool {
         isFullWork?: boolean;
     }): {
         type: EPostMessageType;
+        rect: undefined;
     } | {
         workId: string;
         toolsType: EToolsKey;
@@ -127,7 +114,9 @@ export declare class SelectorShape extends BaseShapeTool {
         type: EPostMessageType;
         dataType: EDataType;
     };
+    clearSubTmpPoints(): void;
     clearTmpPoints(): void;
+    clearSubSelectData(): void;
     clearSelectData(): void;
     private selectSingleTool;
     private unSelectedAllIds;

package/dist/core/tools/speechBalloon.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { EStrokeType, SpeechBalloonPlacement } from "../../plugin/types";
 import { ShapeNodes } from "./utils";
@@ -29,25 +29,8 @@ export declare class SpeechBalloonShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        type: EPostMessageType;
-        dataType: EDataType;
-        op: number[];
-        isSync: boolean;
-        index: number;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-        type: EPostMessageType;
-        dataType: EDataType;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/tools/star.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import { EStrokeType } from "../../plugin/types";
@@ -29,25 +29,8 @@ export declare class StarShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        type: EPostMessageType;
-        dataType: EDataType;
-        op: number[];
-        isSync: boolean;
-        index: number;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-        type: EPostMessageType;
-        dataType: EDataType;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/tools/straight.d.ts

@@ -1,7 +1,7 @@
 import { IWorkerMessage, IRectType, IUpdateNodeOpt } from "../types";
 import { EDataType, EPostMessageType, EScaleType, EToolsKey, EvevtWorkState } from "../enum";
 import { Point2d } from "../utils/primitives/Point2d";
-import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { BaseConsumeResultType, BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { ShapeNodes } from "./utils";
 import { EStrokeType } from "../../plugin/types";
@@ -27,25 +27,8 @@ export declare class StraightShape extends BaseShapeTool {
         isSubWorker?: boolean;
         isMainThread?: boolean;
         smoothSync?: boolean;
-    }): {
-        type: EPostMessageType;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        type: EPostMessageType;
-        dataType: EDataType;
-        op: number[];
-        isSync: boolean;
-        index: number;
-    } | {
-        workId: string;
-        toolsType: EToolsKey;
-        opt: import("./utils").ShapeOptions;
-        rect: IRectType | undefined;
-        type: EPostMessageType;
-        dataType: EDataType;
-    };
+        isSimpleWorker?: boolean;
+    }): BaseConsumeResultType;
     consumeAll(): {
         type: EPostMessageType;
         removeIds: string[];

package/dist/core/types.d.ts

@@ -17,6 +17,11 @@ export type ViewWorkerOptions = {
     dpr: number;
     originalPoint: [number, number];
     cameraOpt: ICameraOpt;
+    transferOffscreenCanvas?: {
+        bgCanvas: OffscreenCanvas;
+        serviceCanvas: OffscreenCanvas;
+        localCanvas: OffscreenCanvas;
+    };
 };
 export interface ICanvasSceneType {
     /** canvas 上下文 */
@@ -41,6 +46,7 @@ export interface IOffscreenCanvasOptionType {
     [key: string]: any;
 }
 export interface ILayerOptionType {
+    canvas?: OffscreenCanvas;
     offscreen?: boolean;
     handleEvent?: boolean;
     depth?: boolean;
@@ -134,6 +140,14 @@ export type IWorkerMessage = Omit<Partial<BaseCollectorReducerAction>, "op"> & {
     maxCombineEraserTime?: number;
     /** 平滑同步 */
     smoothSync?: boolean;
+    /** 是否使用单一worker模式 */
+    isUseSimple?: boolean;
+    /** 离屏canvas */
+    offscreenCanvas?: {
+        localCanvas: OffscreenCanvas;
+        bgCanvas: OffscreenCanvas;
+        serviceCanvas: OffscreenCanvas;
+    };
     /** 字体库 */
     fontBuffers?: {
         fontFamily: string;