build-dxf 0.1.113 → 0.1.115

package/src/dxf-system/plugins/editor/components/CommandFlow/CFComponent.d.ts

@@ -3,10 +3,11 @@ import { Editor } from '../Editor';
 import { EventInput, Renderer } from '../../../renderer/components';
 import { CommandFlow, CommandManager } from '../../../../../utils/command';
 import { AdsorptionResult, RenderManager } from '../RenderManager';
-import { Default } from './Default';
+import { DefaultCommand } from './DefaultCommand';
 import { LineSegment } from '../../../../../utils/algorithms/LineSegment';
 import { Point } from '../../../../../utils/algorithms/Point';
 import { Properties } from 'csstype';
+import { UIService } from '../UIService';
 import * as THREE from "three";
 export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Component<TEventMap & {}> {
     static interruptKeys: string[];
@@ -25,13 +26,14 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
     private _commandManager?;
     get commandManager(): CommandManager;
     private _default?;
-    get default(): Default;
+    get default(): DefaultCommand;
     get commandName(): string;
     get interruptKeys(): string[];
     get shortcutKeys(): string[];
     get confirmKeys(): string[];
     container: THREE.Group<THREE.Object3DEventMap>;
     commandFlow?: CommandFlow;
+    uiService: UIService;
     constructor();
     /** 快捷创建命令流
      * @param opt
@@ -128,8 +130,11 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
     createLineSelector(opt?: {
         onMove: (line: LineSegment | null | undefined, result: AdsorptionResult) => void;
         eventRecordNames?: string[];
+        radius?: number;
     }): {
         readonly ended: boolean;
+        paused(): void;
+        resume(): void;
         next: (mode_?: "all" | "door" | "wall" | "window" | "none") => Promise<LineSegment<Record<string, any>> | null>;
         end: () => void;
         lines(mode_: "all" | "door" | "wall" | "window" | "none"): {
@@ -142,8 +147,10 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
             }>;
             [Symbol.asyncIterator](): /*elided*/ any;
         };
-        awaitEach(mode_: "all" | "door" | "wall" | "window" | "none", callBack: (line: LineSegment | undefined) => void): Promise<{
+        awaitEach(mode_: "all" | "door" | "wall" | "window" | "none", callBack: (line: LineSegment | undefined, self: any) => void): Promise<{
             readonly ended: boolean;
+            paused(): void;
+            resume(): void;
             next: (mode_?: "all" | "door" | "wall" | "window" | "none") => Promise<LineSegment<Record<string, any>> | null>;
             end: () => void;
             lines(mode_: "all" | "door" | "wall" | "window" | "none"): {
@@ -156,7 +163,7 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
                 }>;
                 [Symbol.asyncIterator](): /*elided*/ any;
             };
-            awaitEach(mode_: "all" | "door" | "wall" | "window" | "none", callBack: (line: LineSegment | undefined) => void): Promise</*elided*/ any>;
+            awaitEach(mode_: "all" | "door" | "wall" | "window" | "none", callBack: (line: LineSegment | undefined, self: any) => void): Promise</*elided*/ any>;
         }>;
     };
     /** 创建顶点选择器

package/src/dxf-system/plugins/editor/components/CommandFlow/{Default.d.ts → DefaultCommand.d.ts}

@@ -1,13 +1,13 @@
 import { LineSegment } from '../../../../../utils/algorithms/LineSegment';
 import { CommandFlowComponent } from './CFComponent';
-import { LineUserData } from '../../../../../dxfSystem/type';
+import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 /**
  * 创建移动端集成页面
  * @param drawLine
  * @returns
  */
-export declare class Default extends CommandFlowComponent<{
+export declare class DefaultCommand extends CommandFlowComponent<{
     selectLineChange: {};
     selectWinLineChange: {};
 }> {

package/src/dxf-system/plugins/editor/components/CommandFlow/DrawHole.d.ts

@@ -0,0 +1,38 @@
+import { CommandFlowComponent } from './CFComponent';
+import { LineSegment } from '../../../../../utils/algorithms/LineSegment';
+import { ComponentSystem } from '../../../../../utils/ecs';
+import { InsertObject, LineUserData } from '../../../../type';
+import * as THREE from "three";
+interface Data {
+    line: LineSegment<LineUserData>;
+    insertObject: InsertObject;
+}
+export declare class DrawHole extends CommandFlowComponent<{
+    pointerMove: {
+        point: THREE.Vector3;
+    };
+}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    static shortcutKeys: string[];
+    static commandName: string;
+    defaultWidth: number;
+    onAddFromParent(parent: ComponentSystem): void;
+    /** 选择开始点
+     * @param next
+     */
+    selectLine(next: any): Promise<void>;
+    /** 执行完成
+     */
+    onCompleted(data: Data): void;
+    /** 回滚操作
+     * @param data
+     */
+    protected onRollback(data: Data): Data;
+    /** 撤回回滚
+     * @param data
+     * @returns
+     */
+    protected onRevokeRollback(data: Data): Data;
+}
+export {};

package/src/dxf-system/plugins/editor/components/CommandFlow/DrawWindow.d.ts

@@ -1,7 +1,7 @@
 import { CommandFlowComponent } from './CFComponent';
 import { LineSegment } from '../../../../../utils/algorithms/LineSegment';
 import { ComponentSystem } from '../../../../../utils/ecs';
-import { LineUserData } from '../../../../../dxfSystem/type';
+import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 export declare class DrawWindow extends CommandFlowComponent<{
     pointerMove: {

package/src/dxf-system/plugins/editor/components/CommandFlow/PropertiesPanel.d.ts

@@ -10,7 +10,7 @@ export declare class PropertiesPanel extends CommandFlowComponent<{}> {
     isOpen: boolean;
     onAddFromParent(parent: ComponentSystem): void;
     getSelectLines(): {
-        list: LineSegment<LineUserData>[];
+        list: LineSegment<import('../../../../type').LineUserData>[];
         winList: any[];
     };
     private constraint;

package/src/dxf-system/plugins/editor/components/Editor.d.ts

@@ -5,7 +5,7 @@ import { Renderer, DomContainer, DomEventRegister, EventInput } from '../../rend
 import { RenderManager } from './RenderManager';
 import { CommandManager } from '../../../../utils/command';
 import { App } from 'vue';
-import { DxfSystem } from '../../../../dxfSystem';
+import { DxfSystem } from '../../..';
 import * as THREE from "three";
 export declare class Editor extends Component<{
     pointerPositionChange: {

package/src/dxf-system/plugins/editor/components/RenderManager.d.ts

@@ -6,8 +6,8 @@ import { PointSpatialHash } from '../../../../utils/algorithms/PointSpatialHash'
 import { Editor } from './Editor';
 import { Quadtree } from '../../../../utils/algorithms/Quadtree';
 import { DxfLineModel } from '../../model3d/components';
-import { LineUserData } from '../../../../dxfSystem/type';
-import { Dxf } from '../../../../dxfSystem/components/Dxf';
+import { LineUserData, OriginalDataItem } from '../../../type';
+import { Dxf } from '../../../components/Dxf';
 import * as THREE from "three";
 export type AdsorptionResult = {
     point: THREE.Vector3;
@@ -52,10 +52,10 @@ export declare class RenderManager extends Component<{
      * @param lines
      */
     removeLines(lines: LineSegment<LineUserData>[]): void;
-    /**
-     * 绘制
+    /** 创建几何体
+     * @param rectangle
      */
-    draw(synchronize?: boolean): void;
+    createGeometry(map: Record<string, number[]>, count: number): THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>;
     lineAdsorption: import('vue').Ref<boolean, boolean>;
     pointAdsorption: import('vue').Ref<boolean, boolean>;
     /** 获取鼠标当前点, 吸附后的点
@@ -75,10 +75,6 @@ export declare class RenderManager extends Component<{
     private lineDashedText1;
     private lineDashedText2;
     setAuxiliaryLineVisible(b: boolean): void;
-    /** 创建几何体
-     * @param rectangle
-     */
-    createGeometry(map: Record<string, number[]>, count: number): THREE.BufferGeometry<THREE.NormalBufferAttributes, THREE.BufferGeometryEventMap>;
     /**
      * 转为json
      */
@@ -88,6 +84,10 @@ export declare class RenderManager extends Component<{
      * 同步到dxf
      */
     synchronizeDxf(): void;
+    /**
+     * 绘制
+     */
+    draw(synchronize?: boolean): void;
     get renderer(): Renderer;
     get dxf(): Dxf;
     get variable(): Variable;

package/src/dxf-system/plugins/editor/components/UIService.d.ts

@@ -1 +1,2 @@
-export {};
+export declare class UIService {
+}

package/src/dxf-system/plugins/editor/components/index.d.ts

@@ -1,5 +1,5 @@
 export * from './RenderManager';
-export * from './CommandFlow/Default';
+export * from './CommandFlow/DefaultCommand';
 export * from './CommandFlow/DrawDoorLine';
 export * from './CommandFlow/DrawLine';
 export * from './CommandFlow/DrawWindow';

package/src/dxf-system/plugins/editor/pages/EditorTool/EditorTool.vue.d.ts

@@ -1,4 +1,4 @@
-import { DxfSystem } from '../../../../../dxfSystem/DxfSystem';
+import { DxfSystem } from '../../../../DxfSystem';
 type __VLS_Props = {
     dxfSystem: DxfSystem;
     permission?: "admin";

package/src/dxf-system/plugins/editor/pages/PropertiesPanel.vue.d.ts

@@ -1,4 +1,4 @@
-import { LineUserData } from '../../../../dxfSystem/type';
+import { LineUserData } from '../../../type';
 import { LineSegment } from '../../../../utils/algorithms/LineSegment';
 import { Ref } from 'vue';
 type __VLS_Props = {

package/src/dxf-system/plugins/editor/utils/Wall2D.d.ts

@@ -0,0 +1,10 @@
+import { Rectangle, LineSegment } from '../../../../utils';
+import { Shape2D } from '../../../../utils/three-object-3d/Shape2D';
+export declare class Wall2D extends Shape2D {
+    line: LineSegment;
+    rectangle: Rectangle;
+    private debouncing;
+    constructor(line: LineSegment);
+    update(): void;
+    dispose(): void;
+}

package/src/dxf-system/utils/WallInsertObject.d.ts

@@ -92,6 +92,12 @@ export declare class WallInsertObject {
      */
     static addInsertObject(target: LineSegment<LineUserData>, insertObject: InsertObject, type?: InsertObjectKey): void;
     addInsertObject(target: LineSegment<LineUserData>, insertObject: InsertObject, type?: InsertObjectKey): void;
+    /** 移除孔洞
+     * @param target
+     * @param insertObject
+     */
+    static removeInsertObject(target: LineSegment<LineUserData>, insertObject: InsertObject): void;
+    removeInsertObject(target: LineSegment<LineUserData>, insertObject: InsertObject): void;
     /** 复制所有孔洞
      * @param target
      * @param source

package/src/dxf-system/utils/line-pipeline/builtin/door-to-hole.d.ts

@@ -1,4 +1,4 @@
-import { LineUserData, SetDataOption } from '../../../../dxfSystem/type';
+import { LineUserData, SetDataOption } from '../../../type';
 import { LineSegment } from '../../../../utils/algorithms/LineSegment';
 /**
  * 轴对齐垂直修正

package/src/dxf-system/utils/line-pipeline/builtin/double-wall-alignment.d.ts

@@ -1,5 +1,5 @@
 import { LineSegment } from '../../../../utils/algorithms/LineSegment';
-import { LineUserData } from '../../../../dxfSystem/type';
+import { LineUserData } from '../../../type';
 /** 双线墙对齐
  * @param lines
  * @returns

package/src/index.css

@@ -213,6 +213,10 @@
   z-index: 8;
 }
 
+.z-11 {
+  z-index: 11;
+}
+
 .z-18 {
   z-index: 18;
 }
@@ -225,14 +229,6 @@
   z-index: 100;
 }
 
-.z-\[11\] {
-  z-index: 11;
-}
-
-.z-\[20\] {
-  z-index: 20;
-}
-
 .col-start-1 {
   grid-column-start: 1;
 }
@@ -444,6 +440,10 @@
   width: 200px;
 }
 
+.w-\[400px\] {
+  width: 400px;
+}
+
 .w-fit {
   width: fit-content;
 }
@@ -634,7 +634,7 @@
   border-top-width: 1px;
 }
 
-.border-b, .border-b-1 {
+.border-b {
   border-bottom-style: var(--tw-border-style);
   border-bottom-width: 1px;
 }
@@ -1257,17 +1257,17 @@ button[data-v-b3b042a9]:active {
 }
 }
 
-[data-v-cd7c599e] {
+[data-v-f4f386d2] {
     font-family: 微软雅黑;
 }
-.number[data-v-cd7c599e] {
+.number[data-v-f4f386d2] {
     color: #a7a7a7
 }
 
-[data-v-6ec3e5bb] {
+[data-v-b8090cfc] {
     font-family: 宋体;
 }
-.button[data-v-6ec3e5bb] {
+.button[data-v-b8090cfc] {
     padding: 5px 10px;
     border: none;
     background: var(--primary-color);

package/src/index.js

@@ -1,13 +1,13 @@
 import "three";
-import { o, p, q, r, s, t, v, w, x } from "./build.js";
+import { q, r, s, t, v, w, x, y, z } from "./build.js";
 export {
-  o as ModelDataPlugin,
-  p as buildJson,
-  q as createEditor,
-  r as dxfSystem,
-  s as getFileAll,
-  t as getGlobalDxfSystem,
-  v as getModels,
-  w as hasCircle,
-  x as utils
+  q as ModelDataPlugin,
+  r as buildJson,
+  s as createEditor,
+  t as dxfSystem,
+  v as getFileAll,
+  w as getGlobalDxfSystem,
+  x as getModels,
+  y as hasCircle,
+  z as utils
 };