@netless/appliance-plugin 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/appliance-plugin.js

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

package/dist/appliance-plugin.mjs

@@ -1,4 +1,4 @@
-import { M as s, F as p, I as t, H as l, G as n, J as r, N as y, O as E, j as i, h as T, E as o, l as S, f as g, R as v, z as c, Q as u, k, L as m, K as A, C, D as M } from "./index-BLC7eY_o.mjs";
+import { Q as s, I as p, L as t, K as l, J as n, M as r, R as y, T as E, j as i, h as T, E as o, l as S, f as g, W as v, C as c, U as u, k, O as m, N as A, G as C, H as M } from "./index-CTYUQm0L.mjs";
 export {
   s as ActiveContainerType,
   p as ApplianceMultiPlugin,

package/dist/component/textEditor/manager.d.ts

@@ -19,7 +19,7 @@ export interface TextEditorManager {
     /** 激活文本编辑组件 */
     active(workId: string): void;
     /** 不激活文本编辑组件 */
-    unActive(): void;
+    unActive(blurId: string): void;
     /** 创建文本来源于main */
     createTextForMasterController(params: TextEditorInfo & {
         workId: string;
@@ -86,7 +86,7 @@ export declare class TextEditorManagerImpl implements TextEditorManager {
     onServiceDerive(data: IWorkerMessage): void;
     updateForViewEdited(activeId: string, info: TextEditorInfo): void;
     active(workId: string): void;
-    unActive(): void;
+    unActive(blurId: string): void;
     createTextForMasterController(params: TextEditorInfo & {
         workId: string;
         viewId: string;
@@ -114,5 +114,4 @@ export declare class TextEditorManagerImpl implements TextEditorManager {
     deleteBatch(workIds: string[], canSync?: boolean | undefined, canWorker?: boolean | undefined): void;
     clear(viewId: string, justLocal?: boolean): void;
     destory(): void;
-    private getMaxZIndex;
 }

package/dist/core/enum.d.ts

@@ -48,9 +48,8 @@ export declare enum EvevtWorkState {
     Doing = 2,
     Done = 3,
     /** 冻结,不能本地输入事件,camera、clear等任务还是可以执行 */
-    Freeze = 4,
     /** 只读状态 */
-    Unwritable = 5
+    Unwritable = 4
 }
 /**
  * 消息变化顺序: init => Scene事件 => work事件 => node事件

package/dist/core/mainEngine.d.ts

@@ -14,7 +14,11 @@ export declare abstract class MasterController {
     readonly abstract internalMsgEmitter: EventEmitter2;
     /** worker线程管理器 */
     /** 本地原始点数据批任务数据池 */
-    protected abstract localPointsBatchData: number[];
+    protected abstract localPointsBatchData: Map<IworkId, {
+        state: EvevtWorkState;
+        points: number[];
+        isFullWork: boolean;
+    }>;
     /** 事件任务处理批量池 */
     abstract taskBatchData: Set<IWorkerMessage>;
     /** 主线程和工作线程通信机 */
@@ -73,6 +77,8 @@ export declare abstract class MasterController {
     abstract lockImage(uuid: string, locked: boolean): void;
     abstract completeImageUpload(uuid: string, src: string): void;
     abstract getImagesInformation(scenePath: string): ImageInformation[];
+    /** 移除正在绘制的流程 */
+    abstract removeDrawingWork(viewId: string): void;
 }
 export declare class MasterControlForWorker extends MasterController {
     isActive: boolean;
@@ -91,10 +97,13 @@ export declare class MasterControlForWorker extends MasterController {
     private subWorkerDrawCount;
     private wokerDrawCount;
     private maxDrawCount;
-    private cacheDrawCount;
     private reRenders;
     private localWorkViewId?;
-    protected localPointsBatchData: number[];
+    protected localPointsBatchData: Map<IworkId, {
+        state: EvevtWorkState;
+        points: number[];
+        isFullWork: boolean;
+    }>;
     /** end */
     /** 是否任务队列化参数 */
     private tasksqueue;
@@ -106,7 +115,6 @@ export declare class MasterControlForWorker extends MasterController {
     private snapshotMap;
     private boundingRectMap;
     private clearAllResolve?;
-    private delayWorkStateToDone?;
     private delayWorkStateToDoneResolve?;
     private animationId;
     private tmpImageConfigMap;
@@ -129,13 +137,20 @@ export declare class MasterControlForWorker extends MasterController {
     private onLocalEventEnd;
     private onLocalEventDoing;
     private onLocalEventStart;
-    private pushPoint;
+    private setLocalPointIsFullWork;
+    private pushLocalPoint;
+    private deleteLocalPoint;
+    private getLocalPointInfo;
+    getLocalPointsInfo(): Map<IworkId, {
+        state: EvevtWorkState;
+        points: number[];
+        isFullWork: boolean;
+    }>;
     private correctStorage;
     originalEventLintener(workState: EvevtWorkState, point: [number, number], viewId: string): Promise<void>;
     getLocalWorkViewId(): string | undefined;
     setLocalWorkViewId(viewId?: string): void;
     setCurrentToolsData(currentToolsData: IActiveToolsDataType): void;
-    setCurrentLocalWorkData(currentLocalWorkData: IActiveWorkDataType): void;
     prepareOnceWork(currentLocalWorkData: Required<Pick<IActiveWorkDataType, 'toolsOpt' | 'viewId' | 'workId'>>, toolsType: EToolsKey): void;
     createViewWorker(viewId: string, options: ViewWorkerOptions): void;
     destroyViewWorker(viewId: string, isLocal?: boolean): void;
@@ -154,7 +169,7 @@ export declare class MasterControlForWorker extends MasterController {
     clearViewScenePath(viewId: string, justLocal?: boolean | undefined): Promise<void>;
     private internalMsgEmitterListener;
     private setZIndex;
-    clearLocalPointsBatchData(): void;
+    removeDrawingWork(viewId: string): void;
     hoverCursor(point: [number, number], viewId: string): void;
     sendCursorEvent(p: [number | undefined, number | undefined], viewId: string): void;
     getBoundingRect(scenePath: string): Promise<IRectType> | undefined;

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

@@ -4,6 +4,7 @@ import { MasterControlForWorker } from "../mainEngine";
 import { IActiveToolsDataType, IBatchMainMessage, ICameraOpt, IRectType, IWorkerMessage, IworkId } from "../types";
 import type { BaseShapeTool } from "../tools/base";
 import type { ImageShape } from "../tools/image";
+import { TextShape } from "../tools/text";
 export declare class SnapshotThreadImpl {
     viewId: string;
     fullLayer: Group;
@@ -18,12 +19,10 @@ export declare class SnapshotThreadImpl {
     on(msg: IWorkerMessage): Promise<void>;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId?: IworkId;
-    }): 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 | import("../tools/text").TextShape | import("../tools").LaserPenShape | import("../tools").EraserShape | import("../tools").SelectorShape | ImageShape | undefined;
-    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | import("../tools/text").TextShape | import("../tools").LaserPenShape | undefined;
-    runFullWork(data: IWorkerMessage, isDrawLabel?: boolean): Promise<IRectType | 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").SelectorShape | ImageShape | undefined;
+    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | import("../tools/straight").StraightShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools").LaserPenShape | undefined;
+    runFullWork(data: IWorkerMessage): Promise<IRectType | undefined>;
     private getSnapshot;
-    private updateLabels;
-    private willRenderSpecialLabel;
     private getSceneRect;
     private getRectImageBitmap;
     private getSnapshotRender;

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

@@ -5,6 +5,7 @@ import { VNodeManager } from "./vNodeManager";
 import { EToolsKey } from "../enum";
 import { Scene } from "spritejs";
 import { SubServiceThread } from "./subServiceThread";
+import { TextShape } from "../tools/text";
 export interface SubLocalThread {
     readonly vNodes: VNodeManager;
     readonly thread: MainThreadEngineImpl;
@@ -78,7 +79,7 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     updateFullSelectWork(data: IWorkerMessage): void;
     removeWork(data: IWorkerMessage): void;
     removeNode(key: string): void;
-    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | import("../tools/text").TextShape | import("../tools").LaserPenShape | undefined;
+    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | import("../tools/straight").StraightShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools").LaserPenShape | undefined;
     consumeFull(data: IWorkerMessage, scene?: Scene): Promise<void>;
     colloctEffectSelectWork(data: IWorkerMessage): Promise<IWorkerMessage | undefined>;
     private runEffectSelectWork;
@@ -97,5 +98,5 @@ export declare class SubLocalThreadImpl implements SubLocalThread {
     setWorkOptions(workId: IworkId, opt: BaseShapeOptions): void;
     createWorkShapeNode(opt: IActiveToolsDataType & {
         workId?: IworkId;
-    }): import("../tools").ArrowShape | PencilShape | import("../tools/straight").StraightShape | import("../tools").EllipseShape | import("../tools").PolygonShape | import("../tools").StarShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools/text").TextShape | import("../tools").LaserPenShape | import("../tools").EraserShape | SelectorShape | ImageShape | undefined;
+    }): 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 | SelectorShape | ImageShape | undefined;
 }

package/dist/core/msgEvent/scaleNode/forMain.d.ts

@@ -9,6 +9,8 @@ export type ScaleNodeEmtData = {
     box: IRectType;
     viewId: string;
     dir?: Direction;
+    reverseY?: boolean;
+    reverseX?: boolean;
 };
 export declare class ScaleNodeMethod extends BaseMsgMethod {
     readonly emitEventType: EmitEventType;

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

@@ -21,7 +21,6 @@ export declare class ArrowShape extends BaseShapeTool {
     consume(props: {
         data: IWorkerMessage;
         isFullWork?: boolean;
-        isClearAll?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
     }): IMainMessage;

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

@@ -44,8 +44,8 @@ export declare abstract class BaseShapeTool {
     abstract consume(props: {
         data: IWorkerMessage;
         isFullWork?: boolean;
-        isClearAll?: boolean;
         isSubWorker?: boolean;
+        drawCount?: number;
         isMainThread?: boolean;
     }): IMainMessage;
     /** 消费本地完整数据，返回绘制结果 */
@@ -57,7 +57,6 @@ export declare abstract class BaseShapeTool {
         op: number[];
         isFullWork: boolean;
         replaceId?: string;
-        isClearAll?: boolean;
     }): IRectType | undefined;
     /** 清除临时数据 */
     abstract clearTmpPoints(): void;
@@ -70,6 +69,7 @@ export declare abstract class BaseShapeTool {
     setWorkOptions(workOptions: BaseShapeOptions): void;
     /** 更新服务端同步配置,返回绘制结果 */
     updataOptService(opt?: IUpdateNodeOpt): IRectType | undefined;
+    replace(layer: Group, replaceId: string, newNode: ShapeNodes): void;
     static updateNodeOpt(param: {
         node: ShapeNodes;
         opt: IUpdateNodeOpt;

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

@@ -21,7 +21,6 @@ export declare class EllipseShape extends BaseShapeTool {
     consume(props: {
         data: IWorkerMessage;
         isFullWork?: boolean;
-        isClearAll?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
     }): IMainMessage;

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

@@ -44,6 +44,7 @@ export declare class ImageShape extends BaseShapeTool {
         isMainThread?: boolean;
     }): Promise<IRectType | undefined>;
     clearTmpPoints(): void;
+    static getScaleType(opt: ImageOptions): EScaleType.all | EScaleType.proportional;
     static updateNodeOpt(param: {
         node: ShapeNodes;
         opt: IUpdateNodeOpt;

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

@@ -29,9 +29,10 @@ export declare class PencilShape extends BaseShapeTool {
     consume(props: {
         data: IWorkerMessage;
         isFullWork?: boolean;
-        isClearAll?: boolean;
         isSubWorker?: boolean;
+        drawCount?: number;
         isMainThread?: boolean;
+        replaceId?: string;
     }): IMainMessage;
     consumeAll(props: {
         data?: IWorkerMessage;
@@ -41,7 +42,6 @@ export declare class PencilShape extends BaseShapeTool {
         op: number[];
         isFullWork?: boolean;
         replaceId?: string;
-        isClearAll?: boolean;
     }): IRectType | undefined;
     private transformDataAll;
     private draw;

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

@@ -24,7 +24,6 @@ export declare class StarShape extends BaseShapeTool {
     consume(props: {
         data: IWorkerMessage;
         isFullWork?: boolean;
-        isClearAll?: boolean;
         isSubWorker?: boolean;
         isMainThread?: boolean;
     }): IMainMessage;

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

@@ -16,13 +16,16 @@ export declare class TextShape extends BaseShapeTool {
     constructor(props: BaseShapeToolProps);
     consume(): IMainMessage;
     consumeAll(): IMainMessage;
+    consumeService(): IRectType | undefined;
     private draw;
-    consumeService(props: {
+    consumeServiceAsync(props: {
         isFullWork: boolean;
         replaceId?: string;
-        isDrawLabel?: boolean;
-    }): IRectType | undefined;
-    updataOptService(updateNodeOpt: IUpdateNodeOpt): IRectType | undefined;
+        isDrawLabel?: true;
+    }): Promise<IRectType | undefined>;
+    updateLabelsWidth(node: Group): void;
+    updataOptService(): IRectType | undefined;
+    updataOptServiceAsync(updateNodeOpt: IUpdateNodeOpt): Promise<IRectType | undefined>;
     clearTmpPoints(): void;
     static getFontWidth(param: {
         text: string;

package/dist/core/types.d.ts

@@ -196,6 +196,7 @@ export interface IMainMessageRenderData {
         y: number;
     };
     translate?: [number, number];
+    workId?: string;
 }
 export interface IBatchMainMessage {
     /** 绘制数据 */
@@ -204,6 +205,7 @@ export interface IBatchMainMessage {
     sp?: Array<IMainMessage>;
     drawCount?: number;
     workerTasksqueueCount?: number;
+    workIds?: Set<string>;
 }
 export interface ICameraOpt {
     centerX: number;
@@ -281,6 +283,7 @@ export type BaseNodeMapItem = {
     scaleType: EScaleType;
     /** 是否被框选中,框选中的元素不能被其它人操作 */
     isSelected: boolean;
+    isHid?: boolean;
 };
 export type Size = {
     /**

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

@@ -37,6 +37,7 @@ export declare function getRectTranslated(rect: IRectType, translate: [number, n
     w: number;
     h: number;
 };
+export declare function getRectRotatedPoints(rect: IRectType, angle: number): Vec2d[];
 export declare function getRectRotated(rect: IRectType, angle: number): {
     x: number;
     y: number;
@@ -49,6 +50,8 @@ export declare function getRectScaleed(rect: IRectType, scale: [number, number])
     w: number;
     h: number;
 };
+export declare function getScalePoints(points: Vec2d[], originPos: Vec2d, scale: [number, number]): Vec2d[];
+export declare function getRotatePoints(points: Vec2d[], originPos: Vec2d, angle: number): Vec2d[];
 export declare function rotatePoints(points: number[], originPos: [number, number], angle: number): void;
 export declare function scalePoints(points: number[], originPos: [number, number], scale: [number, number]): void;
 export declare function getNodeRect(key: string, layer?: Group, safeBorderPadding?: number): IRectType | undefined;

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

@@ -1,4 +1,4 @@
 import { Group, Node, Path } from "spritejs";
-import { EToolsKey } from "../enum";
+import { BaseNodeMapItem } from "../types";
 export declare const isSealedGroup: (group: Group | Path | Node) => boolean;
-export declare const isRenderNode: (toolsType: EToolsKey) => boolean;
+export declare const isRenderNode: (param: Pick<BaseNodeMapItem, 'isHid'>) => boolean;

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

@@ -82,5 +82,5 @@ export declare abstract class LocalWork {
     setToolsOpt(opt: IActiveToolsDataType): void;
     clearWorkShapeNodeCache(workId: IworkId): void;
     clearAllWorkShapesCache(): void;
-    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | import("../tools/text").TextShape | import("../tools").LaserPenShape | undefined;
+    setFullWork(data: Pick<IWorkerMessage, 'workId' | 'opt' | 'toolsType'>): BaseShapeTool | import("../tools/straight").StraightShape | import("../tools").PolygonShape | import("../tools").RectangleShape | import("../tools").SpeechBalloonShape | import("../tools").LaserPenShape | undefined;
 }

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

@@ -5,7 +5,7 @@ import { LocalWork, ISubWorkerInitOption } from "./base";
 export declare class LocalWorkForSubWorker extends LocalWork {
     protected combineDrawTimer?: number;
     constructor(opt: ISubWorkerInitOption);
-    runFullWork(data: IWorkerMessage, isDrawLabel?: boolean): Promise<IRectType | undefined>;
+    runFullWork(data: IWorkerMessage): Promise<IRectType | undefined>;
     runSelectWork(data: IWorkerMessage): undefined;
     consumeDraw(data: IWorkerMessage): IMainMessage | undefined;
     consumeDrawAll(data: IWorkerMessage): undefined;

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

@@ -66,7 +66,6 @@ export declare class WorkThreadEngineForSubWorker extends WorkThreadEngineBase {
     private updateCamera;
     setCameraOpt(cameraOpt: ICameraOpt, layer?: Group): void;
     private getSnapshot;
-    private willRenderSpecialLabel;
     private getSnapshotRender;
     private getBoundingRect;
 }