修复:并集错误

types/ApplicationServices/Application.d.ts

@@ -1,58 +0,0 @@
-import { HardwareCuttingReactor } from '../Add-on/BoardCutting/HardwareCuttingReactor';
-import { DrillingReactor } from '../Add-on/DrawDrilling/DrillingReactor';
-import { CADFiler } from '../DatabaseServices/CADFiler';
-import { Database } from '../DatabaseServices/Database';
-import { AutoSaveServer } from '../Editor/AutoSave';
-import { BoardMoveTool } from '../Editor/BoardMoveTool';
-import { CameraControls } from '../Editor/CameraControls';
-import { Editor } from '../Editor/Editor';
-import { Gesture } from '../Editor/Gesture';
-import { LayoutTool } from '../Editor/LayoutTool';
-import { Viewer } from '../GraphicsSystem/Viewer';
-import { WebRtcRenderer } from '../GraphicsSystem/WebRtcRenderer';
-import { CommandReactor } from '../Reactor/CommandReactor';
-import { SyncDataReactor } from '../Reactor/SyncDataReactor';
-import { WebSocketClientServer } from './WebSocketClientServer';
-export declare let app: ApplicationService;
-export declare enum CameraRoamType {
-    Fly = 0,
-    Walk = 1
-}
-/**
- * webCAD应用.
- */
-export declare class ApplicationService {
-    Database: Database;
-    Viewer: Viewer;
-    WebRtcRenderer: WebRtcRenderer;
-    Editor: Editor;
-    CommandReactor: CommandReactor;
-    _drillingReactor: DrillingReactor;
-    _hardwareCuttingReactor: HardwareCuttingReactor;
-    Saved: boolean;
-    MoveTool: BoardMoveTool;
-    WebSocket: WebSocketClientServer;
-    SyncDataReactor: SyncDataReactor;
-    AutoSaveServer: AutoSaveServer;
-    LayoutTool: LayoutTool;
-    CameraControls: CameraControls;
-    Gesture: Gesture;
-    CameraRoamType: CameraRoamType;
-    CameraFlySpeed: number;
-    private _PerCameraUseSkyBox;
-    constructor();
-    protected InitService(): void;
-    SendCameraPosToRenderer(): void;
-    get PerCameraUseSkyBox(): boolean;
-    set PerCameraUseSkyBox(b: boolean);
-    private UpdateBackground;
-    InitViewDir(): void;
-    CreateDocument(name?: string): void;
-    FileOut(): CADFiler;
-    /**
-     * 文件写出,没有历史记录
-     */
-    FileOut2(): CADFiler;
-    OpenFile(f: CADFiler): void;
-}
-//# sourceMappingURL=Application.d.ts.map

types/ApplicationServices/Application.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/Application.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAWzE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAOlD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,IAAI,GAAG,EAAE,kBAAkB,CAAC;AAEnC,oBAAY,cAAc;IAEtB,GAAG,IAAI;IACP,IAAI,IAAI;CACX;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAE3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,eAAe,CAAC;IAElC,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,KAAK,UAAQ;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,qBAAqB,CAA6D;IAC7F,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IAEvB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IAGjB,cAAc,iBAAsB;IACpC,cAAc,SAAK;IAEnB,OAAO,CAAC,mBAAmB,CAAS;;IAQpC,SAAS,CAAC,WAAW;IAgVrB,uBAAuB;IAqBvB,IAAI,kBAAkB,IACI,OAAO,CAD4B;IAC7D,IAAI,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAOhC;IACD,OAAO,CAAC,gBAAgB,CAQtB;IAEF,WAAW;IAoBX,cAAc,CAAC,IAAI,GAAE,MAAc;IAanC,OAAO,IAAI,QAAQ;IAanB;;OAEG;IACH,QAAQ,IAAI,QAAQ;IAgBpB,QAAQ,CAAC,CAAC,EAAE,QAAQ;CAmBvB"}

types/ApplicationServices/HostApplicationServices.d.ts

@@ -28,6 +28,8 @@ export declare class IHostApplicationServices {
     sealingColorMap: [string, string][];
     showLines: boolean;
     showOpenDirLines: boolean;
+    show2DPathLine: boolean;
+    show2DPathObject: boolean;
     uese: string;
     forceFilterPxl: boolean;
     chaidanOption: {

types/ApplicationServices/HostApplicationServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HostApplicationServices.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/HostApplicationServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBAAa,wBAAwB;IAEjC,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/D,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAChE,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/D,8BAA8B,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAE1E,mBAAmB,UAAQ;IAE3B,eAAe,EAAE,QAAQ,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAQ;IAC9C,cAAc,EAAE,OAAO,CAAQ;IAEnB,kBAAkB,SAAK;IACvB,mBAAmB,SAAK;IAExB,iBAAiB,SAAK;IAElC,kBAAkB,UAAS;IAC3B,WAAW,SAAK;IAEhB,OAAO,CAAC,eAAe,CAAM;IAC7B,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAM;IACpC,IAAI,WAAW,IACM,GAAG,CAD0B;IAClD,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,EAUvB;IAGW,WAAW,EAAE,UAAU,CAAwB;IAI/C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAW;IAItD,mBAAmB,UAAQ;IAI3B,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAM;IAIzC,SAAS,UAAS;IAIlB,gBAAgB,UAAS;IAIzB,IAAI,EAAE,MAAM,CAAC;IAIb,cAAc,EAAE,OAAO,CAAS;IAGhC,aAAa;;;;;;;;;;;;;;MAcvB;IAEU,QAAQ;;;;MAIlB;IAEU,UAAU,EAAE,aAAa,CAInC;IAEU,aAAa,SAAM;IACnB,SAAS,SAAK;IACd,kBAAkB,EAAE,kBAAkB,CAA0B;IAE5E,OAAO;IAEP,OAAO,CAAC,MAAM,CAAC,eAAe,CAA2B;IACzD,MAAM,CAAC,WAAW,IAAI,wBAAwB;IAQxC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAClC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;CACzC;AAED,eAAO,IAAI,uBAAuB,0BAAyC,CAAC"}
+{"version":3,"file":"HostApplicationServices.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/HostApplicationServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBAAa,wBAAwB;IAEjC,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/D,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAChE,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/D,8BAA8B,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAE1E,mBAAmB,UAAQ;IAE3B,eAAe,EAAE,QAAQ,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAQ;IAC9C,cAAc,EAAE,OAAO,CAAQ;IAEnB,kBAAkB,SAAK;IACvB,mBAAmB,SAAK;IAExB,iBAAiB,SAAK;IAElC,kBAAkB,UAAS;IAC3B,WAAW,SAAK;IAEhB,OAAO,CAAC,eAAe,CAAM;IAC7B,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAM;IACpC,IAAI,WAAW,IACM,GAAG,CAD0B;IAClD,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,EAUvB;IAGW,WAAW,EAAE,UAAU,CAAwB;IAI/C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAW;IAItD,mBAAmB,UAAQ;IAI3B,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAM;IAIzC,SAAS,UAAS;IAIlB,gBAAgB,UAAS;IAIzB,cAAc,UAAS;IAIvB,gBAAgB,UAAS;IAIzB,IAAI,EAAE,MAAM,CAAC;IAIb,cAAc,EAAE,OAAO,CAAS;IAGhC,aAAa;;;;;;;;;;;;;;MAcvB;IAEU,QAAQ;;;;MAIlB;IAEU,UAAU,EAAE,aAAa,CAInC;IAEU,aAAa,SAAM;IACnB,SAAS,SAAK;IACd,kBAAkB,EAAE,kBAAkB,CAA0B;IAE5E,OAAO;IAEP,OAAO,CAAC,MAAM,CAAC,eAAe,CAA2B;IACzD,MAAM,CAAC,WAAW,IAAI,wBAAwB;IAQxC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAClC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;CACzC;AAED,eAAO,IAAI,uBAAuB,0BAAyC,CAAC"}

types/ApplicationServices/WebSocketClientServer.d.ts

@@ -1,24 +0,0 @@
-/**
- * WebSocket 客户端. 每隔一分钟尝试连接到CAD的服务
- */
-export declare class WebSocketClientServer {
-    url: string;
-    private ws;
-    private _Closeing;
-    mode: "obj" | "" | undefined;
-    constructor(url?: string);
-    _ConnectionPromise: Promise<boolean>;
-    private _ReTryTime;
-    private _CloseTime;
-    Connect(retry?: boolean, timeOut?: number): Promise<boolean> | true;
-    Send(msg: string): Promise<void>;
-    /**
-     * 接收到消息. AOP可接入此函数
-     * @param {MessageEvent} event
-     */
-    OnMessageEvent(event: MessageEvent): void;
-    get IsLink(): boolean;
-    OnLinkEvent(isLink: boolean): void;
-    Close(): Promise<void>;
-}
-//# sourceMappingURL=WebSocketClientServer.d.ts.map

types/ApplicationServices/WebSocketClientServer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WebSocketClientServer.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/WebSocketClientServer.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,qBAAa,qBAAqB;IAOX,GAAG;IALtB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,SAAS,CAAS;IAE1B,IAAI,EAAE,KAAK,GAAG,EAAE,GAAG,SAAS,CAAC;gBAEV,GAAG,SAAK;IAI3B,kBAAkB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAErC,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,KAAK,UAAO,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI;IAgDxD,IAAI,CAAC,GAAG,EAAE,MAAM;IAOtB;;;OAGG;IACH,cAAc,CAAC,KAAK,EAAE,YAAY;IAMlC,IAAI,MAAM,YAAwC;IAElD,WAAW,CAAC,MAAM,EAAE,OAAO;IAIrB,KAAK;CAed"}