build-dxf 0.1.25 → 0.1.26

package/package.json

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

package/src/build.js

@@ -46,7 +46,7 @@ class EventDispatcher extends EventDispatcher$1 {
   canceEventRecord(name) {
     const list = this.eventRecordStack.get(name);
     if (list) {
-      list.forEach((cancel) => cancel());
+      list.reverse().forEach((cancel) => cancel());
       this.eventRecordStack.delete(name);
     }
   }
@@ -1652,11 +1652,12 @@ class LineSegment {
   /** 克隆
    * @returns 
    */
-  clone(userData = true) {
+  clone(userData = true, cloneUUid = false) {
     const line = new LineSegment(
       this.points[0].clone(),
       this.points[1].clone()
     );
+    if (cloneUUid) line.uuid = this.uuid;
     if (userData) line.userData = cloneUserData(this.userData);
     return line;
   }
@@ -14616,7 +14617,6 @@ class DoorFind {
       dock = { dockLine: endList[0].userData, dockPoint: endList[0].point, point: line.end, pointType: "end" };
     }
     const point2 = this.adsorpt(dock, line);
-    console.log(111);
     line.userData.doorDirectConnection = true;
     if (point2) {
       line.userData.doorAutomaticFind = true;
@@ -14992,7 +14992,7 @@ class Dxf extends Component {
     let lines = this.lineSegments.filter((line) => !line.userData.isDoor);
     let doorLineList = [...this.doorLineSegment];
     if (clone2) {
-      lines = lines.map((line) => line.clone());
+      lines = lines.map((line) => line.clone(true, true));
       doorLineList = doorLineList.map((line) => line.clone());
     }
     doorLineList.forEach((line) => Object.assign(line.userData, {

package/src/index.css

@@ -284,8 +284,8 @@
   width: 100%;
 }
 
-.max-w-\[200px\] {
-  max-width: 200px;
+.max-w-\[150px\] {
+  max-width: 150px;
 }
 
 .min-w-\[150px\] {
@@ -747,7 +747,7 @@
     /* font-weight: 600; */
 }
 
-[data-v-09ada29e] {
+[data-v-a41b5baa] {
     font-family: 宋体;
 }
 

package/src/index3.js

@@ -100,8 +100,13 @@ const __vite_glob_0_18 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.de
   __proto__: null,
   default: window$1
 }, Symbol.toStringTag, { value: "Module" }));
-const ____ = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1769079533165'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='4803'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='200'%20height='200'%3e%3cpath%20d='M352%20128a134.4%20134.4%200%200%201%20128.832%2096H921.6a38.4%2038.4%200%200%201%200%2076.8H480.832a134.4%20134.4%200%200%201-257.664%200H102.4a38.4%2038.4%200%201%201%200-76.8h120.768A134.4%20134.4%200%200%201%20352%20128z%20m0%2076.8a57.6%2057.6%200%201%200%200%20115.2%2057.6%2057.6%200%200%200%200-115.2z'%20fill='%23666666'%20p-id='4804'%3e%3c/path%3e%3cpath%20d='M64%20467.2m38.4%200l819.2%200q38.4%200%2038.4%2038.4l0%200q0%2038.4-38.4%2038.4l-819.2%200q-38.4%200-38.4-38.4l0%200q0-38.4%2038.4-38.4Z'%20fill='%23666666'%20p-id='4805'%3e%3c/path%3e%3cpath%20d='M672%20614.4a134.4%20134.4%200%200%201%20128.832%2096H921.6a38.4%2038.4%200%200%201%200%2076.8h-120.768a134.4%20134.4%200%200%201-257.664%200H102.4a38.4%2038.4%200%200%201%200-76.8h440.768A134.4%20134.4%200%200%201%20672%20614.4z%20m0%2076.8a57.6%2057.6%200%201%200%200%20115.2%2057.6%2057.6%200%200%200%200-115.2z'%20fill='%23666666'%20p-id='4806'%3e%3c/path%3e%3c/svg%3e";
+const ____$1 = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1769079533165'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='4803'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='200'%20height='200'%3e%3cpath%20d='M352%20128a134.4%20134.4%200%200%201%20128.832%2096H921.6a38.4%2038.4%200%200%201%200%2076.8H480.832a134.4%20134.4%200%200%201-257.664%200H102.4a38.4%2038.4%200%201%201%200-76.8h120.768A134.4%20134.4%200%200%201%20352%20128z%20m0%2076.8a57.6%2057.6%200%201%200%200%20115.2%2057.6%2057.6%200%200%200%200-115.2z'%20fill='%23666666'%20p-id='4804'%3e%3c/path%3e%3cpath%20d='M64%20467.2m38.4%200l819.2%200q38.4%200%2038.4%2038.4l0%200q0%2038.4-38.4%2038.4l-819.2%200q-38.4%200-38.4-38.4l0%200q0-38.4%2038.4-38.4Z'%20fill='%23666666'%20p-id='4805'%3e%3c/path%3e%3cpath%20d='M672%20614.4a134.4%20134.4%200%200%201%20128.832%2096H921.6a38.4%2038.4%200%200%201%200%2076.8h-120.768a134.4%20134.4%200%200%201-257.664%200H102.4a38.4%2038.4%200%200%201%200-76.8h440.768A134.4%20134.4%200%200%201%20672%20614.4z%20m0%2076.8a57.6%2057.6%200%201%200%200%20115.2%2057.6%2057.6%200%200%200%200-115.2z'%20fill='%23666666'%20p-id='4806'%3e%3c/path%3e%3c/svg%3e";
 const __vite_glob_0_19 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  default: ____$1
+}, Symbol.toStringTag, { value: "Module" }));
+const ____ = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1769568667919'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='11114'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='200'%20height='200'%3e%3cpath%20d='M512%20617.386667c17.749333%200%2032.213333%2014.250667%2032.213333%2031.829333v182.954667a32%2032%200%200%201-32.213333%2031.829333%2032%2032%200%200%201-32.170667-31.829333v-182.954667A32%2032%200%200%201%20512%20617.386667zM96.170667%20297.216c17.749333%200%2032.213333%2014.250667%2032.213333%2031.829333v365.909334a32%2032%200%200%201-32.213333%2031.829333%2032%2032%200%200%201-32.170667-31.829333V329.045333a32%2032%200%200%201%2032.170667-31.829333zM927.829333%20297.216c17.792%200%2032.213333%2014.250667%2032.213334%2031.829333v365.909334a32%2032%200%200%201-32.213334%2031.829333%2032%2032%200%200%201-32.170666-31.829333V329.045333a32%2032%200%200%201%2032.170666-31.829333zM396.8%20580.992a32.426667%2032.426667%200%200%201%2045.525333%200%2031.658667%2031.658667%200%200%201%200%2045.056l-46.208%2045.696a32.426667%2032.426667%200%200%201-45.482666%200%2031.616%2031.616%200%200%201%200-45.056l46.208-45.653333zM581.674667%20580.949333a32.426667%2032.426667%200%200%201%2045.482666%200l46.208%2045.738667a31.658667%2031.658667%200%200%201%200%2045.056%2032.426667%2032.426667%200%200%201-45.482666%200l-46.208-45.738667a31.616%2031.616%200%200%201%200-45.056zM214.485333%20441.6a32.426667%2032.426667%200%200%201%2043.093334%202.133333c9.941333%209.898667%2011.904%2024.576%206.058666%2036.437334h109.781334a32%2032%200%200%201%2032.170666%2031.829333%2032%2032%200%200%201-32.170666%2031.872H263.637333a31.573333%2031.573333%200%200%201-6.101333%2036.437333%2032.426667%2032.426667%200%200%201-43.050667%202.133334l-2.432-2.133334-46.208-45.781333a31.616%2031.616%200%200%201%200-45.013333L212.053333%20443.733333l2.432-2.133333zM766.464%20443.733333a32.426667%2032.426667%200%200%201%2045.482667%200l46.208%2045.781334%202.218666%202.389333a31.616%2031.616%200%200%201-2.218666%2042.666667L811.946667%20580.266667l-2.432%202.133333a32.426667%2032.426667%200%200%201-43.093334-2.133333%2031.573333%2031.573333%200%200%201-6.101333-36.437334H650.666667a32%2032%200%200%201-32.170667-31.872%2032%2032%200%200%201%2032.170667-31.829333h109.781333a31.488%2031.488%200%200%201%206.058667-36.437333zM512%20466.304c25.514667%200%2046.208%2020.48%2046.208%2045.738667%200%2025.258667-20.693333%2045.696-46.208%2045.696s-46.208-20.48-46.208-45.696c0-25.258667%2020.693333-45.738667%2046.208-45.738667zM350.848%20352.256a32.426667%2032.426667%200%200%201%2045.482667%200.085333l46.08%2045.696a31.658667%2031.658667%200%200%201-0.128%2045.098667%2032.426667%2032.426667%200%200%201-45.482667-0.085333L350.72%20397.312a31.616%2031.616%200%200%201%200.128-45.056zM627.882667%20352.298667a32.426667%2032.426667%200%200%201%2045.482666%200%2031.616%2031.616%200%200%201%200%2045.056l-46.208%2045.653333a32.426667%2032.426667%200%200%201-45.482666%200%2031.616%2031.616%200%200%201%200-45.013333l46.208-45.696zM512%20160c17.749333%200%2032.213333%2014.250667%2032.213333%2031.829333v182.954667A32%2032%200%200%201%20512%20406.613333a32%2032%200%200%201-32.170667-31.829333V191.829333A32%2032%200%200%201%20512%20160z'%20p-id='11115'%3e%3c/path%3e%3c/svg%3e";
+const __vite_glob_0_20 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: ____
 }, Symbol.toStringTag, { value: "Module" }));
@@ -10647,12 +10652,14 @@ class CommandFlowComponent extends Component {
   get confirmKeys() {
     return this.constructor.confirmKeys;
   }
+  container = new THREE.Group();
   constructor() {
     super();
-  }
-  onAddFromParent(parent) {
-    this.editor.addEventListener("cancelCommand", () => {
-      this.cancel();
+    this.addEventListener("addFromParent", () => {
+      this.editor.container.add(this.container);
+      this.editor.addEventListener("cancelCommand", () => {
+        this.cancel();
+      });
     });
   }
   /**
@@ -10755,6 +10762,274 @@ class CommandFlowComponent extends Component {
   formatText(text, color = "var(--primary-color)", style = "") {
     return `<span style="color: ${color};${style}">${text}</span>`;
   }
+  /** 创建追随提示消息
+   * @param text 
+   * @param clearNames 
+   * @param style 
+   * @returns 
+   */
+  createFollowPrompts(text, clearNames, style = {}) {
+    const pointer = this.editor.domEventRegister.pointer;
+    const textObj = document.createElement("div");
+    textObj.innerText = text;
+    textObj.style.position = "absolute";
+    textObj.style.color = "#fff";
+    textObj.style.fontSize = "10px";
+    textObj.style.padding = "4px 6px";
+    textObj.style.background = "rgba(0,0,0,0.3)";
+    textObj.style.whiteSpace = "nowrap";
+    textObj.style.borderRadius = "6px";
+    textObj.style.pointerEvents = "none";
+    Object.assign(textObj.style, style);
+    this.domElement.appendChild(textObj);
+    let height = 0;
+    const { destroy } = this.createPointerMove(() => {
+      textObj.style.left = pointer.x + "px";
+      textObj.style.top = pointer.y - height + "px";
+    }), resizeObserver = new ResizeObserver(() => {
+      const rect = textObj.getBoundingClientRect();
+      height = rect.height;
+    }), cancel = () => {
+      destroy();
+      resizeObserver.disconnect();
+      textObj.remove();
+    };
+    resizeObserver.observe(textObj);
+    clearNames.forEach((name) => this.addEventRecord(name, cancel));
+    return textObj;
+  }
+  /** 创建线段选择器
+   * @returns 
+   */
+  createLineSelector() {
+    const editor = this.editor, eventInput = editor.eventInput, object3D = new THREE.Mesh(), wiLine = new LineSegment();
+    let currentSelectLine = null;
+    let cursor = this.domElement.style.cursor;
+    wiLine.userData.isWinLine = true;
+    object3D.position.z = 2e-3;
+    object3D.material = new THREE.MeshBasicMaterial({ color: 55561 });
+    let mode = "none";
+    const update = (line2) => {
+      const rectangle = line2.expandToRectangle(0.025, "bothSides");
+      object3D.geometry = editor.renderManager.createGeometry({ position: rectangle.createGeometry() }, 6);
+      this.container.add(object3D);
+    };
+    function getWindow(line2, point) {
+      if (line2.userData.isWindow) {
+        const direction = line2.direction();
+        if (mode === "all" || mode === "window") {
+          const index2 = line2.userData.drawWindow?.findIndex((d) => {
+            Point.from(d.p).expandAsLine(direction, d.width, {}, wiLine).directionMove(direction, -d.width * 0.5);
+            return wiLine.isPointOnSegment(Point.from(point));
+          });
+          if (index2 > -1) {
+            wiLine.currentData.line = line2;
+            wiLine.currentData.index = index2;
+            wiLine.userData.isWinLine = true;
+            return wiLine;
+          }
+        }
+      }
+      return null;
+    }
+    function getDoor(line2) {
+      if (line2.userData.isDoor) return line2;
+      return null;
+    }
+    const ppcEventCancel = editor.addEventListener("pointerPositionChange", () => {
+      const { line: line2, point } = editor.renderManager.adsorption();
+      currentSelectLine = null;
+      if (line2) {
+        this.container.add(object3D);
+        if (mode === "window" || mode === "all") {
+          const winLine = getWindow(line2, point);
+          if (winLine) currentSelectLine = winLine;
+        }
+        if (!currentSelectLine && (mode === "door" || mode === "all")) {
+          const doorLine = getDoor(line2);
+          if (doorLine) currentSelectLine = doorLine;
+        }
+        if (!currentSelectLine && (mode === "wall" || mode === "all")) {
+          if (!line2.userData.isDoor) currentSelectLine = line2;
+        }
+      }
+      if (currentSelectLine) {
+        update(currentSelectLine);
+        this.domElement.style.cursor = "pointer";
+      } else {
+        object3D.removeFromParent();
+        currentSelectLine = null;
+        this.domElement.style.cursor = cursor;
+      }
+    });
+    return {
+      get: async (mode_ = "all") => {
+        mode = mode_;
+        currentSelectLine = null;
+        return new Promise((resolve) => {
+          const eventCancel = eventInput.addEventListener("codeChange", () => {
+            if (eventInput.isKeyDown("mouse_0") && currentSelectLine) {
+              resolve(currentSelectLine);
+              eventCancel();
+              object3D.removeFromParent();
+              this.domElement.style.cursor = cursor;
+            }
+          });
+        });
+      },
+      destroy() {
+        ppcEventCancel();
+        object3D.removeFromParent();
+      }
+    };
+  }
+  /** 创建点选择器
+   * @returns 
+   */
+  createPointSelector() {
+    const editor = this.editor, eventInput = editor.eventInput, pointMesh = this.renderer.createCircle(new Point(0, 0), { size: 12, color: 65280 }, this.container);
+    let cursor = this.domElement.style.cursor;
+    let mode = "null";
+    let point = null;
+    let line2 = void 0;
+    pointMesh.position.z = 5e-3;
+    pointMesh.visible = false;
+    const ppcEventCancel = editor.addEventListener("pointerPositionChange", () => {
+      point = null;
+      if (mode !== "null") {
+        let { point: p, mode: m, line: l } = editor.renderManager.adsorption(0.08);
+        line2 = l;
+        if (!m) m = "empty";
+        if (mode === "all") point = p;
+        if (!point && mode.indexOf(m) > -1) point = p;
+      }
+      if (point) {
+        pointMesh.position.copy(point);
+        if (this.domElement.style.cursor !== "none") cursor = this.domElement.style.cursor;
+        this.domElement.style.cursor = "none";
+        pointMesh.visible = true;
+      } else {
+        this.domElement.style.cursor = cursor;
+        pointMesh.visible = false;
+      }
+    });
+    return {
+      get: async (mode_) => {
+        mode = mode_;
+        return new Promise((resolve) => {
+          const eventCancel = eventInput.addEventListener("codeChange", () => {
+            if (eventInput.isKeyDown("mouse_0") && point) {
+              mode = "null";
+              this.domElement.style.cursor = cursor;
+              resolve({ point: Point.from(point), line: line2 });
+              eventCancel();
+            }
+          });
+        });
+      },
+      destroy() {
+        ppcEventCancel();
+        pointMesh.removeFromParent();
+      }
+    };
+  }
+  /**
+   * 创建拖拽点
+   */
+  createDragPoint(point, onChange) {
+    point = point.clone();
+    const div = document.createElement("div");
+    const defaultWidth = "10px";
+    const object3D = this.renderer.createText("", point, {
+      position: "absolute",
+      background: "rgb(255,255,255)",
+      borderRadius: "100px",
+      width: defaultWidth,
+      height: defaultWidth,
+      pointerEvents: "all",
+      cursor: "pointer",
+      transition: "0.25s background"
+    }, this.container);
+    const move = () => {
+      const { point: pos, line: line2 } = this.renderManager.adsorption();
+      if (line2) {
+        object3D.element.style.width = defaultWidth;
+        object3D.element.style.height = defaultWidth;
+      } else {
+        object3D.element.style.width = "2px";
+        object3D.element.style.height = "2px";
+      }
+      object3D.position.x = pos.x;
+      object3D.position.y = pos.y;
+      point.copy(pos);
+      onChange(point);
+    };
+    const mouseup = () => {
+      object3D.element.style.pointerEvents = "all";
+      object3D.element.style.background = "#fff";
+      object3D.element.style.width = defaultWidth;
+      object3D.element.style.height = defaultWidth;
+      document.removeEventListener("mousemove", move);
+      document.removeEventListener("mouseup", mouseup);
+    };
+    object3D.element.addEventListener("mousedown", (e) => {
+      object3D.element.style.pointerEvents = "none";
+      object3D.element.style.background = "#00ff00";
+      object3D.element.style.width = "2px";
+      object3D.element.style.height = "2px";
+      document.addEventListener("mousemove", move);
+      document.addEventListener("mouseup", mouseup);
+      e.stopPropagation();
+      e.preventDefault();
+    });
+    const cancel = () => {
+      div.remove();
+      object3D.removeFromParent();
+    };
+    return cancel;
+  }
+  /**
+   * 创建选择点
+   */
+  createClickPoint(point, onClick) {
+    const div = document.createElement("div");
+    const defaultWidth = "10px";
+    const object3D = this.renderer.createText("", point, {
+      position: "absolute",
+      background: "rgb(255,255,255)",
+      borderRadius: "100px",
+      width: defaultWidth,
+      height: defaultWidth,
+      pointerEvents: "all",
+      cursor: "pointer",
+      transition: "0.25s background"
+    }, this.container);
+    object3D.element.addEventListener("mousedown", (e) => {
+      onClick();
+      e.stopPropagation();
+      e.preventDefault();
+    });
+    const cancel = () => {
+      div.remove();
+      object3D.removeFromParent();
+    };
+    return cancel;
+  }
+  /** 等待一组按键按下
+   * @param keys 
+   * @returns 
+   */
+  awaitOnlyKey(keys2) {
+    return new Promise((resolve) => {
+      const cancel = this.eventInput.addEventListener("codeChange", () => {
+        if (this.eventInput.isOnlyKeyDowns(keys2)) {
+          resolve(true);
+          cancel();
+        }
+      });
+      this.addEventRecord("clear", cancel);
+    });
+  }
 }
 class Default extends CommandFlowComponent {
   static name = "Default";
@@ -12759,59 +13034,41 @@ class PointDrag extends CommandFlowComponent {
     super.onAddFromParent(parent);
     this.editor.container.add(this.container);
     this.container.position.z = 1e-3;
-    const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("crosshair")).add(this.selectPoint.bind(this), { prompt: `请选择需要修改线段的 ${this.formatText("端点")}, ${this.formatText("ESC")} 取消命令` }).add(this.drag.bind(this), { prompt: `${this.formatText("Shift")} 键锁定线段移动方向，${this.formatText("L")} 键输入线段长度` }).addRollback(this.rollback.bind(this)).addRevokeRollback(this.revokeRollback.bind(this));
+    const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.selectLine.bind(this), { prompt: `请选择需要修改的线段, ${this.formatText("ESC")} 取消命令` }).add(this.selectPoint.bind(this), { prompt: `请选择需要修改线段的 ${this.formatText("端点")}, ${this.formatText("ESC")} 取消命令` }).add(this.drag.bind(this), { prompt: `${this.formatText("Shift")} 键锁定线段移动方向，${this.formatText("L")} 键输入线段长度` }).addRollback(this.rollback.bind(this)).addRevokeRollback(this.revokeRollback.bind(this));
     commandFlow.addEventListener("finally", this.createFinally());
     commandFlow.addEventListener("completed", (e) => this.completed(e.data));
     this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
     this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));
     this.eventInput.addCancelDefaultBehavior(() => this.eventInput.isOnlyKeyDowns(this.shortcutKeys));
   }
+  async selectLine(next) {
+    this.createFollowPrompts("请选择需要修改的线段", ["clear", "selectLine"]);
+    const lineSelector = this.createLineSelector();
+    this.addEventRecord("clear", lineSelector.destroy);
+    const line2 = await lineSelector.get("wall");
+    lineSelector.destroy();
+    this.canceEventRecord("selectLine");
+    next(line2);
+  }
   /** 选择开始点
    * @param next 
    */
-  selectPoint(next) {
-    let currentPoint = null, circle = this.renderer.createCircle(Point.zero(), { color: 16711935 }), currentLine = null, lineObj = new Lines([], 15658734);
-    this.container.add(lineObj);
-    lineObj.visible = false;
-    lineObj.position.z = -1e-3;
-    const eventChange = this.editor.addEventListener("pointerPositionChange", () => {
-      const { point, line: line2, find, mode } = this.editor.renderManager.adsorption();
-      this.dispatchEvent({ type: "pointerMove", point });
-      if (find && mode === "point") {
-        this.domElement.style.cursor = "none";
-        circle.position.copy(point);
-        currentLine = line2;
-        currentPoint = point.clone();
-        this.container.add(circle);
-        lineObj.visible = true;
-        const points = line2.expandToRectangle(0.02, "bothSides").points.map((p) => new THREE.Vector3(p.x, p.y, 0));
-        lineObj.setPoint(...points);
-      } else {
-        this.domElement.style.cursor = "no-drop";
-        currentPoint = null;
-        lineObj.visible = false;
-        circle.removeFromParent();
-      }
-    });
-    this.addEventRecord("selectPointStart").add(eventChange).add(() => lineObj.removeFromParent()).add(this.eventInput.addEventListener("codeChange", () => {
-      if (this.eventInput.isKeyDown("mouse_0") && currentPoint) {
-        this.canceEventRecord("selectPointStart");
-        circle.material.color.set(65280);
-        next({ point: currentPoint, line: currentLine });
-      }
-    }));
-    this.addEventRecord("clear").add(() => {
-      circle.removeFromParent();
-      eventChange();
-      lineObj.removeFromParent();
-    });
+  selectPoint(next, line2) {
+    this.createFollowPrompts("请选择一个端点", ["selectPoint", "clear"]);
+    const list = [
+      this.createClickPoint(line2.start, () => {
+        this.canceEventRecord("selectPoint");
+        next({ line: line2, point: new THREE.Vector3(line2.start.x, line2.start.y, 0) });
+      }),
+      this.createClickPoint(line2.end, () => {
+        this.canceEventRecord("selectPoint");
+        next({ line: line2, point: new THREE.Vector3(line2.end.x, line2.end.y, 0) });
+      })
+    ];
+    this.addEventRecord("selectPoint", ...list);
+    this.addEventRecord("clear", ...list);
   }
-  /** 拖拽点
-   * @description 拖拽点到指定位置
-   * @param next 
-   * @param param1 
-   */
-  drag(next, { point, line: line2 }) {
+  drag(next, { line: line2, point }) {
     this.domElement.style.cursor = "crosshair";
     const mode = line2.start.equal(Point.from(point)) ? "start" : "end", start = mode == "start" ? new THREE.Vector3(line2.end.x, line2.end.y, 0) : new THREE.Vector3(line2.start.x, line2.start.y, 0), end = point.clone(), lines = new Lines([start, end], 16711935), circle = this.renderer.createCircle(Point.zero(), { color: 16711935, size: 10 }), textObj3D = this.renderer.createText("", new THREE.Vector3(0, 0, 0), {
       // background: 'rgba(0,0,0,0.5)',
@@ -12992,9 +13249,161 @@ class StorageHelper {
     localStorage.setItem(key, String(vaalue));
   }
 }
+function buildDashedHelperLine$1(start, end, offset = 0.5) {
+  const offsetDistance = end.normal(start).multiplyScalar(offset);
+  const startOffPoint = start.clone().add(offsetDistance);
+  const endOffPoint = end.clone().add(offsetDistance);
+  return [
+    start,
+    startOffPoint,
+    endOffPoint,
+    end
+  ];
+}
+class RayDistance extends CommandFlowComponent {
+  static name = "RayDistance";
+  container = new THREE.Group();
+  static shortcutKeys = ["R"];
+  static commandName = "RayDistance";
+  onAddFromParent(parent) {
+    super.onAddFromParent(parent);
+    this.editor.container.add(this.container);
+    const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择线段上的一个点作为发射点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择发射点, ${this.formatText("ESC")} 取消命令` }).setLoop(true);
+    commandFlow.addEventListener("finally", this.createFinally());
+    this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
+    this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));
+    this.eventInput.addCancelDefaultBehavior(() => this.eventInput.isOnlyKeyDowns(this.shortcutKeys));
+  }
+  /** 选择点
+   * @param next 
+   */
+  async selectPoint(next) {
+    const pointSelector = this.createPointSelector();
+    this.addEventRecord("clear", () => {
+      pointSelector.destroy();
+      this.container.clear();
+    });
+    const result = await pointSelector.get("line_point");
+    next(result);
+  }
+  /** 射线
+   * @param points 
+   */
+  async ray(next, { line: line2, point }) {
+    const normal = line2.normal(), nNormal = normal.clone().multiplyScalar(-1), rayLine1 = new LineSegment(point, point.clone().add(normal.multiplyScalar(100))), rayLine2 = new LineSegment(point, point.clone().add(nNormal.multiplyScalar(100)));
+    const lineObj = this.renderer.createLineSegments([rayLine1, rayLine2], 0, { color: 196352 }, this.container);
+    [rayLine1, rayLine2].forEach((rayLine) => {
+      const points = this.renderManager.quadtree.queryLineSegment(rayLine).filter((item) => item.line !== rayLine).map((item) => rayLine.getIntersection(item.line)).filter((p) => !!p);
+      points.sort((a, b) => point.distance(a) - point.distance(b)).forEach((p, i) => {
+        const distance = point.distance(p) * 1e3;
+        if (distance < 1e-3) return;
+        const points2 = buildDashedHelperLine$1(point, p, i * 0.3);
+        const auxiliaryLine = new Lines();
+        auxiliaryLine.position.z = 6e-3;
+        auxiliaryLine.material = new THREE.LineDashedMaterial({
+          color: 16777215,
+          dashSize: 0.02,
+          gapSize: 0.02
+        });
+        auxiliaryLine.setPoint(...points2.map((p2) => new THREE.Vector3(p2.x, p2.y, 0)));
+        this.container.add(auxiliaryLine);
+        setTimeout(() => auxiliaryLine.computeLineDistances());
+        const text = this.renderer.createText(Number(distance.toFixed(0)) + "mm", points2[1].clone().add(points2[2]).multiplyScalar(0.5), {
+          background: "#333333",
+          padding: "2px 4px",
+          borderRadius: "6px",
+          color: "#fff"
+        }, this.container);
+        const circle = this.renderer.createCircle(p, {}, this.container);
+        this.addEventRecord("clear", () => {
+          auxiliaryLine.removeFromParent();
+          text.removeFromParent();
+          circle.removeFromParent();
+        });
+      });
+    });
+    this.addEventRecord("clear", () => {
+      lineObj.removeFromParent();
+    });
+    await this.awaitOnlyKey(["enter"]);
+    next();
+  }
+}
+function buildDashedHelperLine(start, end, offset = 0.5) {
+  const offsetDistance = end.normal(start).multiplyScalar(offset);
+  const startOffPoint = start.clone().add(offsetDistance);
+  const endOffPoint = end.clone().add(offsetDistance);
+  return [
+    start,
+    startOffPoint,
+    endOffPoint,
+    end
+  ];
+}
+class ManualDistance extends CommandFlowComponent {
+  static name = "ManualDistance";
+  container = new THREE.Group();
+  static shortcutKeys = ["M"];
+  static commandName = "ManualDistance";
+  onAddFromParent(parent) {
+    super.onAddFromParent(parent);
+    this.editor.container.add(this.container);
+    const commandFlow = this.commandManager.addCommandFlow(this.commandName).add(this.createInterrupt()).add(this.createCursor("no-drop")).add(this.selectPoint.bind(this), { prompt: `请选择两个点, ${this.formatText("ESC")} 取消命令` }).add(this.ray.bind(this), { prompt: `按 ${this.formatText("Enter")} 重新选择, ${this.formatText("ESC")} 取消命令` }).setLoop(true);
+    commandFlow.addEventListener("finally", this.createFinally());
+    this.eventInput.addKeyCombination(this.commandName, this.shortcutKeys);
+    this.eventInput.addEventListener("codeChange", async () => this.eventInput.isKeyCombination(this.commandName) && await this.commandManager.start(this.commandName));
+    this.eventInput.addCancelDefaultBehavior(() => this.eventInput.isOnlyKeyDowns(this.shortcutKeys));
+  }
+  /** 选择点
+   * @param next 
+   */
+  async selectPoint(next) {
+    const pointSelector = this.createPointSelector();
+    this.addEventRecord("clear", () => {
+      this.container.clear();
+      pointSelector.destroy();
+    });
+    const point1 = (await pointSelector.get("all")).point;
+    this.renderer.createCircle(point1, {}, this.container);
+    const point2 = (await pointSelector.get("all")).point;
+    this.renderer.createCircle(point2, {}, this.container);
+    pointSelector.destroy();
+    next({ point1, point2 });
+  }
+  /** 射线
+   * @param points 
+   */
+  async ray(next, { point1, point2 }) {
+    this.renderer.createLineSegments([new LineSegment(point1, point2)], 0, { color: 65280 }, this.container);
+    const distance = point1.distance(point2) * 1e3;
+    const points = buildDashedHelperLine(point1, point2, 0.3);
+    const auxiliaryLine = new Lines();
+    auxiliaryLine.position.z = 6e-3;
+    auxiliaryLine.material = new THREE.LineDashedMaterial({
+      color: 16777215,
+      dashSize: 0.02,
+      gapSize: 0.02
+    });
+    auxiliaryLine.setPoint(...points.map((p) => new THREE.Vector3(p.x, p.y, 0)));
+    this.container.add(auxiliaryLine);
+    setTimeout(() => auxiliaryLine.computeLineDistances());
+    const text = this.renderer.createText(Number(distance.toFixed(0)) + "mm", points[1].clone().add(points[2]).multiplyScalar(0.5), {
+      background: "#333333",
+      padding: "2px 4px",
+      borderRadius: "6px",
+      color: "#fff"
+    }, this.container);
+    this.addEventRecord("clear", () => {
+      auxiliaryLine.removeFromParent();
+      text.removeFromParent();
+    });
+    await this.awaitOnlyKey(["enter"]);
+    next();
+  }
+}
 const _hoisted_1 = {
   key: 0,
-  class: "p-[5px] max-w-[200px] min-w-[200px]"
+  class: "p-[5px] max-w-[150px] min-w-[150px]"
 };
 const _hoisted_2 = { class: "text-[14px] flex flex-col" };
 const _hoisted_3 = ["onClick"];
@@ -13056,7 +13465,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       queueMicrotask(() => variable.set("currentKeyUp", "enter"));
     }
     const props = __props;
-    const dxfVisible = ref(true), isLook = ref(false), toolBarExpand = ref(StorageHelper.getBoolean("toolBarExpand", true)), currentCommand = ref(""), dxfSystem = toRaw(props.dxfSystem), domEventRegister = dxfSystem.findComponentByType(DomEventRegister), editor = dxfSystem.findComponentByType(Editor), defaultComponent = dxfSystem.findComponentByType(Default), whiteModel = dxfSystem.findComponentByType(WhiteModel), threeVJia = dxfSystem.findComponentByType(ThreeVJia), variable = dxfSystem.findComponentByType(Variable), drawLine = dxfSystem.findComponentByType(DrawLine), rollbackCount = ref(0), revokeRollbackCount = ref(0), drawLineCount = ref(0), images = /* @__PURE__ */ Object.assign({ "./assets/images/VerticalCorr.svg": __vite_glob_0_0, "./assets/images/VerticalCorrContinue.svg": __vite_glob_0_1, "./assets/images/angle.svg": __vite_glob_0_2, "./assets/images/close.svg": __vite_glob_0_3, "./assets/images/connection.svg": __vite_glob_0_4, "./assets/images/cutLine.svg": __vite_glob_0_5, "./assets/images/deleteSelectLine.svg": __vite_glob_0_6, "./assets/images/deleteSelectWindow.svg": __vite_glob_0_7, "./assets/images/door.svg": __vite_glob_0_8, "./assets/images/dxf.svg": __vite_glob_0_9, "./assets/images/intersectionConnection.svg": __vite_glob_0_10, "./assets/images/line.svg": __vite_glob_0_11, "./assets/images/mergeLine.svg": __vite_glob_0_12, "./assets/images/revokeRollback.svg": __vite_glob_0_13, "./assets/images/rollback.svg": __vite_glob_0_14, "./assets/images/selectAll.svg": __vite_glob_0_15, "./assets/images/selectPoint.svg": __vite_glob_0_16, "./assets/images/verticalLine.svg": __vite_glob_0_17, "./assets/images/window.svg": __vite_glob_0_18, "./assets/images/属性面板.svg": __vite_glob_0_19 }), selectLineCount = ref(0), selectWinLineCount = ref(0), hasWindowLine = ref(false), commandList = [
+    const dxfVisible = ref(true), isLook = ref(false), toolBarExpand = ref(StorageHelper.getBoolean("toolBarExpand", true)), currentCommand = ref(""), dxfSystem = toRaw(props.dxfSystem), domEventRegister = dxfSystem.findComponentByType(DomEventRegister), editor = dxfSystem.findComponentByType(Editor), defaultComponent = dxfSystem.findComponentByType(Default), whiteModel = dxfSystem.findComponentByType(WhiteModel), threeVJia = dxfSystem.findComponentByType(ThreeVJia), variable = dxfSystem.findComponentByType(Variable), drawLine = dxfSystem.findComponentByType(DrawLine), rollbackCount = ref(0), revokeRollbackCount = ref(0), drawLineCount = ref(0), images = /* @__PURE__ */ Object.assign({ "./assets/images/VerticalCorr.svg": __vite_glob_0_0, "./assets/images/VerticalCorrContinue.svg": __vite_glob_0_1, "./assets/images/angle.svg": __vite_glob_0_2, "./assets/images/close.svg": __vite_glob_0_3, "./assets/images/connection.svg": __vite_glob_0_4, "./assets/images/cutLine.svg": __vite_glob_0_5, "./assets/images/deleteSelectLine.svg": __vite_glob_0_6, "./assets/images/deleteSelectWindow.svg": __vite_glob_0_7, "./assets/images/door.svg": __vite_glob_0_8, "./assets/images/dxf.svg": __vite_glob_0_9, "./assets/images/intersectionConnection.svg": __vite_glob_0_10, "./assets/images/line.svg": __vite_glob_0_11, "./assets/images/mergeLine.svg": __vite_glob_0_12, "./assets/images/revokeRollback.svg": __vite_glob_0_13, "./assets/images/rollback.svg": __vite_glob_0_14, "./assets/images/selectAll.svg": __vite_glob_0_15, "./assets/images/selectPoint.svg": __vite_glob_0_16, "./assets/images/verticalLine.svg": __vite_glob_0_17, "./assets/images/window.svg": __vite_glob_0_18, "./assets/images/属性面板.svg": __vite_glob_0_19, "./assets/images/激光测距.svg": __vite_glob_0_20 }), selectLineCount = ref(0), selectWinLineCount = ref(0), hasWindowLine = ref(false), commandList = [
       {
         command: "default",
         name: "默认",
@@ -13098,6 +13507,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         show: true,
         src: images["./assets/images/cutLine.svg"].default,
         shortcut: ClippingLine.shortcutKeys.join(" + ")
+      },
+      {
+        command: RayDistance.commandName,
+        name: "射线测距",
+        show: true,
+        src: images["./assets/images/激光测距.svg"].default,
+        shortcut: RayDistance.shortcutKeys.join(" + ")
+      },
+      {
+        command: ManualDistance.commandName,
+        name: "手动测距",
+        show: true,
+        src: images["./assets/images/激光测距.svg"].default,
+        shortcut: ManualDistance.shortcutKeys.join(" + ")
       }
     ], otherCommandList = [
       {
@@ -13190,11 +13613,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       },
       {
-        command: DeleteSelectLine.commandName,
+        command: PropertiesPanel.commandName,
         name: "属性面板",
         show: computed(() => true),
         src: images["./assets/images/属性面板.svg"].default,
-        shortcut: DeleteSelectLine.shortcutKeys.join(" + "),
+        shortcut: PropertiesPanel.shortcutKeys.join(" + "),
         action() {
           variable.set("currentKeyDown", "i");
           queueMicrotask(() => variable.set("currentKeyUp", "i"));
@@ -13495,7 +13918,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-09ada29e"]]);
+const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a41b5baa"]]);
 class Editor extends Component {
   static name = "Editor";
   container = new THREE.Group();
@@ -13682,6 +14105,8 @@ function Editor_(dxfSystem, option = {}) {
   dxfSystem.addComponent(new VerticalReferenceLine());
   dxfSystem.addComponent(new ClippingLine());
   dxfSystem.addComponent(new PropertiesPanel());
+  dxfSystem.addComponent(new RayDistance());
+  dxfSystem.addComponent(new ManualDistance());
 }
 const EditorPlugin = Object.assign(Editor_, {
   create(option = {}) {

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

@@ -1,4 +1,4 @@
-import { Component, ComponentManager } from '../../../../../ComponentManager';
+import { Component } from '../../../../../ComponentManager';
 import { Editor } from '../Editor';
 import { EventInput, Renderer } from '../../../RenderPlugin/components';
 import { CommandManager } from '../../../../../CommandManager';
@@ -6,6 +6,7 @@ import { RenderManager } from '../RenderManager';
 import { Default } from './Default';
 import { LineSegment } from '../../../../../LineSegment';
 import { Point } from '../../../../../Point';
+import * as THREE from "three";
 export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Component<TEventMap & {}> {
     static interruptKeys: string[];
     static confirmKeys: string[];
@@ -28,8 +29,8 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
     get interruptKeys(): string[];
     get shortcutKeys(): string[];
     get confirmKeys(): string[];
+    container: THREE.Group<THREE.Object3DEventMap>;
     constructor();
-    onAddFromParent(parent: ComponentManager): void;
     /**
      * 取消
      */
@@ -60,4 +61,41 @@ export declare class CommandFlowComponent<TEventMap extends {} = {}> extends Com
         setBaseLine(line: LineSegment | null, point: Point | null): void;
     };
     formatText(text: string, color?: string, style?: string): string;
+    /** 创建追随提示消息
+     * @param text
+     * @param clearNames
+     * @param style
+     * @returns
+     */
+    createFollowPrompts(text: string, clearNames: string[], style?: Record<string, any>): HTMLDivElement;
+    /** 创建线段选择器
+     * @returns
+     */
+    createLineSelector(): {
+        get: (mode_?: "all" | "wall" | "door" | "window" | "none") => Promise<unknown>;
+        destroy(): void;
+    };
+    /** 创建点选择器
+     * @returns
+     */
+    createPointSelector(): {
+        get: (mode_: "all" | "point" | "line" | "empty" | "line_point" | "line_empty" | "point_empty" | "null") => Promise<{
+            point: Point;
+            line?: LineSegment;
+        }>;
+        destroy(): void;
+    };
+    /**
+     * 创建拖拽点
+     */
+    createDragPoint(point: Point, onChange: (p: Point) => void): () => void;
+    /**
+     * 创建选择点
+     */
+    createClickPoint(point: Point, onClick: () => void): () => void;
+    /** 等待一组按键按下
+     * @param keys
+     * @returns
+     */
+    awaitOnlyKey(keys: string[]): Promise<unknown>;
 }

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

@@ -0,0 +1,23 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { Point } from '../../../../../Point';
+import * as THREE from "three";
+/**
+ * 生成长度标记辅助虚线
+ */
+export declare function buildDashedHelperLine(start: Point, end: Point, offset?: number): Point[];
+export declare class ManualDistance extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    static shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /** 选择点
+     * @param next
+     */
+    private selectPoint;
+    /** 射线
+     * @param points
+     */
+    private ray;
+}

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

@@ -12,18 +12,14 @@ export declare class PointDrag extends CommandFlowComponent<{
     static shortcutKeys: string[];
     static commandName: string;
     onAddFromParent(parent: ComponentManager): void;
+    selectLine(next: any): Promise<void>;
     /** 选择开始点
      * @param next
      */
-    selectPoint(next: any): void;
-    /** 拖拽点
-     * @description 拖拽点到指定位置
-     * @param next
-     * @param param1
-     */
-    drag(next: any, { point, line }: {
-        point: THREE.Vector3;
+    selectPoint(next: any, line: LineSegment): void;
+    drag(next: any, { line, point }: {
         line: LineSegment;
+        point: THREE.Vector3;
     }): void;
     /** 执行完成
      */

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

@@ -0,0 +1,23 @@
+import { CommandFlowComponent } from './CommandFlowComponent';
+import { ComponentManager } from '../../../../../ComponentManager';
+import { Point } from '../../../../../Point';
+import * as THREE from "three";
+/**
+ * 生成长度标记辅助虚线
+ */
+export declare function buildDashedHelperLine(start: Point, end: Point, offset?: number): Point[];
+export declare class RayDistance extends CommandFlowComponent<{}> {
+    static name: string;
+    container: THREE.Group<THREE.Object3DEventMap>;
+    static shortcutKeys: string[];
+    static commandName: string;
+    onAddFromParent(parent: ComponentManager): void;
+    /** 选择点
+     * @param next
+     */
+    private selectPoint;
+    /** 射线
+     * @param points
+     */
+    private ray;
+}

package/src/utils/LineSegment.d.ts

@@ -217,7 +217,7 @@ export declare class LineSegment<T = Record<string, any>> {
     /** 克隆
      * @returns
      */
-    clone(userData?: boolean): LineSegment<T>;
+    clone(userData?: boolean, cloneUUid?: boolean): LineSegment<T>;
     /**
      * 获取最长线段
      * @param lines