@netless/appliance-plugin 1.1.1 → 1.1.3-4.beta.0

package/dist/core/enum.d.ts

@@ -36,7 +36,9 @@ export declare enum EToolsKey {
     /** 聊天泡泡框 */
     SpeechBalloon = 18,
     /** 图片 */
-    Image = 19
+    Image = 19,
+    /** background svg工具 */
+    BackgroundSVG = 20
 }
 export declare enum EDataType {
     /** 本地数据 */
@@ -46,14 +48,19 @@ export declare enum EDataType {
     /** 来源于worker */
     Worker = 3
 }
-export declare enum EvevtWorkState {
+export declare enum EventWorkState {
+    /** 等待 */
     Pending = 0,
+    /** 开始 */
     Start = 1,
+    /** 进行中 */
     Doing = 2,
+    /** 完成 */
     Done = 3,
     /** 只读状态 */
     Unwritable = 4
 }
+export { EventWorkState as EvevtWorkState };
 /**
  * 事件消息类型
  */
@@ -101,9 +108,7 @@ export declare enum EPostMessageType {
     /** 前端日志 */
     Console = 20,
     /** 优先激活worker */
-    PriorityWorker = 21,
     /** 优先激活worker */
-    PriorityMainThreadWorker = 22,
     /** 获取图片位图 */
     GetImageBitMap = 23,
     /** 授权可写权限 */
@@ -113,7 +118,21 @@ export declare enum EPostMessageType {
     /** 授权可以删除笔记权限 */
     AuthClear = 26,
     /** 授权可以操作page权限 */
-    AuthPage = 27
+    AuthPage = 27,
+    /** 获取vNode信息 */
+    GetVNodeInfo = 28,
+    /** 变更dpr */
+    UpdateDpr = 29,
+    /** 设置字体库 */
+    SetFontFace = 30,
+    /** 上报错误 */
+    ReportError = 31,
+    /** 上报日志 */
+    ReportLog = 32,
+    /** 更新 background svg */
+    BackgroundSVGUpdate = 33,
+    /** delete background svg */
+    BackgroundSVGDelete = 34
 }
 export type ECanvasContextType = "webgl2" | "webgl" | "2d";
 export declare enum ECanvasShowType {
@@ -147,16 +166,58 @@ export declare enum EScaleType {
     /** 等比例 */
     proportional = 4
 }
-export declare enum EvevtWorkType {
-    Pending = 0,
-    Start = 1,
-    Doing = 2,
-    Done = 3,
-    /** 只读状态 */
-    Unwritable = 4
-}
 export declare enum EMatrixrRelationType {
+    /** 在内部, 无边界碰撞 */
     inside = 0,
+    /** 在外部 */
     outside = 1,
+    /** 有边界碰撞 */
     intersect = 2
 }
+/**
+ * 分屏 操作类型
+ * view => scenes => pages => elements
+ */
+export declare enum EOperationType {
+    /** 设置同步视口页面 */
+    renderPage = "renderPage",
+    /** 新增页面 */
+    addPage = "addPage",
+    /** 删除页面 */
+    deletePage = "deletePage",
+    /** 新增笔记 */
+    addElement = "addElement",
+    /** 删除笔记 */
+    deleteElement = "deleteElement",
+    /** 清空页面中的所有笔记 */
+    clearPage = "clearPage",
+    /** 清空场景下的所有页面*/
+    clearViewScenePath = "clearViewScenePath",
+    /** 清空view */
+    clearView = "clearView",
+    /** 同步UndoStack */
+    syncUndoStack = "syncUndoStack",
+    /** 同步RodoStack */
+    syncRedoStack = "syncRedoStack"
+}
+/**
+ * 笔记过滤 操作类型
+ */
+export declare enum ERenderFilterType {
+    /** 设置全量权限 */
+    setAuth = "setAuth",
+    /** 设置可显权限  */
+    setShow = "addShow",
+    /** 设置可隐藏权限 */
+    setHide = "setHide",
+    /** 设置可删除权限 */
+    setClear = "setClear"
+}
+export declare enum EImageType {
+    Image = "image",
+    Iconify = "iconify"
+}
+export declare enum ESVGType {
+    url = "url",
+    markmap = "markmap"
+}

package/dist/core/index.d.ts

@@ -1,3 +1,3 @@
-export * from './enum';
-export * from './types';
-export * from './const';
+export * from "./enum";
+export * from "./types";
+export * from "./const";

package/dist/core/mainEngine.d.ts

@@ -1,23 +1,32 @@
-import EventEmitter2 from "eventemitter2";
-import { BaseCollectorReducerAction, DiffOneData, Uid } from "../collector";
+import type EventEmitter2 from "eventemitter2";
+import { BaseCollectorReducerAction, DiffOneData } from "../collector";
 import { BaseApplianceManager } from "../plugin/baseApplianceManager";
-import { IActiveToolsDataType, IActiveWorkDataType, ICameraOpt, IMainMessage, IRectType, IUpdateNodeOpt, IWorkerMessage, IqueryTask, IworkId, ViewWorkerOptions } from "./types";
+import { BaseNodeMapItem, IActiveToolsDataType, IActiveWorkDataType, ICameraOpt, IMainMessage, IRectType, IUpdateNodeOpt, IWorkerMessage, IqueryTask, IworkId, ViewWorkerOptions } from "./types";
 import { BaseSubWorkModuleProps } from "../plugin/types";
-import type { ImageInformation, PriorityType, _SetTrue } from "../plugin/types";
+import type { ISVGMarkmapInformation, ISVGUrlInformation, IconifyInformation, ImageInformation, MarkmapId, _SetTrue } from "../plugin/types";
 import { MethodBuilderMain } from "./msgEvent";
-import { EvevtWorkState } from "./enum";
+import { EventWorkState } from "./enum";
 import { BaseShapeOptions } from "./tools";
+import { AppViewDisplayerManager, MainViewDisplayerManager } from "../plugin/baseViewContainerManager";
 export declare abstract class MasterController {
     /** 异步同步时间间隔 */
-    maxLastSyncTime: number;
+    abstract readonly maxLastSyncTime: number;
+    /** 合并绘制时间间隔 */
+    abstract readonly combineUnitTime: number;
+    /** 最大合并橡皮擦处理时间 */
+    abstract readonly maxCombineEraserTime: number;
+    /** 平滑同步 */
+    abstract readonly smoothSync: boolean;
     /** 插件管理器 */
-    readonly abstract control: BaseApplianceManager;
-    readonly abstract internalMsgEmitter: EventEmitter2;
+    abstract readonly control: BaseApplianceManager;
+    abstract readonly internalMsgEmitter: EventEmitter2;
+    abstract readonly publicMsgEmitter: EventEmitter2;
     /** worker线程管理器 */
     /** 本地原始点数据批任务数据池 */
     protected abstract localPointsBatchData: Map<IworkId, {
-        state: EvevtWorkState;
+        state: EventWorkState;
         points: number[];
+        rawPoints: number[];
         isFullWork: boolean;
         viewId: string;
     }>;
@@ -26,11 +35,13 @@ export declare abstract class MasterController {
     /** 主线程和工作线程通信机 */
     protected abstract fullWorker: Worker;
     /** 子线程和工作线程通信机 */
-    protected abstract subWorker: Worker;
+    protected abstract subWorker?: Worker;
     /** 当前选中的工具配置数据 */
     abstract currentToolsData?: IActiveToolsDataType;
     /** 当前工作任务数据 */
     protected abstract currentLocalWorkData: IActiveWorkDataType;
+    get now(): number;
+    get newWorkId(): string;
     /** 设置当前选中的工具配置数据 */
     setCurrentToolsData(currentToolsData: IActiveToolsDataType): void;
     getCurrentToolsData(): IActiveToolsDataType | undefined;
@@ -39,7 +50,7 @@ export declare abstract class MasterController {
     /** 获取当前激活的工作任务id */
     protected getWorkId(): IworkId | undefined;
     /** 获取当前work的工作状态 */
-    getWorkState(): EvevtWorkState;
+    get workState(): EventWorkState;
     /** 用于接收服务端同步的数据 */
     abstract onServiceDerive(key: string, data: DiffOneData<BaseCollectorReducerAction | undefined>): void;
     /** 消费批处理池数据 */
@@ -70,15 +81,18 @@ 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;
     /** 获取某个场景路径下的包围盒 */
     abstract getBoundingRect(scenePath: string): Promise<IRectType> | undefined;
-    abstract getSnapshot(scenePath: string, width?: number, height?: number, camera?: Pick<ICameraOpt, "centerX" | "centerY" | "scale">): Promise<ImageBitmap> | undefined;
+    abstract getSnapshot(scenePath: string, width?: number, height?: number, camera?: Pick<ICameraOpt, "centerX" | "centerY" | "scale">): Promise<Array<ImageBitmap | HTMLImageElement | null>> | undefined;
     /** 根据查询条件查询事件任务处理批量池中任务 */
     abstract queryTaskBatchData(query: IqueryTask): IWorkerMessage[];
     abstract insertImage(viewId: string, imageInfo: ImageInformation): void;
+    abstract insertIconify(viewId: string, iconifyInfo: IconifyInformation & {
+        strokeColor?: string;
+    }): void;
     abstract lockImage(viewId: string, uuid: string, locked: boolean): void;
     abstract completeImageUpload(viewId: string, uuid: string, src: string): void;
     abstract getImagesInformation(scenePath: string): ImageInformation[];
@@ -88,27 +102,39 @@ export declare abstract class MasterController {
     abstract checkDrawingWork(viewId: string): void;
 }
 export declare class MasterControlForWorker extends MasterController {
+    /** 异步同步时间间隔 */
+    readonly maxLastSyncTime: number;
+    /** 合并绘制时间间隔 */
+    readonly combineUnitTime: number;
+    /** 最大合并橡皮擦处理时间 */
+    readonly maxCombineEraserTime: number;
+    /** 平滑同步 */
+    readonly smoothSync: boolean;
     isActive: boolean;
     currentToolsData?: IActiveToolsDataType;
     protected currentLocalWorkData: IActiveWorkDataType;
     control: BaseApplianceManager;
     internalMsgEmitter: EventEmitter2;
+    publicMsgEmitter: EventEmitter2;
     taskBatchData: Set<IWorkerMessage>;
     protected fullWorker: Worker;
-    protected subWorker: Worker;
+    protected subWorker?: Worker;
     private fullWorkerUrl;
     private subWorkerUrl;
     methodBuilder?: MethodBuilderMain;
     private zIndexNodeMethod?;
     /** master\fullwoker\subworker 三者高频绘制时队列化参数 */
     private subWorkerDrawCount;
-    private wokerDrawCount;
+    private fullWorkerDrawCount;
     private maxDrawCount;
+    private _consumeCount;
+    private _postCount;
     private reRenders;
     private localWorkViewId?;
     protected localPointsBatchData: Map<IworkId, {
-        state: EvevtWorkState;
+        state: EventWorkState;
         points: number[];
+        rawPoints: number[];
         /** 完整的绘制 */
         isFullWork: boolean;
         viewId: string;
@@ -129,11 +155,22 @@ export declare class MasterControlForWorker extends MasterController {
     private animationId;
     private tmpImageConfigMap;
     private mainThread?;
+    private backgroundThreadManager?;
     private willSelectorWorkId?;
     private isLockSentEventCursor;
-    private subMainThreadWorker?;
+    private getVNodeInfoResolveMap;
+    private setFontFacesResolve;
+    private isLocalWorkActive;
+    /** IndexedDB工具类实例 */
+    private readonly indexDBUtils;
+    private markmapIdResolveMap;
     constructor(props: BaseSubWorkModuleProps);
+    get isBezier(): boolean;
     destroy(): void;
+    private get consumeCount();
+    private set consumeCount(value);
+    private get postCount();
+    private set postCount(value);
     private get viewContainerManager();
     private get collector();
     private get isRunSubWork();
@@ -141,23 +178,40 @@ export declare class MasterControlForWorker extends MasterController {
     private get isUseZIndex();
     private get isCanRecordUndoRedo();
     private get isCanSentCursor();
+    private get isPostCountType();
+    private get isCanPostDraw();
     private get isCanStartEventConsum();
     init(): Promise<void>;
+    private useBackgroundThread;
     private useMainThread;
     on(): Promise<void>;
+    /**
+     * 清理字体缓存数据库
+     */
+    clearFontCache(): Promise<boolean>;
+    /**
+     * 获取字体缓存状态
+     */
+    getFontCacheStatus(): Promise<{
+        count: number;
+        totalSize: number;
+    }>;
+    loadFontInMainThread(url: string): Promise<ArrayBuffer | undefined>;
+    private validateFontData;
     clearReRenders(num?: number): void;
     get isBusy(): boolean;
     getLockSentEventCursor(): boolean;
     setLockSentEventCursor(bol: boolean): void;
-    getTasksqueueState(): EvevtWorkState.Doing | EvevtWorkState.Done;
+    getTasksqueueState(): EventWorkState.Doing | EventWorkState.Done;
     setMaxDrawCount(num: number): void;
-    getWorkDrawCount(): number;
-    getSubWorkerDrawCount(): number;
+    getFullWorkDrawCount(): number;
     getMaxDrawCount(): number;
-    setWorkDrawCount(num: number): void;
     setSubWorkerDrawCount(num: number): void;
+    setConsumeCount(num: number): void;
+    getConsumeCount(): number;
     setWorkerTasksqueueCount(num: number): void;
     collectorSyncData(sp: IMainMessage[]): void;
+    foceUndoTickerEnd(id: number, viewId: string): void;
     private collectorAsyncData;
     private onLocalEventEnd;
     private onLocalEventDoing;
@@ -167,20 +221,27 @@ export declare class MasterControlForWorker extends MasterController {
     private deleteLocalPoint;
     private getLocalPointInfo;
     getLocalPointsInfo(): Map<IworkId, {
-        state: EvevtWorkState;
+        state: EventWorkState;
         points: number[];
+        rawPoints: number[];
         /** 完整的绘制 */
         isFullWork: boolean;
         viewId: string;
         opt?: BaseShapeOptions;
     }>;
+    private shouldUseAutoShape;
+    private toAutoShapePoints;
+    private logAutoShapeResult;
+    private emitAutoShapeResult;
+    private createAutoShapeTask;
+    private mapAutoShapeFallback;
     private correctStorage;
-    originalEventLintener(workState: EvevtWorkState, point: [number, number], viewId: string): Promise<void>;
+    originalEventLintener(workState: EventWorkState, point: [number, number], viewId: string): Promise<void>;
     getLocalWorkViewId(): string | undefined;
     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?: {
@@ -192,9 +253,12 @@ export declare class MasterControlForWorker extends MasterController {
     unWritable(): void;
     abled(): void;
     isAbled(): boolean;
+    postMainThread(msg: Set<IWorkerMessage>): void;
+    postWebWorker(msg: Set<IWorkerMessage>): void;
     post(msg: Set<IWorkerMessage>): void;
     updateNode(workId: IworkId, updateNodeOpt: IUpdateNodeOpt, viewId: string, scenePath: string): void;
     destroyTaskQueue(): void;
+    updateDpr(viewId: string, dpr: number): void;
     updateCamera(viewId: string, cameraOpt: ICameraOpt): void;
     private updateCameraDone;
     private consumeQueue;
@@ -203,12 +267,19 @@ export declare class MasterControlForWorker extends MasterController {
     private setZIndex;
     checkDrawingWork(vId: string): void;
     removeDrawingWork(vId: string): void;
+    removeNodes(viewId: string, removeIds: string[]): void;
     hoverCursor(point: [number, number], viewId: string): void;
     blurCursor(viewId: string): void;
     sendCursorEvent(p: [number | undefined, number | undefined], viewId: string): void;
     getBoundingRect(scenePath: string): Promise<IRectType> | undefined;
-    getSnapshot(scenePath: string, width?: number, height?: number, camera?: Pick<ICameraOpt, "centerX" | "centerY" | "scale">): Promise<ImageBitmap> | undefined;
+    getSnapshot(scenePath: string, width?: number, height?: number, camera?: Pick<ICameraOpt, "centerX" | "centerY" | "scale">): Promise<(ImageBitmap | HTMLImageElement | null)[]> | undefined;
     queryTaskBatchData(query: IqueryTask): IWorkerMessage[];
+    insertIconify(viewId: string, iconifyInfo: IconifyInformation & {
+        strokeColor?: string;
+    }): void;
+    insertBackgroundSVG(viewId: string, svgInfo: ISVGUrlInformation): void;
+    insertBackgroundMarkMap(viewId: string, svgInfo: ISVGMarkmapInformation): Promise<MarkmapId | undefined>;
+    updateBackgroundMarkMap(viewId: string, markmapId: string, svgInfo: ISVGMarkmapInformation): Promise<void>;
     insertImage(viewId: string, imageInfo: ImageInformation): void;
     lockImage(viewId: string, uuid: string, locked: boolean): void;
     completeImageUpload(viewId: string, uuid: string, src: string): void;
@@ -216,6 +287,9 @@ 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<Uid>): void;
+    sendClearUids(viewId: string, clearUids?: _SetTrue): void;
+    getVNodeInfo(uuid: string, viewId: string, workIds: string[]): Promise<{
+        uuid: string;
+        vInfo?: BaseNodeMapItem[];
+    } | undefined>;
 }

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

@@ -1,7 +1,7 @@
 import { Group } from "spritejs";
-import { IBatchMainMessage, ICameraOpt, ILayerOptionType, IMainMessage, IOffscreenCanvasOptionType, IWorkerMessage } from "../types";
+import { IBatchMainMessage, ICameraOpt, ILayerOptionType, IMainMessage, IOffscreenCanvasOptionType, IRectType, IWorkerMessage } from "../types";
 import { VNodeManager } from "../vNodeManager";
-import type { MasterControlForWorker } from '../mainEngine';
+import type { MasterControlForWorker } from "../mainEngine";
 import type { AppViewDisplayerManager, MainViewDisplayerManager } from "../../plugin/baseViewContainerManager";
 import { EDataType } from "../enum";
 import { SubTopThread } from "./subTopThread";
@@ -14,7 +14,7 @@ export interface IMainThreadInitOption {
     layerOpt: ILayerOptionType;
     master: MasterControlForWorker;
     displayer: MainViewDisplayerManager | AppViewDisplayerManager;
-    post(sp: Omit<IBatchMainMessage, 'render'>): void;
+    post(sp: Omit<IBatchMainMessage, "render">): void;
 }
 export interface ISubThreadInitOption {
     thread: MainThreadEngineImpl;
@@ -67,11 +67,15 @@ export declare class MainThreadEngineImpl implements MainThreadEngine {
     private imageResolveMap;
     constructor(viewId: string, opt: IMainThreadInitOption);
     getCachedImages(imageSrc: string): ImageBitmap | undefined;
+    getCachedImagesByWorkId(workId: string): ImageBitmap | undefined;
+    deleteCachedImagesByWorkId(workId: string): void;
     clearCacheImages(): void;
     clearImageResolveMap(): void;
-    post(msg: Omit<IBatchMainMessage, 'render'>): void;
+    post(msg: Omit<IBatchMainMessage, "render">): void;
+    updateDpr(dpr: number): void;
     on(msg: IWorkerMessage): Promise<void>;
-    loadImageBitMap(msg: Pick<IWorkerMessage, 'toolsType' | 'opt' | 'workId'>): Promise<ImageBitmap | undefined>;
+    private getIconSize;
+    loadImageBitMap(msg: Pick<IWorkerMessage, "toolsType" | "opt" | "workId">): Promise<ImageBitmap | undefined>;
     private removeNode;
     consumeFull(type: EDataType, data: IWorkerMessage): Promise<void>;
     setCameraOpt(cameraOpt: ICameraOpt): void;
@@ -82,7 +86,7 @@ export declare class MainThreadEngineImpl implements MainThreadEngine {
     private consumeDrawAll;
     private consumeDraw;
     private updateCamera;
-    private getSceneRect;
+    getSceneRect(): IRectType;
     private createScene;
     private createLayer;
     private updateScene;

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

@@ -7,7 +7,7 @@ export interface MainThreadManager {
     mainThreadMap: Map<string, MainThreadEngineImpl>;
     createMainThread(viewId: string, opt: IMainThreadInitOption): MainThreadEngineImpl;
     consume(msg: Set<IWorkerMessage>): Promise<void>;
-    post(sp: Omit<IBatchMainMessage, 'render'>): void;
+    post(sp: Omit<IBatchMainMessage, "render">): void;
     destroy(): void;
 }
 export declare class MainThreadManagerImpl implements MainThreadManager {
@@ -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/mainThread/snapshotThread.d.ts

@@ -5,6 +5,7 @@ import { IActiveToolsDataType, IBatchMainMessage, ICameraOpt, IRectType, IWorker
 import type { BaseShapeTool } from "../tools/base";
 import type { ImageShape } from "../tools/image";
 import { TextShape } from "../tools/text";
+import { ISvgShadowShape } from "../tools/shadowSvg";
 export declare class SnapshotThreadImpl {
     viewId: string;
     fullLayer: Group;
@@ -18,15 +19,18 @@ export declare class SnapshotThreadImpl {
     private imageResolveMap;
     constructor(viewId: string, opt: IMainThreadInitOption);
     getCachedImages(imageSrc: string): ImageBitmap | undefined;
+    getCachedImagesByWorkId(workId: string): ImageBitmap | undefined;
+    deleteCachedImagesByWorkId(workId: string): void;
     clearCacheImages(): void;
     clearImageResolveMap(): void;
-    post(msg: Omit<IBatchMainMessage, 'render'>): void;
+    post(msg: Omit<IBatchMainMessage, "render">): void;
     on(msg: IWorkerMessage): Promise<void>;
-    loadImageBitMap(msg: Pick<IWorkerMessage, 'toolsType' | 'opt' | 'workId'>): Promise<ImageBitmap | undefined>;
+    private getIconSize;
+    loadImageBitMap(msg: Pick<IWorkerMessage, "toolsType" | "opt" | "workId">): Promise<ImageBitmap | undefined>;
     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 | import("../tools/pencilEraserBitMap").BitMapEraserShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
-    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | undefined;
+    }): import("../tools").ArrowShape | import("../tools").PencilShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").StarShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | TextShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools/pencilEraser").PencilEraserShape | import("../tools").BitMapEraserShape | import("../tools").SelectorShape | ImageShape | ISvgShadowShape | undefined;
+    setFullWork(data: Pick<IWorkerMessage, "workId" | "opt" | "toolsType">): BaseShapeTool | undefined;
     runFullWork(data: IWorkerMessage): Promise<IRectType | undefined>;
     private getSnapshot;
     private getSceneRect;

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

@@ -1,11 +1,13 @@
 import { IActiveToolsDataType, IWorkerMessage, IMainMessage, IUpdateSelectorPropsType, IBatchMainMessage } from "../types";
-import type { BaseShapeTool, BaseShapeOptions, SelectorShape, ImageShape, ShapeToolsClass, PencilShape } from "../tools";
+import type { BaseShapeTool, BaseShapeOptions, SelectorShape, ImageShape, ShapeToolsClass } from "../tools";
 import { MainThreadEngineImpl, ISubThreadInitOption } from "./base";
 import { VNodeManager } from "../vNodeManager";
 import { EToolsKey } from "../enum";
 import { SubServiceThread } from "./subServiceThread";
 import { TextShape } from "../tools/text";
-import { BitMapEraserShape } from "../tools/pencilEraserBitMap";
+import type { BitMapEraserShape } from "../tools/pencilEraserBitMap";
+import type { PencilEraserShape } from "../tools/pencilEraser";
+import { ISvgShadowShape } from "../tools/shadowSvg";
 export interface SubLocalThread {
     readonly vNodes: VNodeManager;
     readonly thread: MainThreadEngineImpl;
@@ -29,31 +31,32 @@ export interface SubLocalThread {
     blurSelector(data?: IWorkerMessage): Promise<void>;
     getWorkShape(workId: string): BaseShapeTool | undefined;
     getWorkShapes(): Map<string, BaseShapeTool>;
-    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): ShapeToolsClass | undefined;
+    setFullWork(data: Pick<IWorkerMessage, "workId" | "opt" | "toolsType">): ShapeToolsClass | undefined;
     consumeFull(data: IWorkerMessage): Promise<void>;
     removeWork(data: IWorkerMessage): void;
     removeSelector(data: IWorkerMessage): Promise<void>;
     updateFullSelectWork(data: IWorkerMessage): void;
     cursorHover(msg: IWorkerMessage): void;
+    cursorBlur(): void;
     checkTextActive(data: IWorkerMessage): Promise<void>;
     removeNode(key: string): void;
     updateSelector(params: IUpdateSelectorPropsType & {
         callback?: (props: {
             res?: IMainMessage;
             param: IUpdateSelectorPropsType;
-            postData: Pick<IBatchMainMessage, 'sp' | 'render'>;
+            postData: Pick<IBatchMainMessage, "sp" | "render">;
             workShapeNode: SelectorShape;
             newServiceStore: Map<string, {
                 opt: BaseShapeOptions;
                 toolsType: EToolsKey;
                 ops?: string;
             }>;
+            smoothSync?: boolean;
         }) => void;
     }): Promise<IMainMessage | undefined>;
-    workShapesDone(scenePath: string, serviceWork: SubServiceThread): void;
     createLocalWork(data: IWorkerMessage): void;
 }
-export declare class SubLocalThreadImpl implements SubLocalThread {
+export declare class SubLocalMainThreadImpl implements SubLocalThread {
     readonly vNodes: VNodeManager;
     readonly thread: MainThreadEngineImpl;
     workShapes: Map<string, BaseShapeTool>;
@@ -62,12 +65,15 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     private batchEraserWorks;
     private tmpOpt?;
     private syncUnitTime;
-    private drawCount;
+    private fullWorkerDrawCount;
     private drawWorkActiveId?;
+    private consumeCount;
+    private combineTimerId?;
+    private combineDrawResolve?;
+    private combineDrawActiveId?;
     constructor(opt: ISubThreadInitOption);
-    loadImageBitMap(msg: Pick<IWorkerMessage, 'toolsType' | 'opt' | 'workId'>): Promise<ImageBitmap | undefined>;
+    loadImageBitMap(msg: Pick<IWorkerMessage, "toolsType" | "opt" | "workId">): Promise<ImageBitmap | undefined>;
     createLocalWork(data: IWorkerMessage): void;
-    workShapesDone(scenePath: string, serviceWork: SubServiceThread): void;
     updateSelector(params: IUpdateSelectorPropsType & {
         callback?: ((props: {
             res?: IMainMessage | undefined;
@@ -79,18 +85,19 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
                 toolsType: EToolsKey;
                 ops?: string | undefined;
             }>;
+            smoothSync?: boolean;
         }) => void) | undefined;
     }): Promise<IMainMessage | undefined>;
     destroy(): void;
     clearAll(): void;
     checkTextActive(data: IWorkerMessage): Promise<void>;
     cursorHover(msg: IWorkerMessage): void;
+    cursorBlur(): void;
     updateFullSelectWork(data: IWorkerMessage): void;
-    private commandDeleteText;
     removeSelector(data: IWorkerMessage): Promise<void>;
     removeWork(data: IWorkerMessage): void;
     removeNode(key: string): void;
-    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | undefined;
+    setFullWork(data: Pick<IWorkerMessage, "workId" | "opt" | "toolsType">): BaseShapeTool | undefined;
     consumeFull(data: IWorkerMessage): Promise<void>;
     colloctEffectSelectWork(data: IWorkerMessage): Promise<IWorkerMessage | undefined>;
     private runEffectSelectWork;
@@ -99,20 +106,18 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     reRenderSelector(willSyncService?: boolean): Promise<void> | undefined;
     blurSelector(data?: IWorkerMessage): Promise<void>;
     clearWorkShapeNodeCache(workId: string): void;
-    private drawBitMapEraser;
     private drawBitMapEraserFull;
-    private drawPencilEraser;
+    private drawPencilEraserFull;
     private drawEraser;
-    private updateBatchEraserCombineNode;
-    private batchEraserCombine;
     getWorkShape(workId: string): BaseShapeTool | undefined;
     getWorkShapes(): Map<string, BaseShapeTool>;
     consumeDraw(data: IWorkerMessage, serviceWork: SubServiceThread): void;
+    private drawEraserCombine;
     consumeDrawAll(data: IWorkerMessage, serviceWork: SubServiceThread): void;
     getToolsOpt(): IActiveToolsDataType | undefined;
     setToolsOpt(opt: IActiveToolsDataType): void;
     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 | BitMapEraserShape | import("../tools/pencilEraser").PencilEraserShape | undefined;
+    }): import("../tools").ArrowShape | import("../tools").PencilShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").StarShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | TextShape | import("../tools").LaserPenShape | import("../tools").EraserShape | PencilEraserShape | BitMapEraserShape | SelectorShape | ImageShape | ISvgShadowShape | undefined;
 }

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

@@ -12,7 +12,7 @@ export interface SubServiceThread {
     removeWork(data: IWorkerMessage): void;
     runSelectWork(data: IWorkerMessage): void;
 }
-export declare class SubServiceThreadImpl implements SubServiceThread {
+export declare class SubServiceMainThreadImpl implements SubServiceThread {
     readonly vNodes: VNodeManager;
     readonly thread: MainThreadEngineImpl;
     workShapes: Map<string, IServiceWorkItem>;
@@ -22,7 +22,7 @@ export declare class SubServiceThreadImpl implements SubServiceThread {
     private animationId?;
     private syncUnitTime;
     constructor(opt: ISubThreadInitOption);
-    loadImageBitMap(msg: Pick<IWorkerMessage, 'toolsType' | 'opt' | 'workId'>): Promise<ImageBitmap | undefined>;
+    loadImageBitMap(msg: Pick<IWorkerMessage, "toolsType" | "opt" | "workId">): Promise<ImageBitmap | undefined>;
     destroy(): void;
     clearAll(): void;
     private runEffect;