build-dxf 0.1.114 → 0.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.114",
+  "version": "0.1.115",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -3322,7 +3322,7 @@ class LineSegmentUtils {
   static GroupBuilder(groups) {
     const builder = {
       handle(k, fn2) {
-        groups[k] = fn2(groups[k] ?? []);
+        if (groups[k]) groups[k] = fn2(groups[k]);
         return builder;
       },
       merge() {
@@ -11369,20 +11369,22 @@ function correction(lines, targettLine, option) {
   lines = AxisAlignCorr.start(lines, targettLine);
   const bayWindow = lines.filter((line) => line.userData.isBayWindow).map((line) => line.center);
   lines = lineSegmentClipping(lines, 1e-9);
-  lines = AlignToParallelSegments.align(lines, {
-    onMergeLine: mergeLineUserData,
-    onGroup(group, projValues, axis) {
-      if (group.length <= 1) return;
-      const max = Math.max(...projValues);
-      const min = Math.min(...projValues);
-      const dist = precision4((max - min) * axis.length);
-      if (dist < DEFAULT_WALL_WIDTH) return;
-      group.forEach((line) => {
-        line.userData.wallWidth = dist;
-      });
-    }
-    // esp: 0.2
-  });
+  lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => line.userData.isBalconyRailing ? "balconyRailing" : "lines")).handle("lines", (lines2) => {
+    return AlignToParallelSegments.align(lines2, {
+      onMergeLine: mergeLineUserData,
+      onGroup(group, projValues, axis) {
+        if (group.length <= 1) return;
+        const max = Math.max(...projValues);
+        const min = Math.min(...projValues);
+        const dist = precision4((max - min) * axis.length);
+        if (dist < DEFAULT_WALL_WIDTH) return;
+        group.forEach((line) => {
+          line.userData.wallWidth = dist;
+        });
+      }
+      // esp: 0.2
+    });
+  }).handle("balconyRailing", (lines2) => AlignToParallelSegments.align(lines2)).merge();
   lines = adsorption(lines, option);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = recoveryBayWindow(lines, bayWindow);
@@ -23196,29 +23198,31 @@ export {
   SelectLocalFile as S,
   ThreeVJia as T,
   Variable as V,
-  WallInsertObject as W,
+  WallGroupManager as W,
   Point as a,
-  LineSegment as b,
+  Pipeline as b,
   cloneUserData as c,
-  createQuadtree as d,
+  WallInsertObject as d,
   LineSegmentUtils as e,
-  Lines as f,
+  LineSegment as f,
   getDefaultExportFromCjs as g,
-  drawText$1 as h,
-  mergeChains as i,
-  mmTom as j,
-  LinePipeline as k,
-  WhiteModel as l,
+  createQuadtree as h,
+  Lines as i,
+  drawText$1 as j,
+  mergeChains as k,
+  mmTom as l,
   mToMm as m,
-  CommandManager as n,
-  index as o,
-  buildJson as p,
-  createEditor as q,
-  index$2 as r,
-  getFileAll as s,
-  getGlobalDxfSystem as t,
+  LinePipeline as n,
+  WhiteModel as o,
+  CommandManager as p,
+  index as q,
+  buildJson as r,
+  createEditor as s,
+  index$2 as t,
   uuid as u,
-  getModels as v,
-  hasCircle as w,
-  index$3 as x
+  getFileAll as v,
+  getGlobalDxfSystem as w,
+  getModels as x,
+  hasCircle as y,
+  index$3 as z
 };

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

@@ -133,6 +133,8 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
         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"): {
@@ -147,6 +149,8 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
         };
         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"): {

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

@@ -16,6 +16,7 @@ export declare class DrawHole extends CommandFlowComponent<{
     container: THREE.Group<THREE.Object3DEventMap>;
     static shortcutKeys: string[];
     static commandName: string;
+    defaultWidth: number;
     onAddFromParent(parent: ComponentSystem): void;
     /** 选择开始点
      * @param next
@@ -27,11 +28,11 @@ export declare class DrawHole extends CommandFlowComponent<{
     /** 回滚操作
      * @param data
      */
-    protected onRollback(data: Data): void;
+    protected onRollback(data: Data): Data;
     /** 撤回回滚
      * @param data
      * @returns
      */
-    protected onRevokeRollback(data: Data): void;
+    protected onRevokeRollback(data: Data): Data;
 }
 export {};

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

@@ -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/index.css

@@ -440,6 +440,10 @@
   width: 200px;
 }
 
+.w-\[400px\] {
+  width: 400px;
+}
+
 .w-fit {
   width: fit-content;
 }

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
 };

package/src/index3.js

@@ -1,4 +1,4 @@
-import { g as getDefaultExportFromCjs, C as Component, P as PointSpatialHash, Q as Quadtree, B as Box2, a as Point, L as LineDashed, c as cloneUserData, V as Variable, b as LineSegment, d as createQuadtree, u as uuid, m as mToMm, e as LineSegmentUtils, W as WallInsertObject, f as Lines, H as HeightQuery, h as drawText, i as mergeChains, j as mmTom, k as LinePipeline, R as Rectangle, D as DEFAULT_WALL_WIDTH, l as WhiteModel, T as ThreeVJia, S as SelectLocalFile, M as MiniCircles, n as CommandManager } from "./build.js";
+import { g as getDefaultExportFromCjs, C as Component, P as PointSpatialHash, Q as Quadtree, B as Box2, a as Point, L as LineDashed, c as cloneUserData, b as Pipeline, W as WallGroupManager, d as WallInsertObject, e as LineSegmentUtils, V as Variable, f as LineSegment, h as createQuadtree, u as uuid, m as mToMm, i as Lines, H as HeightQuery, j as drawText, k as mergeChains, l as mmTom, n as LinePipeline, R as Rectangle, D as DEFAULT_WALL_WIDTH, o as WhiteModel, T as ThreeVJia, S as SelectLocalFile, M as MiniCircles, p as CommandManager } from "./build.js";
 import * as THREE from "three";
 import { InstancedBufferGeometry, Float32BufferAttribute, InstancedInterleavedBuffer, InterleavedBufferAttribute, WireframeGeometry, Box3, Sphere, Vector3, ShaderMaterial, ShaderLib, UniformsUtils, Vector2, UniformsLib, Mesh, Vector4, Line3, Matrix4, MathUtils, Group } from "three";
 import "clipper-lib";
@@ -11013,7 +11013,6 @@ message.closeAllByPlacement = closeAllByPlacement;
 message._context = null;
 const ElMessage = withInstallFunction(message, "$message");
 const textureUrl = "data:image/png;base64,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";
-const searchTextureUrl = "data:image/png;base64,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";
 class Debouncing {
   timeoutId = null;
   delay;
@@ -11038,7 +11037,6 @@ class Debouncing {
 }
 const loader = new THREE.TextureLoader();
 const texture = loader.load(textureUrl);
-const searchTexture = loader.load(searchTextureUrl);
 class RenderManager extends Component {
   static name = "RenderManager";
   container = new THREE.Group();
@@ -11135,77 +11133,15 @@ class RenderManager extends Component {
     for (let i = 0; i < lines.length; i++) this.removeLine(lines[i], false);
     this.draw();
   }
-  /**
-   * 绘制
+  /** 创建几何体
+   * @param rectangle 
    */
-  draw(synchronize = true) {
-    this.container.clear();
-    const position = [], doorPosition = [], passageEntrancePosition = [], windowPosition = [], findDoorPoint = [], bayWindowPoint = [];
-    this.lines.forEach((line2) => {
-      if (line2.userData.isBayWindow) {
-        line2.points.forEach((p) => bayWindowPoint.push(p.x, p.y, 0));
-        return;
-      }
-      line2.points.forEach((p) => {
-        if (line2.userData.isDoor) doorPosition.push(p.x, p.y, 0);
-        else position.push(p.x, p.y, 0);
-      });
-      if (line2.userData.isDoor && line2.userData.doorAutomaticFind) findDoorPoint.push(line2.center);
-      if (line2.userData.isWindow && line2.userData.drawWindow) {
-        line2.userData.drawWindow.forEach(({ width, p }) => {
-          const center = Point.from(p), direction = line2.direction(), start = center.clone().add(direction.clone().multiplyScalar(width * 0.5)), end = center.clone().add(direction.clone().multiplyScalar(-width * 0.5));
-          windowPosition.push(start.x, start.y, 1e-3);
-          windowPosition.push(end.x, end.y, 1e-3);
-        });
-      }
-      if (line2.userData.isVerticalReferenceLine) {
-        const pos = line2.center;
-        this.verticalReferenceLineFlag.position.set(pos.x, pos.y, 0);
-        this.container.add(this.verticalReferenceLineFlag);
-      }
-      if (line2.userData.isPassageEntrance) {
-        line2.userData.passageEntrance?.forEach((item) => {
-          const direction = line2.direction();
-          const peLine = Point.from(item.p).expandAsLine(direction, item.width).translate(-item.width * 0.5, direction);
-          peLine.points.forEach((p) => passageEntrancePosition.push(p.x, p.y, 0));
-        });
-      }
+  createGeometry(map, count) {
+    const geometry = new THREE.BufferGeometry();
+    Object.keys(map).forEach((k) => {
+      geometry.setAttribute(k, new THREE.BufferAttribute(new Float32Array(map[k]), map[k].length / count));
     });
-    position.length && this.renderer.createLineSegments({
-      position
-    }, position.length / 3, {
-      color: 5745151
-    }, this.container);
-    doorPosition.length && this.renderer.createLineSegments({
-      position: doorPosition
-    }, doorPosition.length / 3, {
-      color: 16776960
-    }, this.container);
-    passageEntrancePosition.length && this.renderer.createLineSegments({
-      position: passageEntrancePosition
-    }, passageEntrancePosition.length / 3, {
-      color: 16750592
-    }, this.container);
-    windowPosition.length && this.renderer.createLineSegments({
-      position: windowPosition
-    }, windowPosition.length / 3, {
-      color: 16711935
-    }, this.container);
-    if (bayWindowPoint.length) {
-      const obj3D = this.renderer.createLineSegments({
-        position: bayWindowPoint
-      }, bayWindowPoint.length / 3, {}, this.container);
-      obj3D.material = new THREE.LineDashedMaterial({
-        color: 4235007,
-        dashSize: 0.05,
-        gapSize: 0.05,
-        opacity: 0.5,
-        transparent: true
-      });
-      obj3D.computeLineDistances();
-    }
-    this.renderer.createCircle(findDoorPoint, { map: searchTexture, size: 0.4, sizeAttenuation: true, color: 16777215 }, this.container);
-    synchronize && this.synchronizeDxf();
+    return geometry;
   }
   lineAdsorption = ref(true);
   pointAdsorption = ref(true);
@@ -11307,16 +11243,6 @@ class RenderManager extends Component {
     }
     this.lineDashed1.visible = this.lineDashed2.visible = this.lineDashedText1.visible = this.lineDashedText2.visible = b;
   }
-  /** 创建几何体
-   * @param rectangle 
-   */
-  createGeometry(map, count) {
-    const geometry = new THREE.BufferGeometry();
-    Object.keys(map).forEach((k) => {
-      geometry.setAttribute("position", new THREE.BufferAttribute(new Float32Array(map[k]), map[k].length / count));
-    });
-    return geometry;
-  }
   /**
    * 转为json
    */
@@ -11363,6 +11289,14 @@ class RenderManager extends Component {
       dxf2.set(json, dxf2.options);
     });
   }
+  /**
+   * 绘制
+   */
+  draw(synchronize = true) {
+    this.container.clear();
+    new Drawer(this.lines).draw(this.container);
+    synchronize && this.synchronizeDxf();
+  }
   get renderer() {
     return this.parent?.findComponentByName("Renderer");
   }
@@ -11382,6 +11316,189 @@ class RenderManager extends Component {
     return this.parent?.findComponentByName("DxfLineModel");
   }
 }
+class Drawer extends Pipeline {
+  wallGroupManager;
+  constructor(lines) {
+    super();
+    this.wallGroupManager = WallGroupManager.fromByLines(lines);
+    this.use({ type: "wall", handle: this.wall.bind(this) });
+    this.use({ type: "doubleWall", handle: this.doubleWall.bind(this) });
+    this.use({ type: "door", handle: this.door.bind(this) });
+    this.use({ type: "balconyRailing", handle: this.balconyRailing.bind(this) });
+    this.use({ type: "window", handle: this.wall.bind(this) });
+    this.use({ type: "hole", handle: this.hole.bind(this) });
+    this.use({ type: "bayWindow", handle: this.bayWindow.bind(this) });
+  }
+  /** 单线墙壁
+   * @param ctx 
+   */
+  wall(ctx) {
+    const color = new THREE.Color(5745151);
+    const holeLines = ctx.data.flatMap((line2) => {
+      const holeLines2 = [];
+      WallInsertObject.forEachInsertObjectData(line2, (data, key) => {
+        data.forEach((item) => {
+          let type = key == "drawWindow" ? "window" : item.type;
+          const holeLine = WallInsertObject.wallInsertObjectToLine(line2, item);
+          holeLine.userData.type = type;
+          holeLines2.push(holeLine);
+        });
+      });
+      let lines = [line2];
+      if (holeLines2.length) {
+        lines = LineSegmentUtils.clippingByLines(line2, holeLines2) ?? [];
+      }
+      lines.forEach((line22) => {
+        line22.points.forEach((p) => {
+          ctx.cache.lines.push(p.x, p.y, 0);
+          ctx.cache.lineColor.push(color.r, color.g, color.b);
+        });
+      });
+      return holeLines2;
+    });
+    this.wallGroupManager.add({
+      type: "hole",
+      lines: holeLines
+    });
+  }
+  /** 双线墙壁
+   * @param ctx 
+   */
+  doubleWall(ctx) {
+    this.wallGroupManager.add({
+      type: "wall",
+      lines: ctx.data
+    });
+  }
+  /** 门
+   * @param ctx 
+   */
+  door(ctx) {
+    this.wallGroupManager.add({
+      type: "hole",
+      lines: ctx.data
+    });
+  }
+  /** 栏杆
+   * @param ctx 
+   */
+  balconyRailing(ctx) {
+    const color = new THREE.Color(65280);
+    ctx.data.forEach((line2) => {
+      line2.points.forEach((p) => {
+        ctx.cache.lines.push(p.x, p.y, 0);
+        ctx.cache.lineColor.push(color.r, color.g, color.b);
+      });
+    });
+  }
+  /** 飘窗
+   * @param ctx 
+   */
+  bayWindow(ctx) {
+    const color = new THREE.Color(5745151);
+    ctx.data.forEach((line2) => {
+      if (!line2.userData.isBayWindow) return;
+      line2.points.forEach((p) => {
+        ctx.cache.lineDasheds.push(p.x, p.y, 0);
+        ctx.cache.lineDashedColor.push(color.r, color.g, color.b);
+      });
+    });
+    this.wallGroupManager.add({
+      type: "wall",
+      lines: ctx.data.filter((line2) => !line2.userData.isBayWindow)
+    });
+  }
+  /** 孔洞
+   * @param ctx 
+   */
+  hole(ctx) {
+    const colors = {
+      default: new THREE.Color(16776960),
+      // 0xff5722
+      window: new THREE.Color(16711935),
+      door: new THREE.Color(16776960)
+    };
+    ctx.data.forEach((line2) => {
+      const type = line2.userData.type ?? "default";
+      const color = colors[type];
+      line2.points.forEach((p) => {
+        if (type === "default") {
+          ctx.cache.lineDasheds.push(p.x, p.y, 0);
+          ctx.cache.lineDashedColor.push(color.r, color.g, color.b);
+        } else {
+          ctx.cache.lines.push(p.x, p.y, 0);
+          ctx.cache.lineColor.push(color.r, color.g, color.b);
+        }
+      });
+    });
+  }
+  /** 创建几何体
+   * @param rectangle 
+   */
+  createLineSegments(map, count, parameters) {
+    if (Array.isArray(map)) {
+      const position = map.flatMap((line2) => line2?.points?.flatMap((p) => [p.x, p.y, 0]));
+      return this.createLineSegments({ position }, map.length * 2, parameters);
+    }
+    const geometry = new THREE.BufferGeometry();
+    Object.keys(map).forEach((key) => {
+      const value = map[key];
+      if (key === "color") {
+        let attr = new THREE.BufferAttribute(new Float32Array(value), value.length / count);
+        geometry.setAttribute(key, attr);
+      } else {
+        let attr = new THREE.BufferAttribute(new Float32Array(value), value.length / count);
+        geometry.setAttribute(key, attr);
+      }
+    });
+    const lineSegmentList = new THREE.LineSegments(geometry, new THREE.LineBasicMaterial({ ...parameters }));
+    return lineSegmentList;
+  }
+  /**
+   * 绘制
+   */
+  draw(parent2) {
+    const option = {
+      lines: [],
+      lineColor: [],
+      walls: [],
+      wallColor: [],
+      lineDasheds: [],
+      lineDashedColor: []
+    };
+    this.wallGroupManager.forEach((group) => {
+      this.run(group.type, group.lines, option);
+    });
+    if (option.lines.length) {
+      const wall = this.createLineSegments({
+        position: option.lines,
+        color: option.lineColor
+      }, option.lines.length / 3, {
+        vertexColors: true,
+        toneMapped: false,
+        color: 16777215
+      });
+      parent2.add(wall);
+    }
+    if (option.lineDasheds.length) {
+      const wall = this.createLineSegments({
+        position: option.lineDasheds,
+        color: option.lineDashedColor
+      }, option.lineDasheds.length / 3);
+      wall.material = new THREE.LineDashedMaterial({
+        color: 16777215,
+        vertexColors: true,
+        dashSize: 0.05,
+        gapSize: 0.05,
+        toneMapped: false,
+        transparent: true,
+        opacity: 0.7
+      });
+      wall.computeLineDistances();
+      parent2.add(wall);
+    }
+  }
+}
 function createHtml(tagName, options) {
   const { is, customElementRegistry, style, text, html, parent: parent2 } = options ?? {};
   const element = document.createElement(tagName, { is, customElementRegistry });
@@ -11849,6 +11966,7 @@ class CommandFlowComponent extends Component {
       color: 55561
     });
     let mode = "none";
+    let paused = false;
     const update = (line2) => {
       const rectangle = line2.toRectangle(0.025, "butt");
       object3D.geometry = editor.renderManager.createGeometry({
@@ -11879,6 +11997,7 @@ class CommandFlowComponent extends Component {
       return null;
     }
     const ppcEventCancel = editor.addEventListener("pointerPositionChange", () => {
+      if (paused) return;
       const result = editor.renderManager.adsorption(radius);
       const {
         line: line2,
@@ -11941,6 +12060,12 @@ class CommandFlowComponent extends Component {
       get ended() {
         return ended;
       },
+      paused() {
+        paused = true;
+      },
+      resume() {
+        paused = false;
+      },
       next: getLines,
       end,
       lines(mode_) {
@@ -12385,12 +12510,19 @@ class CommandFlowComponent extends Component {
     }
     function View() {
       return createVNode("div", {
-        "class": " z-20 absolute left-0 top-0 w-full h-full flex flex-col",
+        "class": {
+          "z-20 absolute left-0 top-0 w-full h-full flex flex-col": true,
+          " justify-center items-center bg-[rgba(0,0,0,0.5)]": !isMobileRef.value
+        },
         "onClick": (e) => e.stopPropagation(),
         "onPointerdown": (e) => e.stopPropagation()
-      }, [createVNode("div", {
+      }, [isMobileRef.value && createVNode("div", {
         "class": "flex-1 pointer-events-none"
-      }, null), title && createVNode("div", {
+      }, null), createVNode("div", {
+        "class": {
+          "w-[400px] rounded-[8px] overflow-hidden": true
+        }
+      }, [title && createVNode("div", {
         "class": "bg-white p-[10px] text-center text-[16px]"
       }, [createVNode("h4", null, [title])]), createVNode(Transition, {
         "name": "slide-fade"
@@ -12406,7 +12538,7 @@ class CommandFlowComponent extends Component {
           "modelValue": width.value,
           "onUpdate:modelValue": ($event) => width.value = $event
         }, null)]
-      })]);
+      })])]);
     }
     function close2() {
       if (ended) return;
@@ -16839,14 +16971,16 @@ class LineAlignmentGuide extends Lines {
       const pre = i === 0 ? start : points[i - 1];
       const dist = Number((point.distance(pre) * 1e3).toFixed(0));
       const center = point.clone().add(pre).multiplyScalar(0.5);
-      dist > 0 && this.createText(dist, center, {
-        padding: "1px 0px",
-        background: "#fff",
-        width: "40px",
-        color: "#000",
-        textAlign: "center",
-        borderRadius: "6px"
-      });
+      if (dist > 0) {
+        this.createText(dist, center, {
+          padding: "1px 0px",
+          background: "#fff",
+          width: "35px",
+          color: "#000",
+          textAlign: "center",
+          borderRadius: "6px"
+        });
+      }
     }
     this.setPoint(
       this.start,
@@ -16884,6 +17018,7 @@ class DrawHole extends CommandFlowComponent {
   container = new THREE.Group();
   static shortcutKeys = ["h"];
   static commandName = "draw-hole";
+  defaultWidth = 1;
   onAddFromParent(parent2) {
     super.onAddFromParent(parent2);
     this.editor.container.add(this.container);
@@ -16891,22 +17026,22 @@ class DrawHole extends CommandFlowComponent {
       shortcutKeys: this.shortcutKeys,
       commandName: DrawHole.commandName,
       loop: true
-    }).add(this.createCursor("no-drop")).add(this.selectLine.bind(this), { prompt: `请选择一条线段作为空洞依附墙体, ${this.formatText("ESC")} 取消命令` });
+    }).add(this.createCursor("no-drop")).add(this.selectLine.bind(this), { prompt: `请选择一条线段作为空洞依附墙体, ${this.formatText("TAB")} 修改孔洞默认宽度, ${this.formatText("ESC")} 取消命令` });
   }
   /** 选择开始点
    * @param next 
    */
   async selectLine(next) {
-    const holeLine = LineSegment.axisY(1), wall = new Wall2D(holeLine), lineAlignmentGuide = new LineAlignmentGuide();
+    const holeLine = LineSegment.axisY(this.defaultWidth), wall = new Wall2D(holeLine), lineAlignmentGuide = new LineAlignmentGuide();
     wall.visible = false;
     lineAlignmentGuide.visible = false;
     this.container.add(wall);
     this.container.add(lineAlignmentGuide);
     wall.position.z = 0.01;
     const selector = this.createLineSelector({
-      onMove: function(line2, result) {
+      onMove: (line2, result) => {
         wall.position.set(result.point.x, result.point.y, wall.position.z);
-        LineSegment.axisY(1, holeLine);
+        LineSegment.axisY(this.defaultWidth, holeLine);
         let angle2 = 0;
         if (line2) {
           angle2 = LineSegment.angleToYAxis(line2);
@@ -16947,6 +17082,15 @@ class DrawHole extends CommandFlowComponent {
       this.container.remove(lineAlignmentGuide);
       selector.end();
     });
+    this.awaitOnlyKeys(["tab"], { once: false }).awaitEach(async () => {
+      selector.paused();
+      const w = await this.openWidthEditor({
+        defaultWidth: this.defaultWidth * 1e3,
+        title: "请输入宽度"
+      });
+      this.defaultWidth = w / 1e3;
+      selector.resume();
+    });
   }
   /** 执行完成
    */
@@ -16960,6 +17104,7 @@ class DrawHole extends CommandFlowComponent {
   onRollback(data) {
     WallInsertObject.removeInsertObject(data.line, data.insertObject);
     this.renderManager.draw();
+    return data;
   }
   /** 撤回回滚
    * @param data 
@@ -16967,6 +17112,7 @@ class DrawHole extends CommandFlowComponent {
    */
   onRevokeRollback(data) {
     this.onCompleted(data);
+    return data;
   }
 }
 const _hoisted_1$1 = {