build-dxf 0.1.36 → 0.1.38

package/package.json

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

package/src/index.css

@@ -1169,10 +1169,10 @@ button[data-v-f2bc3db4]:active {
     color: #a7a7a7
 }
 
-[data-v-75418819] {
+[data-v-b369d5e1] {
     font-family: 宋体;
 }
-.button[data-v-75418819] {
+.button[data-v-b369d5e1] {
     padding: 5px 10px;
     border: none;
     background: var(--primary-color);

package/src/index3.js

@@ -9707,37 +9707,43 @@ class RenderManager extends Component {
     radius = radius ?? isMobileRef.value ? 0.08 : 0.06;
     quadtree = quadtree ?? this.quadtree;
     const editor = this.parent?.findComponentByName("Editor"), point = Point.from(editor.pointerPosition);
-    let result = this.lineAdsorption.value ? quadtree.queryCircle(point, radius) : [];
-    if (result.length) {
-      let projectList = result.map((res) => ({
+    let result = {
+      point: new THREE.Vector3(editor.pointerPosition.x, editor.pointerPosition.y, 0),
+      find: false,
+      line: void 0,
+      mode: void 0
+    };
+    let queryResult = this.lineAdsorption.value ? quadtree.queryCircle(point, radius) : [];
+    if (queryResult.length) {
+      let projectList = queryResult.map((res) => ({
         point: res.line.projectPoint(point),
         line: res.line
       })).filter((item) => !!item.point);
       projectList.sort((a, b) => a.point.distance(point) - b.point.distance(point));
       if (projectList.length) {
-        const line2 = projectList[0].line, projectPoint = projectList[0].point, opt = {
+        const line2 = projectList[0].line, projectPoint = projectList[0].point;
+        result = {
           point: new THREE.Vector3(projectPoint.x, projectPoint.y, 0),
           find: true,
           mode: "line",
           line: line2
         };
-        if (!this.pointAdsorption.value) return opt;
-        if (line2.start.distance(point) < radius * 1.5) {
-          opt.point.set(line2.start.x, line2.start.y, 0);
-          opt.mode = "point";
-        } else if (line2.end.distance(point) < radius * 1.5) {
-          opt.point.set(line2.end.x, line2.end.y, 0);
-          opt.mode = "point";
+        if (this.pointAdsorption.value) {
+          if (line2.start.distance(point) < radius * 1.5) {
+            result.point.set(line2.start.x, line2.start.y, 0);
+            result.mode = "point";
+          } else if (line2.end.distance(point) < radius * 1.5) {
+            result.point.set(line2.end.x, line2.end.y, 0);
+            result.mode = "point";
+          }
         }
-        return opt;
       }
     }
-    return {
-      point: new THREE.Vector3(editor.pointerPosition.x, editor.pointerPosition.y, 0),
-      find: false,
-      line: void 0,
-      mode: void 0
-    };
+    this.dispatchEvent({
+      type: "adsorptionPointChange",
+      ...result
+    });
+    return result;
   }
   /**
    * 辅助线吸附
@@ -10641,6 +10647,7 @@ class CommandFlowComponent extends Component {
       point.copy(pos);
       onChange && onChange(point, opt2);
       debouncing.cancle();
+      e?.stopPropagation();
     };
     const mouseup = (e) => {
       object3D.element.style.pointerEvents = "all";
@@ -11075,7 +11082,7 @@ class CommandFlowComponent extends Component {
                 `;
       }
     });
-    textMesh.setText();
+    textMesh.setText(opt?.text);
     return textMesh;
   }
   /** 创建关闭按钮
@@ -11100,7 +11107,7 @@ class CommandFlowComponent extends Component {
                 `;
       }
     });
-    textMesh.setText();
+    textMesh.setText(opt?.text);
     return textMesh;
   }
   /** 创建确认按钮
@@ -11125,7 +11132,7 @@ class CommandFlowComponent extends Component {
                 `;
       }
     });
-    textMesh.setText();
+    textMesh.setText(opt?.text);
     return textMesh;
   }
 }
@@ -12722,7 +12729,7 @@ class DrawDoorLine extends CommandFlowComponent {
     return data;
   }
 }
-function createPage$2(drawLine) {
+function createPage$1(drawLine) {
   function View() {
     return createVNode("div", {
       "class": " z-20 absolute left-0 top-[50%] translate-y-[-50%] flex flex-col p-[10px] gap-[16px]",
@@ -12819,7 +12826,7 @@ class DrawLine extends CommandFlowComponent {
     this.container.add(auxiliaryLine);
     this.container.add(lineObj3D);
     this.container.add(lineDashed);
-    this.addEventRecord("clear", () => {
+    this.addCommandEndHandle(() => {
       pointSelector.end();
       auxiliaryLine.removeFromParent();
       lineDashed.removeFromParent();
@@ -12876,7 +12883,7 @@ class DrawLine extends CommandFlowComponent {
         const {
           destroy: destroy1,
           directionLock
-        } = createPage$2(this);
+        } = createPage$1(this);
         const {
           destroy: destroy2,
           setPoint: setDragPoint
@@ -12902,7 +12909,7 @@ class DrawLine extends CommandFlowComponent {
             updateData();
           }
         });
-        this.addEventRecord("clear", destroy1, destroy2);
+        this.addCommandEndHandle(destroy1, destroy2);
       }
     }
   }
@@ -14138,61 +14145,48 @@ class ClippingLine extends CommandFlowComponent {
   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.selectPointStart.bind(this)).add(this.selectPointEnd.bind(this)).add(this.end.bind(this)).addRollback(this.rollback.bind(this)).addRevokeRollback(this.revokeRollback.bind(this));
-    commandFlow.addEventListener("finally", this.createFinally(["selectPointStart"]));
-    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));
+    const commandFlow = this.initCommandFlow({
+      shortcutKeys: this.shortcutKeys
+    });
+    commandFlow.add(this.createCursor("no-drop")).add(this.selectPointStart.bind(this)).add(this.selectPointEnd.bind(this)).add(this.end.bind(this));
   }
   /** 选择开始点
    * @param next 
    */
-  selectPointStart(next) {
-    let currentPoint = null, circle = this.renderer.createCircle(Point.zero(), { color: 16711935 }), currentLine = null;
-    this.addEventRecord("selectPointStart").add(this.editor.addEventListener("pointerPositionChange", () => {
-      const { point, line: line2, find } = this.editor.renderManager.adsorption();
-      this.dispatchEvent({ type: "pointerMove", point });
-      if (find) {
-        this.domElement.style.cursor = "none";
-        circle.position.copy(point);
-        currentLine = line2;
-        currentPoint = point.clone();
-        this.container.add(circle);
-      } else {
-        this.domElement.style.cursor = "no-drop";
-        currentPoint = null;
-        circle.removeFromParent();
-      }
-    })).add(this.eventInput.addEventListener("codeChange", () => {
-      if (this.eventInput.isKeyDown("mouse_0") && currentPoint) {
-        this.cancelEventRecord("selectPointStart");
-        next({ point: currentPoint, line: currentLine });
+  async selectPointStart(next) {
+    let circle = this.renderer.createCircle(Point.zero(), { color: 16711935 }, this.container);
+    const pointSelector = this.createPointSelector({
+      onMove(point2) {
+        if (point2) {
+          circle.position.set(point2?.x, point2?.y, 0);
+          circle.visible = true;
+        } else {
+          circle.visible = false;
+        }
       }
-    }));
-    this.addEventRecord("clear").add(() => circle.removeFromParent());
+    });
+    this.addEventRecord("clear").add(() => {
+      circle.removeFromParent();
+      pointSelector.end();
+    });
+    const { point, line: line2 } = await pointSelector.next("line_point") ?? {};
+    if (!point) return;
+    circle.visible = true;
+    pointSelector.end();
+    next({ point, line: line2 });
   }
   /** 选择结束点
    * @param next 
    */
-  selectPointEnd(next, { point, line: line2 }) {
-    let currentPoint = null, circle = this.renderer.createCircle(Point.zero(), { color: 16711935 });
-    this.addEventRecord("clear").add(() => circle.removeFromParent()).add(this.editor.addEventListener("pointerPositionChange", () => {
-      const { point: point2, find, line: l } = this.editor.renderManager.adsorption();
-      this.dispatchEvent({ type: "pointerMove", point: point2 });
-      if (find && l === line2) {
-        this.domElement.style.cursor = "none";
-        circle.position.copy(point2);
-        currentPoint = point2.clone();
-        this.container.add(circle);
-      } else {
-        this.domElement.style.cursor = "no-drop";
-        currentPoint = null;
-        circle.removeFromParent();
-      }
-    })).add(this.eventInput.addEventListener("codeChange", () => {
-      if (this.eventInput.isKeyDown("mouse_0") && currentPoint) next({ line: line2, start: point, end: currentPoint });
-    }));
+  async selectPointEnd(next, { point, line: line2 }) {
+    const pointSelector = this.createPointSelector({ targetLines: [line2] });
+    this.addEventRecord("clear").add(() => {
+      pointSelector.end();
+    });
+    const { point: p1 } = await pointSelector.next("line_point") ?? {};
+    if (!point) return;
+    pointSelector.end();
+    next({ line: line2, start: point, end: p1 });
   }
   /**
    * 结束处理
@@ -14200,7 +14194,7 @@ class ClippingLine extends CommandFlowComponent {
    * @param points 
    */
   end(next, { start, end, line: line2 }) {
-    const lines = LineSegment.clippingByLine(line2, new LineSegment(Point.from(start), Point.from(end)), (newLine) => {
+    const lines = LineSegment.clippingByLine(line2, new LineSegment(start, end), (newLine) => {
       recomputedWindowCenter(newLine);
     });
     next({
@@ -14210,7 +14204,7 @@ class ClippingLine extends CommandFlowComponent {
   }
   /** 执行完成
    */
-  completed(data) {
+  onCompleted(data) {
     this.renderManager.removeLine(data.oldLine);
     this.renderManager.addLines(data.newLines);
     this.renderManager.draw();
@@ -14218,7 +14212,7 @@ class ClippingLine extends CommandFlowComponent {
   /** 回滚操作
    * @param data 
    */
-  rollback(data) {
+  onRollback(data) {
     this.renderManager.addLine(data.oldLine);
     this.renderManager.removeLines(data.newLines);
     return data;
@@ -14227,8 +14221,8 @@ class ClippingLine extends CommandFlowComponent {
    * @param data 
    * @returns 
    */
-  revokeRollback(data) {
-    this.completed(data);
+  onRevokeRollback(data) {
+    this.onCompleted(data);
     return data;
   }
 }
@@ -14506,194 +14500,6 @@ function modifyWindow(context, winLine, line2, index2) {
   });
   return promise;
 }
-function createPage$1(context) {
-  function View() {
-    return createVNode("div", {
-      "class": " z-20 absolute left-0 top-[50%] translate-y-[-50%] flex flex-col p-[10px] gap-[16px]",
-      "onClick": (e) => e.stopPropagation(),
-      "onPointerdown": (e) => e.stopPropagation()
-    }, [createVNode("div", {
-      "onClick": () => directionLock.value = !directionLock.value,
-      "class": {
-        "rounded-[100px] size-[40px] bg-[#717171] flex justify-center items-center transition-colors": true,
-        "!bg-[var(--primary-color)]": directionLock.value
-      }
-    }, [createVNode("svg", {
-      "fill": "#fff",
-      "viewBox": "0 0 1109 1024",
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg",
-      "width": "26",
-      "height": "26"
-    }, [createVNode("path", {
-      "d": "M988.06258 639.599977l121.007826-209.599699h-92.511867a31.551955 31.551955 0 0 0-0.367999-7.439989A510.943266 510.943266 0 0 0 511.999265 0.000896c-282.303594 0-511.999264 229.67967-511.999264 511.999264s229.67967 511.999264 511.999264 511.999264a510.015267 510.015267 0 0 0 350.399496-138.703801 32.479953 32.479953 0 0 0-44.463936-47.359932 445.35936 445.35936 0 0 1-305.95156 121.103826c-246.399646 0-447.023357-200.527712-447.023358-447.007357s200.559712-447.039357 447.039358-447.039357a445.967359 445.967359 0 0 1 439.359368 365.023475h-84.367879z",
-      "p-id": "6529"
-    }, null), createVNode("path", {
-      "d": "M688.719011 469.456221H669.775038v-79.647885a156.223775 156.223775 0 0 0-312.447551 0v79.647885h-12.799981a29.103958 29.103958 0 0 0-29.007959 29.007958v195.663719a29.103958 29.103958 0 0 0 29.007959 29.007958h344.159505a29.087958 29.087958 0 0 0 28.975958-29.007958V498.464179a29.087958 29.087958 0 0 0-28.943958-29.007958z m-266.431617-79.647885a91.255869 91.255869 0 1 1 182.511737 0v79.647885H422.287394z"
-    }, null)])])]);
-  }
-  const directionLock = ref(false);
-  const destroy = context.createVueApp(View);
-  return {
-    directionLock,
-    destroy
-  };
-}
-function modifyDoor(context, line2) {
-  function update() {
-    lineMesh.setPoint(line2.start.toVector3(), line2.end.toVector3());
-    group.position.copy(line2.center.toJson(0));
-    width.value = mToMm(line2.length());
-  }
-  function end() {
-    if (ended.value) return;
-    ended.value = true;
-    context.renderManager.addLine(oldLine);
-    context.renderManager.draw();
-    group.clear();
-    group.removeFromParent();
-    lineMesh.removeFromParent();
-    destroy();
-  }
-  const {
-    promise,
-    resolve
-  } = createPromise(), lineMesh = new (isMobileRef.value ? Lines : Lines2)([line2.start.toVector3(), line2.end.toVector3()], 16776960, {
-    linewidth: 4
-  }), group = new THREE.Group(), {
-    destroy,
-    directionLock
-  } = createPage$1(context), lines = [], width = ref(0), dragging = ref(false), ended = ref(false), oldLine = line2;
-  line2 = line2.clone();
-  let baseLine = null;
-  context.renderManager.removeLine(oldLine);
-  lineMesh.position.z = 5e-3;
-  context.container.add(lineMesh);
-  context.container.add(group);
-  line2.points.forEach((point, index2) => {
-    const {
-      dragPointMesh,
-      setPoint
-    } = context.createDragPoint(point, {
-      size: 20,
-      auxiliaryLine: true,
-      onStart() {
-        baseLine = line2.clone();
-        dragging.value = true;
-      },
-      onEnd() {
-        setPoint(point);
-        dragging.value = false;
-      },
-      onChange(p, {
-        line: sl
-      }) {
-        if (directionLock.value && baseLine) context.pointLineConstraint(p, baseLine, index2 === 0 ? baseLine.points[1] : baseLine.points[0]);
-        point.copy(p);
-        if (sl && sl.parallel(line2, 10) && line2.length() > 0.2) lines[index2] = sl;
-        update();
-      }
-    });
-    const btn = context.createEditButton({
-      text: `L: ${mToMm(line2.length())}mm`,
-      parent: dragPointMesh,
-      style: {
-        marginLeft: "20px",
-        transform: "translateY(-50%)"
-      },
-      position: Point.zero(),
-      freedom: true,
-      async onClick() {
-        const {
-          promise: promise2,
-          close: close2
-        } = context.openWidthEditor({
-          defaultWidth: width.value,
-          showCancel: true,
-          minWidth: 200
-        });
-        context.addCommandEndHandle(close2);
-        const w = mmTom(await promise2), otherPoint = line2.getAnotherPoint(point), dir = point.direction(otherPoint);
-        point.copy(otherPoint).add(dir.multiplyScalar(w));
-        setPoint(point);
-        update();
-      }
-    });
-    watch(width, () => {
-      btn.setText(width.value + "mm");
-    });
-    watch(dragging, () => {
-      btn.visible = !dragging.value;
-    });
-    watch(ended, () => {
-      btn.removeFromParent();
-      dragPointMesh.removeFromParent();
-    });
-  });
-  line2.points.forEach((point, i) => {
-    const list1 = context.renderManager.quadtree.queryPoint(point).filter((item) => item.line !== line2);
-    if (list1.length === 1) lines[i] = list1[0].line;
-    else lines[i] = null;
-  });
-  context.addCommandEndHandle(end);
-  update();
-  context.showConfirm.value = true;
-  context.awaitOnlyKeys(["enter"]).then(() => {
-    end();
-    const list = [{
-      line: oldLine,
-      old: {
-        start: oldLine.start.toJson(0),
-        end: oldLine.end.toJson(0)
-      },
-      new: {
-        start: line2.start.toJson(0),
-        end: line2.end.toJson(0)
-      }
-    }];
-    lines.forEach((line22, i) => {
-      if (!line22) return;
-      if (line22 && line22.parallel(line2, 10)) {
-        const pLine = line22.projectLineSegment(line2);
-        if (!pLine || pLine.length() < 1e-3) {
-          const line_ = line22.clone();
-          if (line22.start.distance(line2.points[i]) < line22.end.distance(line2.points[i])) line_.start.copy(line2.points[i]);
-          else line_.end.copy(line2.points[i]);
-          list.push({
-            line: line22,
-            old: {
-              start: line22.start.toJson(0),
-              end: line22.end.toJson(0)
-            },
-            new: {
-              start: line_.start.toJson(0),
-              end: line_.end.toJson(0)
-            }
-          });
-          return;
-        }
-        const results = LineSegment.clippingByLine(line22, pLine);
-        if (!results.length) return;
-        list.push({
-          line: line22,
-          old: {
-            start: line22.start.toJson(0),
-            end: line22.end.toJson(0)
-          },
-          new: {
-            start: results[0].start.toJson(0),
-            end: results[0].end.toJson(0)
-          }
-        });
-      }
-    });
-    resolve({
-      type: "door",
-      list
-    });
-  });
-  return promise;
-}
 function createPage(context, opt) {
   function View() {
     return createVNode("div", {
@@ -14742,7 +14548,7 @@ function createPage(context, opt) {
     }, null)])]), createVNode("div", {
       "onClick": opt.onResetClick,
       "class": {
-        "rounded-[100px] size-[32px] bg-[#717171] flex justify-center items-center transition-colors": true,
+        "rounded-[6px] size-[32px] bg-[#717171] flex justify-center items-center transition-colors": true,
         "!bg-[var(--primary-color)] button": true
       }
     }, [createVNode("svg", {
@@ -14755,26 +14561,7 @@ function createPage(context, opt) {
       "height": "20"
     }, [createVNode("path", {
       "d": "M502.714987 58.258904l-126.531056-54.617723a52.797131 52.797131 0 0 0-41.873587 96.855428A447.865322 447.865322 0 0 0 392.02307 946.707184a61.535967 61.535967 0 0 0 13.83649 1.820591 52.797131 52.797131 0 0 0 13.65443-103.773672 342.453118 342.453118 0 0 1-31.678278-651.771485l-8.374718 19.480321a52.615072 52.615072 0 0 0 27.855039 69.182448 51.522718 51.522718 0 0 0 20.572675 4.369418A52.797131 52.797131 0 0 0 476.498481 254.882703L530.205907 127.441352a52.979191 52.979191 0 0 0-27.49092-69.182448zM962.960326 509.765407A448.775617 448.775617 0 0 0 643.992829 68.090094a52.797131 52.797131 0 1 0-30.403866 101.042786A342.635177 342.635177 0 0 1 674.578753 801.059925a52.615072 52.615072 0 0 0-92.30395-50.612422l-71.913335 117.246043a52.433013 52.433013 0 0 0 17.295612 72.82363l117.063985 72.823629a52.797131 52.797131 0 1 0 54.617722-89.755123l-16.021198-10.013249A448.593558 448.593558 0 0 0 962.960326 509.765407z"
-    }, null)])]), recordCount.value ? createVNode("div", {
-      "onClick": opt.onRevokeClick,
-      "class": {
-        "rounded-[100px] size-[32px] bg-[#717171] flex justify-center items-center transition-colors": true,
-        "!bg-[var(--primary-color)] button": true
-      }
-    }, [createVNode("svg", {
-      "fill": "#fff",
-      "viewBox": "0 0 1024 1024",
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg",
-      "p-id": "44557",
-      "width": "20",
-      "height": "20"
-    }, [createVNode("path", {
-      "d": "M64 347.552L320 128v448z",
-      "p-id": "44558"
-    }, null), createVNode("path", {
-      "d": "M265.472 896V784h377.824a200 200 0 1 0 0-400H240V272h403.296c172.32 0 312 139.68 312 312s-139.68 312-312 312H265.472z"
-    }, null)])]) : ""]);
+    }, null)])])]);
   }
   const directionLock = ref(false);
   const follow = ref(true);
@@ -14807,6 +14594,7 @@ async function modifyLine(context, line2) {
       value: newValue
     }];
     point.copy(newPoint);
+    width.value = mToMm(line2.length());
     if (follow.value) list.forEach((item) => {
       if (item.point === point) item.list.forEach((item2) => {
         records.push({
@@ -14857,14 +14645,13 @@ async function modifyLine(context, line2) {
       setPoint(line2.end, oldLine.end.clone());
       list[0].setDragPos(line2.start);
       list[1].setDragPos(line2.end);
-    },
-    onRevokeClick: revoke
+    }
   }), {
     promise,
     resolve
-  } = createPromise(), oldLine = line2, group = new Group(), linesMesh = new Lines([], 65280), linesMesh2 = new LineDashed([], 5745151), recordsList = [], dragging = ref(false), ended = ref(false), ControlZ = context.awaitOnlyKeys(["Control", "Z"], {
+  } = createPromise(), oldLine = line2, group = new Group(), linesMesh = new Lines([], 65280), linesMesh2 = new LineDashed([], 5745151), width = ref(mToMm(line2.length())), dragging = ref(false), ended = ref(false), ControlZ = context.awaitOnlyKeys(["Control", "Z"], {
     once: false
-  });
+  }), recordsList = [];
   context.renderManager.removeLine(line2);
   group.add(linesMesh);
   group.add(linesMesh2);
@@ -14879,8 +14666,7 @@ async function modifyLine(context, line2) {
     const list2 = context.renderManager.pointVirtualGrid.queryPoint(point).map((item) => ({
       line: item.userData,
       point: item.point
-    }));
-    const olds = list2.map((item) => ({
+    })), olds = list2.map((item) => ({
       line: item.line,
       start: item.line.start.toJson(),
       end: item.line.end.toJson()
@@ -14888,7 +14674,8 @@ async function modifyLine(context, line2) {
     list2.forEach((item) => context.renderManager.removeLine(item.line));
     const {
       setPoint: setDragPos,
-      destroy: destroy2
+      destroy: destroy2,
+      dragPointMesh
     } = context.createDragPoint(point, {
       size: 20,
       auxiliaryLine: true,
@@ -14896,16 +14683,50 @@ async function modifyLine(context, line2) {
         baseLine = line2.clone();
         dragging.value = true;
         writeIndex = recordsList.length;
+        textMesh.visible = true;
+        textMesh.setText(width.value + "mm");
+        textMesh.setPosition(line2.center);
       },
       onEnd() {
         setDragPos(point);
         dragging.value = false;
+        textMesh.visible = false;
       },
       onChange(p) {
         if (directionLock.value && baseLine) context.pointLineConstraint(p, baseLine, index2 === 0 ? baseLine.points[1] : baseLine.points[0]);
         setPoint(point, p);
+        textMesh.setText(width.value + "mm");
+        textMesh.setPosition(line2.center);
+      }
+    }), textMesh = context.createButton({
+      text: ""
+    }), btn = context.createEditButton({
+      text: width.value + "mm",
+      parent: dragPointMesh,
+      style: {
+        marginLeft: "20px",
+        transform: "translateY(-50%)"
+      },
+      position: Point.zero(),
+      freedom: true,
+      async onClick() {
+        const {
+          promise: promise2,
+          close: close2
+        } = context.openWidthEditor({
+          defaultWidth: width.value,
+          showCancel: true,
+          minWidth: 200
+        });
+        context.addCommandEndHandle(close2);
+        const w = mmTom(await promise2), otherPoint = line2.getAnotherPoint(point), dir = point.direction(otherPoint);
+        setPoint(point, otherPoint.clone().add(dir.multiplyScalar(w)));
+        setDragPos(point);
       }
     });
+    textMesh.visible = false;
+    watch(width, () => btn.setText(width.value + "mm"));
+    watch(dragging, () => btn.visible = !dragging.value);
     watch(ended, () => destroy2());
     return {
       point,
@@ -14997,7 +14818,7 @@ class PointDrag extends CommandFlowComponent {
     lineSelector.end();
     if (!line2) return;
     if (line2.userData.isWinLine) next(await modifyWindow(this, line2, line2.currentData.line, line2.currentData.index));
-    else if (line2.userData.isDoor) next(await modifyDoor(this, line2));
+    else if (line2.userData.isDoor) next(await modifyLine(this, line2));
     else next(await modifyLine(this, line2));
   }
   async verify(next, data) {
@@ -15020,6 +14841,7 @@ class PointDrag extends CommandFlowComponent {
       data.list.forEach(({ line: line2, new: newData }) => {
         line2.start.copy(newData.start);
         line2.end.copy(newData.end);
+        recomputedWindow(line2);
       });
     }
     this.renderManager.draw();
@@ -15037,6 +14859,7 @@ class PointDrag extends CommandFlowComponent {
       data.list.forEach(({ line: line2, old: newData }) => {
         line2.start.copy(newData.start);
         line2.end.copy(newData.end);
+        recomputedWindow(line2);
       });
     }
     this.renderManager.draw();
@@ -15301,17 +15124,21 @@ const _hoisted_12 = { class: "flex-wrap border-t-1 border-t-[#eee] mt-[5px] pt-[
 const _hoisted_13 = ["onClick", "title"];
 const _hoisted_14 = ["src"];
 const _hoisted_15 = {
-  key: 0,
-  class: "items-end box-border pointer-events-none p-[0_5px] w-full absolute left-[0px] bottom-[calc(100%+5px)] flex gap-[5px]"
-};
-const _hoisted_16 = { class: "text-[#fff] rounded-[6px] p-[5px] text-nowrap" };
-const _hoisted_17 = { class: "text-[14px] flex flex-row flex-wrap gap-[10px]" };
-const _hoisted_18 = ["onClick"];
-const _hoisted_19 = { class: "flex justify-center items-center size-[30px] bg-[#f0f0f0] rounded-[2px]" };
-const _hoisted_20 = ["src"];
-const _hoisted_21 = { class: "flex-wrap border-t-1 border-t-[#eee] mt-[5px] pt-[5px] flex items-center gap-[10px]" };
-const _hoisted_22 = ["onClick", "title"];
-const _hoisted_23 = ["src"];
+  style: { "--el-color-primary": "var(--primary-color)" },
+  class: "absolute left-0 bottom-[calc(100%+5px)] p-[0_5px] flex flex-row items-center justify-between gap-[0px] mt-[10px] text-[10px]"
+};
+const _hoisted_16 = { class: "text-[14px] flex flex-row flex-wrap gap-[10px]" };
+const _hoisted_17 = ["onClick"];
+const _hoisted_18 = { class: "flex justify-center items-center size-[30px] bg-[#f0f0f0] rounded-[2px]" };
+const _hoisted_19 = ["src"];
+const _hoisted_20 = { class: "flex-wrap border-t-1 border-t-[#eee] mt-[5px] pt-[5px] flex items-center gap-[10px]" };
+const _hoisted_21 = ["onClick", "title"];
+const _hoisted_22 = ["src"];
+const _hoisted_23 = {
+  key: 1,
+  class: "items-end box-border pointer-events-none p-[0_5px] w-full absolute left-[0px] top-0 flex gap-[5px]"
+};
+const _hoisted_24 = { class: "text-[#fff] rounded-[6px] p-[5px] text-nowrap" };
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "EditorToolContent",
   props: {
@@ -15429,6 +15256,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         command: MergeLine.commandName,
         name: "合并",
         src: images["../assets/images/mergeLine.svg"].default,
+        show: computed(() => !isMobileRef.value),
         disabled: computed(() => selectLineCount.value >= 2),
         shortcut: MergeLine.shortcutKeys.join(" + ")
       },
@@ -15436,6 +15264,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         command: TwoPointConnection.commandName,
         name: "两点连接",
         disabled: computed(() => selectLineCount.value === 2),
+        show: computed(() => !isMobileRef.value),
         src: images["../assets/images/connection.svg"].default,
         shortcut: TwoPointConnection.shortcutKeys.join(" + ")
       },
@@ -15443,6 +15272,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         command: TwoLineConnectionLine.commandName,
         name: "两线连接",
         disabled: computed(() => selectLineCount.value === 2),
+        show: computed(() => !isMobileRef.value),
         src: images["../assets/images/intersectionConnection.svg"].default,
         shortcut: TwoLineConnectionLine.shortcutKeys.join(" + ")
       },
@@ -15472,6 +15302,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         command: ViewAngle.commandName,
         name: "角度显示",
         disabled: computed(() => selectLineCount.value === 2 && defaultComponent.selectLines[0].sameEndpoint(defaultComponent.selectLines[1])),
+        show: computed(() => !isMobileRef.value),
         src: images["../assets/images/angle.svg"].default,
         shortcut: ViewAngle.shortcutKeys.join(" + ")
       },
@@ -15593,7 +15424,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       title: "取消命令(Esc)",
                       class: "active:scale-[0.7] transition-all flex items-center justify-center",
                       onClick: _cache[0] || (_cache[0] = (e) => (unref(editor).cancelCommand(), e.stopPropagation()))
-                    }, _cache[14] || (_cache[14] = [
+                    }, _cache[17] || (_cache[17] = [
                       createElementVNode("svg", {
                         fill: "#fff",
                         width: "16",
@@ -15611,7 +15442,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       onClick: commandConfirm,
                       title: "确认命令(Enter)",
                       class: "active:scale-[0.7] transition-all flex items-center justify-center"
-                    }, _cache[15] || (_cache[15] = [
+                    }, _cache[18] || (_cache[18] = [
                       createElementVNode("svg", {
                         fill: "#fff",
                         width: "16",
@@ -15634,22 +15465,22 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: dxfVisible.value,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dxfVisible.value = $event)
             }, {
-              default: withCtx(() => _cache[16] || (_cache[16] = [
+              default: withCtx(() => _cache[19] || (_cache[19] = [
                 createTextVNode("Dxf", -1)
               ])),
               _: 1,
-              __: [16]
+              __: [19]
             }, 8, ["modelValue"]),
             createVNode(unref(ElCheckbox), {
               size: "small",
               modelValue: unref(editor).renderManager.lineAdsorption.value,
               "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
             }, {
-              default: withCtx(() => _cache[17] || (_cache[17] = [
+              default: withCtx(() => _cache[20] || (_cache[20] = [
                 createTextVNode("线吸附", -1)
               ])),
               _: 1,
-              __: [17]
+              __: [20]
             }, 8, ["modelValue"]),
             createVNode(unref(ElCheckbox), {
               disabled: !unref(editor).renderManager.lineAdsorption.value,
@@ -15657,11 +15488,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: unref(editor).renderManager.pointAdsorption.value,
               "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
             }, {
-              default: withCtx(() => _cache[18] || (_cache[18] = [
+              default: withCtx(() => _cache[21] || (_cache[21] = [
                 createTextVNode("点吸附", -1)
               ])),
               _: 1,
-              __: [18]
+              __: [21]
             }, 8, ["disabled", "modelValue"])
           ]),
           _ctx.permission === "admin" ? (openBlock(), createElementBlock("div", _hoisted_11, [
@@ -15671,11 +15502,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               type: "success",
               onClick: selectLocalFile
             }, {
-              default: withCtx(() => _cache[19] || (_cache[19] = [
+              default: withCtx(() => _cache[22] || (_cache[22] = [
                 createTextVNode(" 选择文件 ", -1)
               ])),
               _: 1,
-              __: [19]
+              __: [22]
             }),
             createVNode(unref(ElButton), {
               style: { "padding": "5px", "font-size": "10px" },
@@ -15683,11 +15514,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               type: "primary",
               onClick: _cache[4] || (_cache[4] = ($event) => unref(dxfSystem).CorrectionDxf.downloadOriginalData("json.json"))
             }, {
-              default: withCtx(() => _cache[20] || (_cache[20] = [
+              default: withCtx(() => _cache[23] || (_cache[23] = [
                 createTextVNode(" 下载Json ", -1)
               ])),
               _: 1,
-              __: [20]
+              __: [23]
             }),
             createVNode(unref(ElButton), {
               style: { "padding": "5px", "font-size": "10px" },
@@ -15695,11 +15526,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               type: "primary",
               onClick: _cache[5] || (_cache[5] = ($event) => unref(dxfSystem).CorrectionDxf.downloadDxf("test.dxf"))
             }, {
-              default: withCtx(() => _cache[21] || (_cache[21] = [
+              default: withCtx(() => _cache[24] || (_cache[24] = [
                 createTextVNode(" 下载DXF ", -1)
               ])),
               _: 1,
-              __: [21]
+              __: [24]
             }),
             createVNode(unref(ElButton), {
               style: { "padding": "5px", "font-size": "10px" },
@@ -15707,11 +15538,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               type: "primary",
               onClick: _cache[6] || (_cache[6] = ($event) => unref(dxfSystem).CorrectionDxf.downloadDxfImage("dxf.jpg"))
             }, {
-              default: withCtx(() => _cache[22] || (_cache[22] = [
+              default: withCtx(() => _cache[25] || (_cache[25] = [
                 createTextVNode(" 下载JPG ", -1)
               ])),
               _: 1,
-              __: [22]
+              __: [25]
             }),
             createVNode(unref(ElButton), {
               style: { "padding": "5px", "font-size": "10px" },
@@ -15719,11 +15550,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               type: "primary",
               onClick: _cache[7] || (_cache[7] = ($event) => unref(whiteModel).downloadGltf("test.glb", true))
             }, {
-              default: withCtx(() => _cache[23] || (_cache[23] = [
+              default: withCtx(() => _cache[26] || (_cache[26] = [
                 createTextVNode(" 下载白膜 ", -1)
               ])),
               _: 1,
-              __: [23]
+              __: [26]
             }),
             createVNode(unref(ElButton), {
               style: { "padding": "5px", "font-size": "10px" },
@@ -15731,11 +15562,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               type: "primary",
               onClick: _cache[8] || (_cache[8] = ($event) => unref(threeVJia).download())
             }, {
-              default: withCtx(() => _cache[24] || (_cache[24] = [
+              default: withCtx(() => _cache[27] || (_cache[27] = [
                 createTextVNode(" 下载三维家JSON ", -1)
               ])),
               _: 1,
-              __: [24]
+              __: [27]
             }),
             createVNode(unref(ElDropdown), {
               class: "ml-[5px]",
@@ -15755,11 +15586,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   size: "small",
                   type: "primary"
                 }, {
-                  default: withCtx(() => _cache[25] || (_cache[25] = [
+                  default: withCtx(() => _cache[28] || (_cache[28] = [
                     createTextVNode(" z值调整 ", -1)
                   ])),
                   _: 1,
-                  __: [25]
+                  __: [28]
                 })
               ]),
               _: 1
@@ -15798,13 +15629,46 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         ])) : (openBlock(), createElementBlock("div", {
           key: 1,
           class: normalizeClass([{ "translate-y-[100%]": isMainCommand.value }, "z-[8] absolute left-0 bottom-0 transition-transform w-[100%] bg-white p-[5px] box-border text-[14px]"]),
-          onMousedown: _cache[10] || (_cache[10] = (e) => e.stopPropagation()),
-          onPointerdown: _cache[11] || (_cache[11] = (e) => e.stopPropagation())
+          onMousedown: _cache[13] || (_cache[13] = (e) => e.stopPropagation()),
+          onPointerdown: _cache[14] || (_cache[14] = (e) => e.stopPropagation())
         }, [
-          isMainCommand.value && currentMainCommand.value ? (openBlock(), createElementBlock("div", _hoisted_15, [
-            createElementVNode("div", _hoisted_16, toDisplayString(currentMainCommand.value.name), 1)
-          ])) : createCommentVNode("", true),
-          createElementVNode("ul", _hoisted_17, [
+          createElementVNode("div", _hoisted_15, [
+            createVNode(unref(ElCheckbox), {
+              size: "small",
+              modelValue: dxfVisible.value,
+              "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => dxfVisible.value = $event)
+            }, {
+              default: withCtx(() => _cache[29] || (_cache[29] = [
+                createTextVNode("Dxf", -1)
+              ])),
+              _: 1,
+              __: [29]
+            }, 8, ["modelValue"]),
+            createVNode(unref(ElCheckbox), {
+              size: "small",
+              modelValue: unref(editor).renderManager.lineAdsorption.value,
+              "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
+            }, {
+              default: withCtx(() => _cache[30] || (_cache[30] = [
+                createTextVNode("线吸附", -1)
+              ])),
+              _: 1,
+              __: [30]
+            }, 8, ["modelValue"]),
+            createVNode(unref(ElCheckbox), {
+              disabled: !unref(editor).renderManager.lineAdsorption.value,
+              size: "small",
+              modelValue: unref(editor).renderManager.pointAdsorption.value,
+              "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
+            }, {
+              default: withCtx(() => _cache[31] || (_cache[31] = [
+                createTextVNode("点吸附", -1)
+              ])),
+              _: 1,
+              __: [31]
+            }, 8, ["disabled", "modelValue"])
+          ]),
+          createElementVNode("ul", _hoisted_16, [
             (openBlock(), createElementBlock(Fragment, null, renderList(commandList, (item) => {
               return openBlock(), createElementBlock(Fragment, {
                 key: item.command
@@ -15814,19 +15678,19 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   onClick: ($event) => startCurrentCommandItem(item),
                   class: normalizeClass([{ "!bg-[var(--primary-color)] ": currentCommand.value === item.command }, "gap-[10px] relative hover:bg-[#ddd] transition-all rounded-[6px] p-[5px] flex flex-row items-center justify-between cursor-pointer"])
                 }, [
-                  createElementVNode("div", _hoisted_19, [
+                  createElementVNode("div", _hoisted_18, [
                     createElementVNode("img", {
                       class: "size-[20px]",
                       src: item.src,
                       alt: "",
                       srcset: ""
-                    }, null, 8, _hoisted_20)
+                    }, null, 8, _hoisted_19)
                   ])
-                ], 10, _hoisted_18)) : createCommentVNode("", true)
+                ], 10, _hoisted_17)) : createCommentVNode("", true)
               ], 64);
             }), 64))
           ]),
-          createElementVNode("div", _hoisted_21, [
+          createElementVNode("div", _hoisted_20, [
             createVNode(TransitionGroup, null, {
               default: withCtx(() => [
                 (openBlock(), createElementBlock(Fragment, null, renderList(otherCommandList, (item) => {
@@ -15842,8 +15706,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                     createElementVNode("img", {
                       class: "size-[20px]",
                       src: item.src
-                    }, null, 8, _hoisted_23)
-                  ], 10, _hoisted_22), [
+                    }, null, 8, _hoisted_22)
+                  ], 10, _hoisted_21), [
                     [vShow, !(item.show?.value === false)]
                   ]);
                 }), 64))
@@ -15857,13 +15721,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         }, [
           isMainCommand.value ? (openBlock(), createElementBlock("div", {
             key: 0,
-            onMousemove: _cache[13] || (_cache[13] = (e) => e.stopPropagation()),
+            onMousemove: _cache[16] || (_cache[16] = (e) => e.stopPropagation()),
             class: "cursor-pointer z-[8] box-border bg-[rgba(0,0,0,0.5)] rounded-[6px] p-[5px] absolute left-[50%] translate-x-[-50%] top-[20px] flex gap-[5px] items-center"
           }, [
             createElementVNode("button", {
-              onClick: _cache[12] || (_cache[12] = (e) => (unref(editor).cancelCommand(), e.stopPropagation())),
+              onClick: _cache[15] || (_cache[15] = (e) => (unref(editor).cancelCommand(), e.stopPropagation())),
               class: "!bg-transparent button cursor-pointer"
-            }, _cache[26] || (_cache[26] = [
+            }, _cache[32] || (_cache[32] = [
               createElementVNode("svg", {
                 fill: "#fff",
                 viewBox: "0 0 1024 1024",
@@ -15879,7 +15743,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               key: 0,
               onClick: commandConfirm,
               class: "button !bg-transparent cursor-pointer"
-            }, _cache[27] || (_cache[27] = [
+            }, _cache[33] || (_cache[33] = [
               createElementVNode("svg", {
                 fill: "#28c932",
                 viewBox: "0 0 1026 1024",
@@ -15891,13 +15755,16 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 createElementVNode("path", { d: "M79.288 400c19.2 0 38.4 9.6 54.4 25.6l240 249.6c12.8 16 19.2 16 35.2 0 147.2-153.6 294.4-304 441.6-457.6 16-16 32-35.2 48-51.2 28.8-28.8 70.4-32 99.2-6.4 32 25.6 38.4 73.6 9.6 105.6-32 38.4-67.2 73.6-102.4 108.8-150.4 156.8-300.8 313.6-454.4 470.4-38.4 38.4-80 41.6-115.2 6.4-105.6-108.8-211.2-217.6-313.6-326.4-22.4-25.6-28.8-54.4-12.8-83.2 12.8-25.6 35.2-41.6 70.4-41.6z" })
               ], -1)
             ]))) : createCommentVNode("", true)
-          ], 32)) : createCommentVNode("", true)
+          ], 32)) : createCommentVNode("", true),
+          isMainCommand.value && currentMainCommand.value ? (openBlock(), createElementBlock("div", _hoisted_23, [
+            createElementVNode("div", _hoisted_24, toDisplayString(currentMainCommand.value.name), 1)
+          ])) : createCommentVNode("", true)
         ], 8, ["to"]))
       ], 64);
     };
   }
 });
-const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-75418819"]]);
+const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-b369d5e1"]]);
 class StorageHelper {
   static get(key, defaultValue = void 0) {
     const value = localStorage.getItem(key);
@@ -16042,7 +15909,7 @@ class Editor extends Component {
     this.plane.visible = false;
     const cancelEvent = this.addEventListener("update", () => {
       this.domContainer.dialogLayer.appendChild(this.domElement);
-      this.domContainer.dialogLayer.appendChild(this.imgEl);
+      isMobileRef.value || this.domContainer.dialogLayer.appendChild(this.imgEl);
       cancelEvent();
     });
     setTimeout(() => {

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

@@ -1,6 +1,8 @@
 import { CommandFlowComponent } from './CommandFlowComponent';
 import { LineSegment } from '../../../../../LineSegment';
 import { ComponentManager } from '../../../../../ComponentManager';
+import { Point } from '../../../../../Point';
+import { LineUserData } from '../../../../type';
 import * as THREE from "three";
 export declare class ClippingLine extends CommandFlowComponent<{
     pointerMove: {
@@ -15,14 +17,14 @@ export declare class ClippingLine extends CommandFlowComponent<{
     /** 选择开始点
      * @param next
      */
-    selectPointStart(next: any): void;
+    selectPointStart(next: any): Promise<void>;
     /** 选择结束点
      * @param next
      */
     selectPointEnd(next: any, { point, line }: {
-        point: THREE.Vector3;
+        point: Point;
         line: LineSegment;
-    }): void;
+    }): Promise<void>;
     /**
      * 结束处理
      * @param next
@@ -31,14 +33,20 @@ export declare class ClippingLine extends CommandFlowComponent<{
     private end;
     /** 执行完成
      */
-    completed(data: any): void;
+    protected onCompleted(data: any): void;
     /** 回滚操作
      * @param data
      */
-    private rollback;
+    protected onRollback(data: any): any;
     /** 撤回回滚
      * @param data
      * @returns
      */
-    private revokeRollback;
+    protected onRevokeRollback(data: {
+        doorDataItem: any;
+        line: LineSegment<LineUserData>;
+    }): {
+        doorDataItem: any;
+        line: LineSegment<LineUserData>;
+    };
 }

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

@@ -20,7 +20,9 @@ export type AdsorptionResult = {
     line: undefined;
     mode: undefined;
 };
-export declare class RenderManager extends Component<{}> {
+export declare class RenderManager extends Component<{
+    adsorptionPointChange: AdsorptionResult;
+}> {
     static name: string;
     container: THREE.Group<THREE.Object3DEventMap>;
     lines: LineSegment<LineUserData>[];