@netless/appliance-plugin 1.1.17-beta.7 → 1.1.17-beta.9

package/dist/appliance-plugin.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index-l0t4gpnL.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.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-DDtbIS6S.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,29 +1,30 @@
-import { F as s, A as p, y as r, x as t, w as l, Q as i, G as n, b as y, k as E, m as T, N as o, c as g, O as u, K as v, z as c, a as A, J as S, j as k, H as m, E as P, L as M, I as W, P as w, B as x, u as I, v as b } from "./index-C2u2Hwgc.mjs";
+import { B as s, A as p, x as r, w as t, v as l, Q as n, G as i, b as y, F as E, j as o, l as T, N as g, c as u, O as v, K as c, y as S, a as A, J as P, h as k, H as m, E as M, L as W, I as h, P as w, z as x, s as F, u as I } from "./index-CZ7SSEYU.mjs";
 export {
   s as ActiveContainerType,
   p as ApplianceMultiPlugin,
   r as ApplianceNames,
   t as ApplianceSigleWrapper,
   l as ApplianceSinglePlugin,
-  i as AutoDrawPlugin,
-  n as ECanvasShowType,
+  n as AutoDrawPlugin,
+  i as ECanvasShowType,
   y as EDataType,
-  E as EImageType,
+  E as EForceStopReason,
+  o as EImageType,
   T as EMatrixrRelationType,
-  o as EOperationType,
-  g as EPostMessageType,
-  u as ERenderFilterType,
-  v as EScaleType,
-  c as EStrokeType,
+  g as EOperationType,
+  u as EPostMessageType,
+  v as ERenderFilterType,
+  c as EScaleType,
+  S as EStrokeType,
   A as EToolsKey,
-  S as ElayerType,
+  P as ElayerType,
   k as EmitEventType,
   m as EventMessageType,
-  P as EvevtWorkState,
-  M as EvevtWorkType,
-  W as InternalMsgEmitterType,
+  M as EvevtWorkState,
+  W as EvevtWorkType,
+  h as InternalMsgEmitterType,
   w as Plugin,
   x as ShapeType,
-  I as fullWorkerUrl,
-  b as subWorkerUrl
+  F as fullWorkerUrl,
+  I as subWorkerUrl
 };

package/dist/core/mainEngine.d.ts

@@ -13,6 +13,7 @@ export declare abstract class MasterController {
     /** 插件管理器 */
     readonly abstract control: BaseApplianceManager;
     readonly abstract internalMsgEmitter: EventEmitter2;
+    readonly abstract publicMsgEmitter: EventEmitter2;
     /** worker线程管理器 */
     /** 本地原始点数据批任务数据池 */
     protected abstract localPointsBatchData: Map<IworkId, {
@@ -96,6 +97,7 @@ export declare class MasterControlForWorker extends MasterController {
     protected currentLocalWorkData: IActiveWorkDataType;
     control: BaseApplianceManager;
     internalMsgEmitter: EventEmitter2;
+    publicMsgEmitter: EventEmitter2;
     taskBatchData: Set<IWorkerMessage>;
     protected fullWorker: Worker;
     protected subWorker: Worker;
@@ -138,6 +140,7 @@ export declare class MasterControlForWorker extends MasterController {
     private isLockSentEventCursor;
     private subMainThreadWorker?;
     private getVNodeInfoResolveMap;
+    private isLocalWorkActive;
     constructor(props: BaseSubWorkModuleProps);
     destroy(): void;
     private get consumeCount();
@@ -167,6 +170,7 @@ export declare class MasterControlForWorker extends MasterController {
     getMaxDrawCount(): number;
     setSubWorkerDrawCount(num: number): void;
     setConsumeCount(num: number): void;
+    getConsumeCount(): number;
     setWorkerTasksqueueCount(num: number): void;
     collectorSyncData(sp: IMainMessage[]): void;
     private collectorAsyncData;

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

@@ -1,5 +1,5 @@
 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";
@@ -101,10 +101,8 @@ export declare class SubLocalMainThreadImpl implements SubLocalThread {
     blurSelector(data?: IWorkerMessage): Promise<void>;
     clearWorkShapeNodeCache(workId: string): void;
     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;
@@ -114,5 +112,5 @@ export declare class SubLocalMainThreadImpl implements SubLocalThread {
     setWorkOptions(workId: string, opt: BaseShapeOptions): void;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId: string;
-    }): import("../tools").ArrowShape | 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 | BitMapEraserShape | SelectorShape | ImageShape | 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 | BitMapEraserShape | SelectorShape | ImageShape | undefined;
 }

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

@@ -77,6 +77,11 @@ export declare class PencilShape extends BaseShapeTool {
         replaceId?: string;
         workState?: EvevtWorkState;
     }): IRectType | undefined;
+    computPencilPoints(params: {
+        op: number[];
+        eraserPolylines: number[][];
+        eraserThickness: number;
+    }): number[][] | undefined;
     private transformDataAll;
     private draw;
     private computDrawPoints;

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

@@ -1,74 +1,99 @@
 import { BaseShapeOptions, BaseShapeTool, BaseShapeToolProps } from "./base";
-import { EPostMessageType, EScaleType, EToolsKey } from "../enum";
-import { IWorkerMessage, IRectType, IworkId } from "../types";
-import type { ServiceThreadSubWork } from "./utils";
+import { EDataType, EPostMessageType, EScaleType, EToolsKey } from "../enum";
+import { IWorkerMessage, IRectType, BaseNodeMapItem } from "../types";
+import type { IMainMessage } from "../types";
+import { Point2d } from "../utils/primitives/Point2d";
+import type { LocalWorkForFullWorker } from "../worker/fullWorkerLocal";
+import type { SubLocalMainThreadImpl } from "../mainThread/subLocalThread";
+export type SerializerEraserLines = Array<SerializerEraserItem>;
+export interface SerializerEraserItem {
+    op: number[][];
+    thickness: number;
+}
 export interface PencilEraserOptions extends BaseShapeOptions {
     thickness: number;
+    eraserColor: string;
 }
 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 tmpPoints: Array<Point2d>;
     protected workOptions: PencilEraserOptions;
     worldPosition: [number, number];
     worldScaling: [number, number];
     eraserRect: IRectType | undefined;
     eraserPolyline?: [number, number, number, number];
-    constructor(props: BaseShapeToolProps, serviceWork?: ServiceThreadSubWork);
-    consumeService(): IRectType | undefined;
-    private createEraserRect;
-    private computRectCenterPoints;
-    private isNear;
-    private cutPolyline;
-    private isSamePoint;
-    private translateIntersect;
-    private isLineEraser;
-    private remove;
+    syncUnitTime: number;
+    private syncIndex;
+    private syncTimestamp;
+    constructor(props: BaseShapeToolProps);
+    /** 批量合并消费本地数据,返回绘制结果 */
+    combineConsume(): IMainMessage | undefined;
+    consumeService(params: {
+        op: number[];
+        isFullWork?: boolean;
+        replaceId?: string;
+    }): IRectType | undefined;
+    private updateTempPoints;
+    private getChangeNodes;
     consume(props: {
         data: IWorkerMessage;
+        isFullWork: boolean;
+        isSubWorker?: boolean;
+        isMainThread?: boolean;
+        drawCount?: number;
+        removeDrawCount?: number;
     }): {
         workId: string;
         toolsType: EToolsKey;
         opt: import("./utils").ShapeOptions;
         type: EPostMessageType;
         rect?: undefined;
-        removeIds?: undefined;
-        newWorkDatas?: undefined;
+        dataType?: undefined;
     } | {
+        rect: IRectType | undefined;
         type: EPostMessageType;
-        rect: IRectType;
-        removeIds: string[];
-        newWorkDatas: Map<string, {
-            op: number[];
-            opt: BaseShapeOptions;
-            workId: IworkId;
-            toolsType: EToolsKey;
-        }>;
+        dataType: EDataType;
+    } | {
+        type: EPostMessageType;
+        dataType: EDataType;
+        rect: IRectType | undefined;
+        op: number[] | undefined;
+        index: number | undefined;
+        updateNodeOpt: {
+            useAnimation: boolean;
+        };
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
     };
+    private draw;
+    private computEraserPointLines;
     consumeAll(props: {
-        data: IWorkerMessage;
+        workerEngine?: LocalWorkForFullWorker | SubLocalMainThreadImpl;
     }): {
         workId: string;
         toolsType: EToolsKey;
         opt: import("./utils").ShapeOptions;
         type: EPostMessageType;
-        rect?: undefined;
-        removeIds?: undefined;
-        newWorkDatas?: undefined;
+    } | {
+        rect: IRectType | undefined;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
+        type: EPostMessageType;
     } | {
         type: EPostMessageType;
-        rect: IRectType;
-        removeIds: string[];
-        newWorkDatas: Map<string, {
-            op: number[];
-            opt: BaseShapeOptions;
-            workId: IworkId;
-            toolsType: EToolsKey;
-        }>;
+        dataType: EDataType;
+        rect: IRectType | undefined;
+        ops: string;
+        willNewNodes: Map<string, BaseNodeMapItem>;
+        willDeleteNodes: Set<string>;
+        workId: string;
+        toolsType: EToolsKey;
+        opt: import("./utils").ShapeOptions;
     };
     clearTmpPoints(): void;
-    private getCanEraserNodeMap;
 }

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

@@ -0,0 +1,8 @@
+import { Point2d } from './primitives/Point2d';
+/**
+ * 折线减去多个多边形，返回差集片段（去除冗余点、近似闭环、孤点）
+ * @param polyline 原始折线
+ * @param polygons 多个多边形数组
+ * @param epsilon 精度阈值
+ */
+export declare function polylineMinusPolygon(polyline: Point2d[], polygons: [number, number][][], epsilon?: number): [number, number, number][][];

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

@@ -0,0 +1,8 @@
+/**
+ * 计算两条线段的交点
+ */
+export declare function getIntersection(p1: [number, number], p2: [number, number], p3: [number, number], p4: [number, number]): [number, number] | null;
+/**
+ * 判断点是否在多边形内
+ */
+export declare function isPointInPolygon(point: [number, number], polygon: [number, number][]): boolean;

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

@@ -52,13 +52,13 @@ export declare class LocalWorkForFullWorker extends LocalWork {
     private drawBitMapCombine;
     private drawPencilCombine;
     private drawSelector;
+    private drawPencilEraserCombine;
     private drawPencilEraser;
+    private drawPencilEraserFull;
     private drawEraser;
-    private batchEraserCombine;
     private drawShape;
     private drawPencil;
     private drawPencilFull;
-    private updateBatchEraserCombineNode;
     private runEffectSelectWork;
     cursorHover(msg: IWorkerMessage): Promise<void>;
     cursorBlur(): Promise<void>;

package/dist/displayer/floatBtns/index.d.ts

@@ -8,4 +8,6 @@ export declare const FloatBtns: React.MemoExoticComponent<(props: {
     textOpt?: TextOptions;
     workIds?: string[];
     noLayer?: boolean;
+    noDelete?: boolean;
+    noCopy?: boolean;
 }) => React.JSX.Element>;