@netless/appliance-plugin 1.0.6 → 1.0.7

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-BUV3AIdR.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.ECanvasContextType=e.ECanvasContextType;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EPostMessageType=e.EPostMessageType;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.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-OwNIkbKl.js");exports.ActiveContainerType=e.ActiveContainerType;exports.ApplianceMultiPlugin=e.ApplianceMultiPlugin;exports.ApplianceNames=e.ApplianceNames;exports.ApplianceSigleWrapper=e.ApplianceSigleWrapper;exports.ApplianceSinglePlugin=e.ApplianceSinglePlugin;exports.ECanvasContextType=e.ECanvasContextType;exports.ECanvasShowType=e.ECanvasShowType;exports.EDataType=e.EDataType;exports.EMatrixrRelationType=e.EMatrixrRelationType;exports.EPostMessageType=e.EPostMessageType;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.ShapeType=e.ShapeType;exports.fullWorkerUrl=e.fullWorker;exports.subWorkerUrl=e.subWorker;

package/dist/appliance-plugin.mjs

@@ -1,10 +1,10 @@
-import { a1 as s, W as p, Z as t, Y as l, X as r, a2 as n, a3 as y, j as E, N as i, h as T, E as o, l as v, f as g, a5 as S, K as c, a4 as k, k as W, a6 as u, a0 as A, $ as M, R as m, U as C } from "./index-DDd3tlz2.mjs";
+import { H as s, A as p, B as t, z as r, y as l, J as n, K as y, h as E, r as i, k as T, O as o, F as v, E as g, N as S, p as c, L as k, a as A, P as u, I as M, G as W, w as m, x } from "./index-DWP99OFK.mjs";
 export {
   s as ActiveContainerType,
   p as ApplianceMultiPlugin,
   t as ApplianceNames,
-  l as ApplianceSigleWrapper,
-  r as ApplianceSinglePlugin,
+  r as ApplianceSigleWrapper,
+  l as ApplianceSinglePlugin,
   n as ECanvasContextType,
   y as ECanvasShowType,
   E as EDataType,
@@ -16,10 +16,10 @@ export {
   S as ElayerType,
   c as EmitEventType,
   k as EventMessageType,
-  W as EvevtWorkState,
+  A as EvevtWorkState,
   u as EvevtWorkType,
-  A as InternalMsgEmitterType,
-  M as ShapeType,
+  M as InternalMsgEmitterType,
+  W as ShapeType,
   m as fullWorkerUrl,
-  C as subWorkerUrl
+  x as subWorkerUrl
 };

package/dist/core/enum.d.ts

@@ -3,36 +3,38 @@ export declare enum EToolsKey {
     Pencil = 1,
     /** 橡皮擦工具 */
     Eraser = 2,
+    /** 局部橡皮擦 */
+    PencilEraser = 3,
     /** 选择工具 */
-    Selector = 3,
+    Selector = 4,
     /** 点击互动工具 */
-    Clicker = 4,
+    Clicker = 5,
     /** 箭头工具 */
-    Arrow = 5,
+    Arrow = 6,
     /** 抓手工具 */
-    Hand = 6,
+    Hand = 7,
     /** 激光铅笔绘制工具 */
-    LaserPen = 7,
+    LaserPen = 8,
     /** 文字工具 */
-    Text = 8,
+    Text = 9,
     /** 直线工具 */
-    Straight = 9,
+    Straight = 10,
     /** 矩形工具 */
-    Rectangle = 10,
+    Rectangle = 11,
     /** 圆形工具 */
-    Ellipse = 11,
+    Ellipse = 12,
     /** 星形工具 */
-    Star = 12,
+    Star = 13,
     /** 三角形工具 */
-    Triangle = 13,
+    Triangle = 14,
     /** 菱形工具 */
-    Rhombus = 14,
+    Rhombus = 15,
     /** 多边形工具 */
-    Polygon = 15,
+    Polygon = 16,
     /** 聊天泡泡框 */
-    SpeechBalloon = 16,
+    SpeechBalloon = 17,
     /** 图片 */
-    Image = 17
+    Image = 18
 }
 export declare enum EDataType {
     /** 本地数据 */
@@ -95,7 +97,11 @@ export declare enum EPostMessageType {
     /** 丢失焦点事件 */
     CursorBlur = 19,
     /** 前端日志 */
-    Console = 20
+    Console = 20,
+    /** 优先激活worker */
+    PriorityWorker = 21,
+    /** 优先激活worker */
+    PriorityMainThreadWorker = 22
 }
 export declare enum ECanvasContextType {
     Webgl2 = "webgl2",

package/dist/core/mainEngine.d.ts

@@ -3,7 +3,7 @@ import { BaseCollectorReducerAction, DiffOneData } from "../collector";
 import { BaseApplianceManager } from "../plugin/baseApplianceManager";
 import { IActiveToolsDataType, IActiveWorkDataType, ICameraOpt, IMainMessage, IRectType, IUpdateNodeOpt, IWorkerMessage, IqueryTask, IworkId, ViewWorkerOptions } from "./types";
 import { BaseSubWorkModuleProps } from "../plugin/types";
-import type { ImageInformation } from "../plugin/types";
+import type { ImageInformation, PriorityType } from "../plugin/types";
 import { MethodBuilderMain } from "./msgEvent";
 import { EvevtWorkState } from "./enum";
 import { BaseShapeOptions } from "./tools";
@@ -131,6 +131,7 @@ export declare class MasterControlForWorker extends MasterController {
     private mainThread?;
     private willSelectorWorkId?;
     private isLockSentEventCursor;
+    private subMainThreadWorker?;
     constructor(props: BaseSubWorkModuleProps);
     destroy(): void;
     private get viewContainerManager();
@@ -143,12 +144,17 @@ export declare class MasterControlForWorker extends MasterController {
     private get isCanStartEventConsum();
     init(): Promise<void>;
     on(): Promise<void>;
-    private clearReRenders;
+    clearReRenders(num?: number): void;
     get isBusy(): boolean;
     getLockSentEventCursor(): boolean;
     setLockSentEventCursor(bol: boolean): void;
     getTasksqueueState(): EvevtWorkState.Doing | EvevtWorkState.Done;
     setMaxDrawCount(num: number): void;
+    getWorkDrawCount(): number;
+    getSubWorkerDrawCount(): number;
+    getMaxDrawCount(): number;
+    setWorkDrawCount(num: number): void;
+    setSubWorkerDrawCount(num: number): void;
     setWorkerTasksqueueCount(num: number): void;
     collectorSyncData(sp: IMainMessage[]): void;
     private collectorAsyncData;
@@ -209,4 +215,5 @@ 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;
 }

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

@@ -19,7 +19,7 @@ export declare class SnapshotThreadImpl {
     on(msg: IWorkerMessage): Promise<void>;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId: string;
-    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | TextShape | import("../tools").SelectorShape | ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | TextShape | import("../tools").SelectorShape | ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
     setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | undefined;
     runFullWork(data: IWorkerMessage): Promise<IRectType | undefined>;
     private getSnapshot;

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

@@ -98,6 +98,7 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     reRenderSelector(willSyncService?: boolean): Promise<void> | undefined;
     blurSelector(data?: IWorkerMessage): Promise<void>;
     clearWorkShapeNodeCache(workId: string): void;
+    private drawPencilEraser;
     private drawEraser;
     private updateBatchEraserCombineNode;
     private batchEraserCombine;
@@ -110,5 +111,5 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     setWorkOptions(workId: string, opt: BaseShapeOptions): void;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId: string;
-    }): PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | TextShape | SelectorShape | ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    }): PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | TextShape | SelectorShape | ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
 }

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

@@ -33,7 +33,7 @@ export declare class SubTopThreadImpl implements SubTopThread {
     constructor(opt: ISubThreadInitOption);
     createLocalWork(data: IWorkerMessage): void;
     getLocalWorkShape(workId: string): ILocalWorkItem | undefined;
-    createLocalWorkShape(workId: string, opt?: BaseShapeOptions): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    createLocalWorkShape(workId: string, opt?: BaseShapeOptions): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
     canUseTopLayer(toolsType: EToolsKey): toolsType is EToolsKey.LaserPen;
     destroy(): void;
     clearAll(): void;
@@ -42,7 +42,7 @@ export declare class SubTopThreadImpl implements SubTopThread {
     getToolsOpt(): IActiveToolsDataType | undefined;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId: string;
-    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
     private setNodeKey;
     private activeServiceWorkShape;
     private computNextAnimationIndex;

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

@@ -0,0 +1,99 @@
+import { Group, Scene } from "spritejs";
+import { EToolsKey } from "../enum";
+import { MasterControlForWorker } from "../mainEngine";
+import { IActiveToolsDataType, IBatchMainMessage, ICameraOpt, IWorkerMessage } from "../types";
+import { IMainThreadInitOption } from "./base";
+import { BaseShapeOptions, BaseShapeTool } from "../tools/base";
+import { ShapeOptions } from "../tools/utils";
+interface MainThreadWorkerManager {
+    master: MasterControlForWorker;
+    mainThreadWorkerMap: Map<string, MainThreadWorkerImpl>;
+    createMainThreadWorker(viewId: string, opt: IMainThreadInitOption): MainThreadWorkerImpl;
+    consume(msg: Set<IWorkerMessage>): void;
+    post(sp: Omit<IBatchMainMessage, 'render'>): void;
+    clearDrawCount(viewId: string): void;
+    notifyDrawCount(viewId: string): void;
+    active(): void;
+    destroy(): void;
+    updateCamera(): void;
+}
+export declare class MainThreadWorkerManagerImpl implements MainThreadWorkerManager {
+    master: MasterControlForWorker;
+    mainThreadWorkerMap: Map<string, MainThreadWorkerImpl>;
+    constructor(master: MasterControlForWorker);
+    updateCamera(): void;
+    notifyDrawCount(viewId: string): void;
+    clearDrawCount(viewId: string): void;
+    createMainThreadWorker(viewId: string, opt: IMainThreadInitOption): MainThreadWorkerImpl;
+    consume(msg: Set<IWorkerMessage>): void;
+    post(msg: Omit<IBatchMainMessage, 'render'>): void;
+    destroy(): void;
+    active(): void;
+}
+interface MainThreadWorker {
+    readonly viewId: string;
+    readonly subLocalLayer: Group;
+    readonly manager: MainThreadWorkerManager;
+    setCameraOpt(cameraOpt: ICameraOpt): void;
+    updateCamera(msg: IWorkerMessage): void;
+    on(msg: IWorkerMessage): void;
+    destroy(): void;
+}
+export declare class MainThreadWorkerImpl implements MainThreadWorker {
+    viewId: string;
+    opt: IMainThreadInitOption;
+    manager: MainThreadWorkerManager;
+    subLocalLayer: Group;
+    subLocalWork: SubMainThreadWorkerImpl;
+    protected scene: Scene;
+    protected cameraOpt?: ICameraOpt;
+    constructor(viewId: string, opt: IMainThreadInitOption, manager: MainThreadWorkerManager);
+    private createScene;
+    private createLayer;
+    private updateScene;
+    private updateLayer;
+    on(msg: IWorkerMessage): void;
+    setCameraOpt(cameraOpt: ICameraOpt): void;
+    updateCamera(msg: IWorkerMessage): void;
+    clearAll(): void;
+    destroy(): void;
+    clearDrawLayer(num: number): void;
+}
+interface SubMainThreadWorker {
+    workShapes: Map<string, BaseShapeTool>;
+    destroy(): void;
+    clearAll(): void;
+    getToolsOpt(): IActiveToolsDataType | undefined;
+    setToolsOpt(opt: IActiveToolsDataType): void;
+    canUseSubWorkerLayer(toolsType: EToolsKey): boolean;
+    consumeDrawAll(data: IWorkerMessage): void;
+    consumeDraw(data: IWorkerMessage): void;
+    removeNode(data: IWorkerMessage): void;
+    setWorkOptions(workId: string, opt: BaseShapeOptions): void;
+}
+export declare class SubMainThreadWorkerImpl implements SubMainThreadWorker {
+    thread: MainThreadWorkerImpl;
+    workShapes: Map<string, BaseShapeTool>;
+    private tmpOpt?;
+    private syncUnitTime;
+    private drawCount;
+    constructor(subThreadOpt: {
+        thread: MainThreadWorkerImpl;
+    });
+    getToolsOpt(): IActiveToolsDataType | undefined;
+    consumeDrawAll(data: IWorkerMessage): void;
+    consumeDraw(data: IWorkerMessage): void;
+    removeNode(data: IWorkerMessage): void;
+    createLocalWork(data: IWorkerMessage): void;
+    setWorkOptions(workId: string, opt: ShapeOptions): void;
+    destroy(): void;
+    clearAll(): void;
+    canUseSubWorkerLayer(toolsType: EToolsKey): toolsType is EToolsKey.Pencil;
+    setToolsOpt(opt: IActiveToolsDataType): void;
+    createWorkShapeNode(opt: IActiveToolsDataType & {
+        workId: string;
+    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
+    clearWorkShapeNodeCache(workId: string): void;
+    getWorkShape(workId: string): BaseShapeTool | undefined;
+}
+export {};

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

@@ -1,10 +1,9 @@
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
 import { EPostMessageType, EScaleType, EToolsKey } from "../enum";
-import { IWorkerMessage, IRectType, IworkId } from "../types";
+import { IWorkerMessage, IRectType } from "../types";
 import type { ServiceThreadSubWork } from "./utils";
 export interface EraserOptions extends BaseShapeOptions {
     thickness: number;
-    isLine: boolean;
 }
 export declare class EraserShape extends BaseShapeTool {
     readonly canRotate: boolean;
@@ -25,10 +24,6 @@ export declare class EraserShape extends BaseShapeTool {
     private createEraserRect;
     private computRectCenterPoints;
     private isNear;
-    private cutPolyline;
-    private isSamePoint;
-    private translateIntersect;
-    private isLineEraser;
     private remove;
     consume(props: {
         data: IWorkerMessage;
@@ -39,17 +34,10 @@ export declare class EraserShape extends BaseShapeTool {
         type: EPostMessageType;
         rect?: undefined;
         removeIds?: undefined;
-        newWorkDatas?: undefined;
     } | {
         type: EPostMessageType;
         rect: IRectType;
         removeIds: string[];
-        newWorkDatas: Map<string, {
-            op: number[];
-            opt: BaseShapeOptions;
-            workId: IworkId;
-            toolsType: EToolsKey;
-        }>;
     };
     consumeAll(props: {
         data: IWorkerMessage;
@@ -60,17 +48,10 @@ export declare class EraserShape extends BaseShapeTool {
         type: EPostMessageType;
         rect?: undefined;
         removeIds?: undefined;
-        newWorkDatas?: undefined;
     } | {
         type: EPostMessageType;
         rect: IRectType;
         removeIds: string[];
-        newWorkDatas: Map<string, {
-            op: number[];
-            opt: BaseShapeOptions;
-            workId: IworkId;
-            toolsType: EToolsKey;
-        }>;
     };
     clearTmpPoints(): void;
     private getUnLockNodeMap;

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

@@ -0,0 +1,76 @@
+import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
+import { EPostMessageType, EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, IworkId } from "../types";
+import type { ServiceThreadSubWork } from "./utils";
+export interface PencilEraserOptions extends BaseShapeOptions {
+    thickness: number;
+}
+export declare class PencilEraserShape extends BaseShapeTool {
+    readonly canRotate: boolean;
+    readonly scaleType: EScaleType;
+    readonly toolsType: EToolsKey;
+    readonly serviceWork?: ServiceThreadSubWork;
+    private static readonly eraserSizes;
+    protected tmpPoints: Array<number>;
+    protected workOptions: PencilEraserOptions;
+    worldPosition: [number, number];
+    worldScaling: [number, number];
+    eraserRect: IRectType | undefined;
+    eraserPolyline?: [number, number, number, number];
+    constructor(props: BaseShapeToolProps, serviceWork?: ServiceThreadSubWork);
+    combineConsume(): undefined;
+    consumeService(): IRectType | undefined;
+    setWorkOptions(setWorkOptions: PencilEraserOptions): void;
+    private createEraserRect;
+    private computRectCenterPoints;
+    private isNear;
+    private cutPolyline;
+    private isSamePoint;
+    private translateIntersect;
+    private isLineEraser;
+    private remove;
+    consume(props: {
+        data: IWorkerMessage;
+    }): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        rect?: undefined;
+        removeIds?: undefined;
+        newWorkDatas?: undefined;
+    } | {
+        type: EPostMessageType;
+        rect: IRectType;
+        removeIds: string[];
+        newWorkDatas: Map<string, {
+            op: number[];
+            opt: BaseShapeOptions;
+            workId: IworkId;
+            toolsType: EToolsKey;
+        }>;
+    };
+    consumeAll(props: {
+        data: IWorkerMessage;
+    }): {
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
+        rect?: undefined;
+        removeIds?: undefined;
+        newWorkDatas?: undefined;
+    } | {
+        type: EPostMessageType;
+        rect: IRectType;
+        removeIds: string[];
+        newWorkDatas: Map<string, {
+            op: number[];
+            opt: BaseShapeOptions;
+            workId: IworkId;
+            toolsType: EToolsKey;
+        }>;
+    };
+    clearTmpPoints(): void;
+    private getUnLockNodeMap;
+}

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

@@ -19,9 +19,10 @@ import { ImageOptions, ImageShape } from "./image";
 import type { ServiceWorkForFullWorker } from "../worker/fullWorkerService";
 import type { SubServiceThread } from "../mainThread/subServiceThread";
 import { BaseShapeTool } from "./base";
-export type ShapeTools = typeof PencilShape | typeof LaserPenShape | typeof EraserShape | typeof StarShape | typeof SelectorShape | typeof ArrowShape | typeof EllipseShape | typeof RectangleShape | typeof StarShape | typeof PolygonShape | typeof TextShape | typeof SpeechBalloonShape | typeof ImageShape;
-export type ShapeToolsClass = BaseShapeTool | PencilShape | LaserPenShape | EraserShape | StarShape | SelectorShape | ArrowShape | EllipseShape | RectangleShape | StarShape | PolygonShape | TextShape | SpeechBalloonShape | ImageShape;
-export type ShapeOptions = PencilOptions | LaserPenOptions | EraserOptions | StarOptions | SelectorOptions | ArrowOptions | EllipseOptions | RectangleOptions | StarOptions | PolygonOptions | StraightOptions | TextOptions | SpeechBalloonOptions | ImageOptions;
+import { PencilEraserOptions, PencilEraserShape } from "./pencilEraser";
+export type ShapeTools = typeof PencilShape | typeof LaserPenShape | typeof PencilEraserShape | typeof EraserShape | typeof StarShape | typeof SelectorShape | typeof ArrowShape | typeof EllipseShape | typeof RectangleShape | typeof StarShape | typeof PolygonShape | typeof TextShape | typeof SpeechBalloonShape | typeof ImageShape;
+export type ShapeToolsClass = BaseShapeTool | PencilShape | LaserPenShape | PencilEraserShape | EraserShape | StarShape | SelectorShape | ArrowShape | EllipseShape | RectangleShape | StarShape | PolygonShape | TextShape | SpeechBalloonShape | ImageShape;
+export type ShapeOptions = PencilOptions | LaserPenOptions | PencilEraserOptions | EraserOptions | StarOptions | SelectorOptions | ArrowOptions | EllipseOptions | RectangleOptions | StarOptions | PolygonOptions | StraightOptions | TextOptions | SpeechBalloonOptions | ImageOptions;
 export type ShapeNodes = Group | Path | Polyline | Rect | Ellipse | Sprite | Label;
 export type ServiceThreadSubWork = SubServiceThread | ServiceWorkForFullWorker;
 export interface CombineConsumeResult {
@@ -32,7 +33,7 @@ export interface CombineConsumeResult {
 export interface ShapeStateInfo {
     willClear: boolean;
 }
-export declare function getShapeTools(toolsType: EToolsKey): typeof PencilShape | typeof LaserPenShape | typeof EraserShape | typeof StarShape | typeof TextShape | typeof ArrowShape | typeof StraightShape | typeof EllipseShape | typeof PolygonShape | typeof RectangleShape | typeof SpeechBalloonShape | typeof SelectorShape | typeof ImageShape | undefined;
+export declare function getShapeTools(toolsType: EToolsKey): typeof PencilShape | typeof LaserPenShape | typeof EraserShape | typeof StarShape | typeof TextShape | typeof ArrowShape | typeof StraightShape | typeof EllipseShape | typeof PolygonShape | typeof RectangleShape | typeof SpeechBalloonShape | typeof PencilEraserShape | typeof SelectorShape | typeof ImageShape | undefined;
 export declare function getShapeInstance(param: {
     workId: string;
     toolsType: EToolsKey;
@@ -40,5 +41,5 @@ export declare function getShapeInstance(param: {
     vNodes?: VNodeManager;
     fullLayer: Group;
     drawLayer?: Group;
-}, serviceWork?: ServiceThreadSubWork): PencilShape | LaserPenShape | EraserShape | StarShape | TextShape | SelectorShape | ImageShape | ArrowShape | StraightShape | EllipseShape | PolygonShape | RectangleShape | SpeechBalloonShape | undefined;
+}, serviceWork?: ServiceThreadSubWork): PencilShape | LaserPenShape | EraserShape | StarShape | TextShape | SelectorShape | ImageShape | ArrowShape | StraightShape | EllipseShape | PolygonShape | RectangleShape | SpeechBalloonShape | PencilEraserShape | undefined;
 export declare function findShapeBody(nodes: ShapeNodes[]): ShapeNodes[];

package/dist/core/types.d.ts

@@ -205,6 +205,7 @@ export interface IBatchMainMessage {
     drawCount?: number;
     workerTasksqueueCount?: number;
     workIds?: Set<string>;
+    viewId?: string;
 }
 export interface ICameraOpt {
     centerX: number;

package/dist/core/utils/math.d.ts

@@ -65,3 +65,6 @@ export declare function isIntersectForPoint(point: [number, number], rect: IRect
 export declare const getLineSegIntersection: (p1: [number, number], p2: [number, number], p3: [number, number], p4: [number, number]) => [number, number] | null;
 export declare function getWHRatio(w: number, h: number): [number, number];
 export declare function checkOp(op: number[]): boolean;
+export declare function isDecimal(num: number): boolean;
+export declare function decimalPlaces(num: number): number;
+export declare function gcd(a: number, b: number): number;

package/dist/core/vNodeManager.d.ts

@@ -11,6 +11,7 @@ export declare class VNodeManager {
     constructor(viewId: string, scene: Scene);
     init(fullLayer: Group): void;
     get(name: string): BaseNodeMapItem | undefined;
+    getUnLockNodes(): Map<string, BaseNodeMapItem>;
     getNodesByType(type: EToolsKey): Map<string, BaseNodeMapItem>;
     hasRenderNodes(): boolean;
     has(name: string): boolean;

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

@@ -42,8 +42,11 @@ export declare abstract class WorkThreadEngineBase {
         workName: EmitEventType;
         workState: EvevtWorkState;
     };
+    protected hasPriorityDraw: boolean;
     protected delayPostDoneResolve?: (bol: boolean) => void;
     constructor(viewId: string, opt: IWorkerInitOption, workerType: EWorkThreadType);
+    setHasPriorityDraw(bol: boolean): void;
+    getPriorityDraw(): boolean;
     setIsSafari(isSafari: boolean): void;
     on(msg: IWorkerMessage): Promise<void>;
     protected createLocalWork(data: IWorkerMessage): void;
@@ -59,7 +62,7 @@ export declare abstract class WorkThreadEngineBase {
     post(msg: IBatchMainMessage): Promise<void>;
     private runBatchPostData;
     protected combinePostData(): IBatchMainMessage;
-    protected safariFixRect(rect: IRectType): IRectType | undefined;
+    protected safariFixRect(rect: IRectType, dpr: number): IRectType | undefined;
     protected getSceneRect(): IRectType;
     abstract combinePost(): Promise<void>;
     protected abstract getLayer(workLayer: ECanvasShowType): Group | undefined;
@@ -87,7 +90,7 @@ export declare abstract class LocalWork {
     setWorkOptions(workId: string, opt: BaseShapeOptions): void;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId: string;
-    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
     setToolsOpt(opt: IActiveToolsDataType): void;
     getToolsOpt(): IActiveToolsDataType | undefined;
     clearWorkShapeNodeCache(workId: string): void;

package/dist/core/worker/fullWorkerLocal.d.ts

@@ -45,8 +45,10 @@ export declare class LocalWorkForFullWorker extends LocalWork {
     destroy(): void;
     private drawPencilCombine;
     private drawSelector;
+    private drawPencilEraser;
     private drawEraser;
     private batchEraserCombine;
+    private drawShape;
     private drawPencil;
     private drawPencilFull;
     private updateBatchEraserCombineNode;

package/dist/core/worker/subWorkerLocal.d.ts

@@ -1,4 +1,4 @@
-import { IWorkerMessage, IRectType } from "..";
+import { IWorkerMessage, IRectType, EToolsKey } from "..";
 import { LocalWork, ISubWorkerInitOption } from "./base";
 export declare class LocalWorkForSubWorker extends LocalWork {
     private drawWorkActiveId?;
@@ -6,10 +6,11 @@ export declare class LocalWorkForSubWorker extends LocalWork {
     runFullWork(data: IWorkerMessage): Promise<IRectType | undefined>;
     runSelectWork(data: IWorkerMessage): undefined;
     workShapesDone(): void;
+    canUseSubWorker(eToolsKey: EToolsKey): boolean;
     consumeDraw(data: IWorkerMessage): Promise<void>;
     consumeDrawAll(data: IWorkerMessage): Promise<void>;
     removeWork(data: IWorkerMessage): Promise<void>;
     private removeNode;
     private drawPencil;
-    private drawArrow;
+    private drawShape;
 }

package/dist/core/worker/subWorkerTopLayer.d.ts

@@ -28,11 +28,11 @@ export declare class TopLayerWorkForSubWorker implements TopLayerWork {
     constructor(opt: ISubWorkerInitOption);
     canUseTopLayer(toolsType: EToolsKey): toolsType is EToolsKey.LaserPen;
     getWorkShape(workId: string): ILocalWorkItem | undefined;
-    createWorkShape(workId: string, opt?: BaseShapeOptions): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    createWorkShape(workId: string, opt?: BaseShapeOptions): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
     setWorkOptions(workId: string, opt: BaseShapeOptions): void;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId: string;
-    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | undefined;
+    }): import("../tools").PencilShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").StarShape | import("../tools/text").TextShape | import("../tools").SelectorShape | import("../tools").ImageShape | import("../tools").ArrowShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
     clearAllWorkShapesCache(): void;
     setToolsOpt(opt: IActiveToolsDataType): void;
     getToolsOpt(): IActiveToolsDataType | undefined;

package/dist/core/worker/workerManager.d.ts

@@ -14,6 +14,7 @@ export declare class WorkerManager<T extends WorkThreadEngineBase> {
     readonly _self: Worker;
     readonly version: string;
     protected type: EWorkThreadType;
+    protected hasPriorityDraw: boolean;
     protected workThreadMap: Map<string, T>;
     constructor(worker: Worker, type: EWorkThreadType);
     private init;