build-dxf 0.0.19 → 0.0.20-10

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/Default.d.ts

@@ -4,7 +4,9 @@ import { Renderer } from '../../../RenderPlugin/components';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
 import { LineUserData } from '../RenderManager';
 import * as THREE from "three";
-export declare class Default extends Component<{}> {
+export declare class Default extends Component<{
+    selectLineChange: {};
+}> {
     static name: string;
     get editor(): Editor;
     renderer?: Renderer;
@@ -21,25 +23,9 @@ export declare class Default extends Component<{}> {
      */
     removeSelectLine(lineSegment: LineSegment): void;
     /**
-     * 删除选择的线段
+     * 移除所有选中线段
      */
-    deleteSelectLine(): void;
-    /**
-     * 删除选择线段上的窗户
-     */
-    deleteSelectWindow(): void;
-    /**
-     * 如果只选择两个线段，可为两个未链接的点创建连接
-     */
-    connection(): void;
-    /**
-     * 如果只选择两个线段，可为两个未链接的点创建连接, 通过计算交点，线段延长到交点
-     */
-    intersectionConnection(): void;
-    /**
-     * 如果只选择两个线段, 且两个线段在一条路径上，合并线段
-     */
-    mergeLine(): void;
+    removeSelectLineAll(): void;
     private _timer;
     /**
      * 更新选择的线段

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DeleteSelectLine.d.ts

@@ -0,0 +1,28 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 删除选择的线段
+ */
+export declare class DeleteSelectLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private delete;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DeleteSelectWindow.d.ts

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 删除选择的线段上的窗户线
+ */
+export declare class DeleteSelectWindow extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private end;
+    /**
+     * 完成
+     * @param list
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DrawDoorLine.d.ts

@@ -1,5 +1,6 @@
 import { ComponentManager } from '../../../../../ComponentManager';
-import { Point } from '../../../../../Quadtree/Point';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { LineUserData } from '../RenderManager';
 import { CommandFlowComponent } from './CommandFlowComponent';
 import * as THREE from "three";
 export declare class DrawDoorLine extends CommandFlowComponent<{}> {
@@ -12,8 +13,23 @@ export declare class DrawDoorLine extends CommandFlowComponent<{}> {
     /** 选择点
      * @param next
      */
-    selectPoint(next: any): void;
+    private selectPoint;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(points: Point[]): void;
+    completed(lines: LineSegment<LineUserData>[]): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DrawLine.d.ts

@@ -1,7 +1,11 @@
-import { Point } from '../../../../../Quadtree/Point';
 import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class DrawLine extends CommandFlowComponent<{}> {
+export declare class DrawLine extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
@@ -9,12 +13,25 @@ export declare class DrawLine extends CommandFlowComponent<{}> {
     shortcutKeys: string[];
     confirmKeys: string[];
     commandName: string;
-    onAddFromParent(): void;
+    onAddFromParent(parent: ComponentManager): void;
     /** 选择点
      * @param next
      */
-    selectPoint(next: any): void;
+    private selectPoint;
+    /** 结束， 汇总结果
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(points: Point[]): void;
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/DrawWindow.d.ts

@@ -1,5 +1,7 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { LineUserData } from '../RenderManager';
+import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
 export declare class DrawWindow extends CommandFlowComponent<{}> {
     static name: string;
@@ -7,7 +9,7 @@ export declare class DrawWindow extends CommandFlowComponent<{}> {
     interruptKeys: string[];
     shortcutKeys: string[];
     commandName: string;
-    onAddFromParent(): void;
+    onAddFromParent(parent: ComponentManager): void;
     /** 选择开始点
      * @param next
      */
@@ -19,7 +21,25 @@ export declare class DrawWindow extends CommandFlowComponent<{}> {
         point: THREE.Vector3;
         line: LineSegment;
     }): void;
+    /**
+     * 结束处理
+     * @param next
+     * @param points
+     */
+    private end;
     /** 执行完成
      */
-    completed(data: any): void;
+    completed({ doorDataItem, line }: {
+        doorDataItem: any;
+        line: LineSegment<LineUserData>;
+    }): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param data
+     * @returns
+     */
+    private revokeRollback;
 }

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/IntersectionConnectionLine.d.ts

@@ -0,0 +1,33 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 连接选择的线段
+ */
+export declare class IntersectionConnectionLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private connection;
+    /** 执行完成
+     * @param next
+     * @param selectLines
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/MergeLine.d.ts

@@ -0,0 +1,32 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+/**
+ * 合并同向线段
+ */
+export declare class MergeLine extends CommandFlowComponent<{}> {
+    static name: string;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    private constraint;
+    /** 开始
+     * @param next
+     */
+    private mergeLine;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/PointDrag.d.ts

@@ -1,13 +1,18 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { ComponentManager } from '../../../../../ComponentManager';
 import * as THREE from "three";
-export declare class PointDrag extends CommandFlowComponent<{}> {
+export declare class PointDrag extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     interruptKeys: string[];
     shortcutKeys: string[];
     commandName: string;
-    onAddFromParent(): void;
+    onAddFromParent(parent: ComponentManager): void;
     /** 选择开始点
      * @param next
      */
@@ -24,4 +29,13 @@ export declare class PointDrag extends CommandFlowComponent<{}> {
     /** 执行完成
      */
     completed(data: any): void;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
 }

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/SelectAll.d.ts

@@ -0,0 +1,30 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import * as THREE from "three";
+/**
+ * 选择全部命令
+ */
+export declare class SelectAll extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /** 开始
+     * @param next
+     */
+    selectAll(next: any): void;
+    /** 执行完成
+     */
+    completed(lines: LineSegment[]): void;
+    /** 回滚操作
+     * @param lines
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

package/src/utils/DxfSystem/plugin/Editor/components/CommandFlow/VerticalCorrection.d.ts

@@ -0,0 +1,63 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { LineSegment } from '../../../../../Quadtree/LineSegment';
+import { Point } from '../../../../../Quadtree/Point';
+import * as THREE from "three";
+/**
+ * 垂直纠正
+ */
+export declare class VerticalCorrection extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /**
+     * 进入命令约束
+     */
+    constraint(next: any, selectLines: LineSegment[]): void;
+    /**
+     * 线段是否为结尾线段
+     * @param line
+     */
+    lineIsPathEnd(line: LineSegment): boolean;
+    /**
+     *
+     * @param line0
+     * @param line1
+     */
+    isTowLineSegmentConnect(line0: LineSegment, line1: LineSegment): boolean;
+    /**
+     * 获取所有相同点的位置信息
+     * @param point
+     * @param point2
+     */
+    getSamePointAll(point: Point, point2: Point): {
+        point: Point<Record<string, any>>;
+        oldPoint: Point<Record<string, any>>;
+        newPoint: Point<Record<string, any>>;
+        line: LineSegment;
+    }[];
+    /** 修正
+     * @param targettLine
+     * @param vistedList
+     */
+    correction(targettLine: LineSegment, resultList?: any[], vistedList?: Set<LineSegment>): any[] | undefined;
+    /** 开始
+     * @param next
+     */
+    verticalCorrection(next: any, selectLines: LineSegment[]): void;
+    /** 执行完成
+     * @param data
+     */
+    private completed;
+    /** 回滚操作
+     * @param data
+     */
+    private rollback;
+    /** 撤回回滚
+     * @param lines
+     * @returns
+     */
+    private revokeRollback;
+}

package/src/utils/DxfSystem/plugin/Editor/components/Editor.d.ts

@@ -10,6 +10,7 @@ export declare class Editor extends Component<{
     pointerPositionChange: {
         position: THREE.Vector2;
     };
+    cancelCommand: {};
 }> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
@@ -24,7 +25,13 @@ export declare class Editor extends Component<{
     plane: THREE.Mesh<THREE.PlaneGeometry, THREE.Material | THREE.Material[], THREE.Object3DEventMap>;
     app?: App<Element>;
     domElement: HTMLDivElement;
+    viewPermission?: "admin";
+    constructor(viewPermission?: "admin");
     onAddFromParent(): void;
+    /**
+     * 取消命令，由其他命令组件监听事件后注册事件监听实现
+     */
+    cancelCommand(): void;
     coords: THREE.Vector2;
     pointerPosition: THREE.Vector2;
     private _exitEditCallBack?;

package/src/utils/DxfSystem/plugin/Editor/components/index.d.ts

@@ -4,3 +4,4 @@ export * from './CommandFlow/Default';
 export * from './CommandFlow/DrawDoorLine';
 export * from './CommandFlow/DrawLine';
 export * from './CommandFlow/DrawWindow';
+export * from './CommandFlow/VerticalCorrection';

package/src/utils/DxfSystem/plugin/Editor/index.d.ts

@@ -1,2 +1,9 @@
 import { DxfSystem } from '../..';
-export declare function Editor(dxfSystem: DxfSystem): void;
+type Option = {
+    viewPermission?: "admin";
+};
+export declare function Editor_(dxfSystem: DxfSystem, option?: Option): void;
+declare const Editor: typeof Editor_ & {
+    create(option?: Option): (dxfSystem: DxfSystem) => void;
+};
+export { Editor };

package/src/utils/DxfSystem/plugin/Editor/pages/EditorTool.vue.d.ts

@@ -1,6 +1,10 @@
 import { DxfSystem } from '../../..';
 type __VLS_Props = {
     dxfSystem: DxfSystem;
+    permission?: "admin";
 };
-declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, HTMLDivElement>;
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
+    elRef: HTMLDivElement;
+    toolBarRef: HTMLDivElement;
+}, HTMLDivElement>;
 export default _default;

package/src/utils/DxfSystem/plugin/RenderPlugin/components/DomEventRegister.d.ts

@@ -1,5 +1,5 @@
 import { Vector2 } from 'three';
-import { Component, ComponentManager } from '../../../../ComponentManager';
+import { Component } from '../../../../ComponentManager';
 export declare class DomEventRegister extends Component<{
     mousemove: {
         x: number;
@@ -15,11 +15,32 @@ export declare class DomEventRegister extends Component<{
     static name: string;
     cancelDefaultBehaviorList: ((e: KeyboardEvent) => boolean)[];
     pointer: Vector2;
+    private _isMouseEnter;
+    set isMouseEnter(isMouseEnter: boolean);
+    get isMouseEnter(): boolean;
+    private _mouseMoveEventProxylock;
+    set mouseMoveEventProxylock(lock: boolean);
+    get mouseMoveEventProxylock(): boolean;
     /**
-     *
-     * @param parent
+     * 组件被添加到父组件上时调用
+     */
+    onAddFromParent(): void;
+    /**
+     * 初始化鼠标事件代理(判断鼠标是否在domElement上)
+     */
+    initMouseMoveEventProxy(): void;
+    /**
+     * 初始化键盘事件
+     */
+    initKeyEvent(): void;
+    /**
+     * 初始化滚轮事件
+     */
+    initWheelEvent(): void;
+    /**
+     * 根据domElement的cursor自动设置body的cursor
      */
-    onAddFromParent(parent: ComponentManager): void;
+    autoBodyCursor(): void;
     /**
      *
      * @param callBack
@@ -32,11 +53,12 @@ export declare class DomEventRegister extends Component<{
      * @param offset
      * @param condition
      */
-    dragMoveHelper(el: HTMLElement, callBack: (offset: {
+    static dragMoveHelper(el: HTMLElement, callBack: (offset: {
         x: number;
         y: number;
     }, mx: number, my: number) => void, offset?: {
         x: number;
         y: number;
-    }, condition?: () => boolean): void;
+    }, condition?: () => boolean): () => void;
+    destroy(): void;
 }

package/src/utils/DxfSystem/plugin/RenderPlugin/components/Renderer.d.ts

@@ -17,7 +17,7 @@ export interface RendererDescription {
     };
     resizeObserver?: HTMLElement | null;
     scene?: THREE.Scene;
-    camera?: THREE.PerspectiveCamera | THREE.OrthographicCamera;
+    camera?: THREE.PerspectiveCamera | THREE.OrthographicCamera | THREE.Camera;
 }
 export declare class Renderer extends Component<{
     resize: {

package/src/utils/DxfSystem/plugin/RenderPlugin/index.d.ts

@@ -6,7 +6,8 @@ type Option = {
     originalLine?: boolean;
     modelData?: boolean;
     detailsPoint?: boolean;
-    camera?: THREE.OrthographicCamera;
+    orbitControls?: boolean;
+    camera?: THREE.Camera;
 };
 declare function RenderPlugin_(dxfSystem: DxfSystem, option?: Option): void;
 declare const RenderPlugin: typeof RenderPlugin_ & {

package/src/utils/Quadtree/LineSegment.d.ts

@@ -11,6 +11,7 @@ export declare class LineSegment<T = Record<string, any>> {
     get start(): Point<Record<string, any>>;
     get end(): Point<Record<string, any>>;
     constructor(p1?: Point, p2?: Point);
+    set(p1: Point, p2: Point): void;
     /** 膨胀
      * @description 向线段的两个端点分别膨胀 width
      * @param width
@@ -71,7 +72,7 @@ export declare class LineSegment<T = Record<string, any>> {
      */
     projectPoint(p1: Point, clip?: boolean): Point | null;
     /**
-     * 判断线段是与线段相交
+     * 判断线段是否与另一条线段相交（包含共用端点或部分重合的情况）
      * @param line
      */
     intersectLineSegment(line: LineSegment): boolean;

package/src/utils/Quadtree/Point.d.ts

@@ -125,9 +125,10 @@ export declare class Point<T = Record<string, any>> {
         x: number;
         y: number;
     }): void;
-    toJson(): {
+    toJson(z?: number): {
         x: number;
         y: number;
+        z: number;
     };
     static from(arr: any): Point<Record<string, any>>;
     static zero(): Point<Record<string, any>>;

package/src/components/Editor.vue.d.ts

@@ -1,26 +0,0 @@
-import { DxfSystem } from '../utils/DxfSystem';
-import { OriginalDataItem } from '../utils/DxfSystem/components/Dxf';
-import * as THREE from "three";
-type __VLS_Props = {
-    lines?: OriginalDataItem[];
-    detailsPoint?: {
-        position: {
-            x: number;
-            y: number;
-            z: number;
-        };
-        direction: {
-            x: number;
-            y: number;
-            z: number;
-        };
-        desc: string;
-    }[];
-    camera?: THREE.OrthographicCamera;
-};
-declare const _default: import('vue').DefineComponent<__VLS_Props, {
-    dxfSystem: DxfSystem;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
-    elRef: HTMLDivElement;
-}, HTMLDivElement>;
-export default _default;

package/src/pages/Editor02.vue.d.ts

@@ -1,4 +0,0 @@
-declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {
-    dom: HTMLDivElement;
-}, HTMLDivElement>;
-export default _default;