build-dxf 0.1.34 → 0.1.35

package/package.json

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

package/src/DomEventRegister.js

@@ -1170,6 +1170,21 @@ class DomEventRegister extends Component {
       offsetY
     };
   }
+  /** 更新鼠标
+   * @param e 
+   */
+  updatePointer(e) {
+    const domContainer = this.parent?.findComponentByType(DomContainer);
+    const { offsetX, offsetY } = this.computedPosition(e instanceof TouchEvent ? e.touches[0] : e, domContainer.rect);
+    this.pointer.set(offsetX, offsetY);
+    this.dispatchEvent({
+      type: "pointerdown",
+      x: offsetX,
+      y: offsetY,
+      pointerId: 0,
+      pointerCount: 0
+    });
+  }
   /**
    * 初始化基础事件代理
    */
@@ -1222,7 +1237,6 @@ class DomEventRegister extends Component {
       this.pointer.set(offsetX, offsetY);
       map.append(e.pointerId, new Vector2(offsetX, offsetY));
       const movement = getMovement(e.pointerId);
-      console.log(offsetX, offsetY);
       this.dispatchEvent({
         type: "pointermove",
         x: offsetX,

package/src/build.js

@@ -1,5 +1,5 @@
 import * as THREE from "three";
-import { EventDispatcher as EventDispatcher$1, Group as Group$1, Vector3, Matrix3, MathUtils, Box3, Matrix4, Ray } from "three";
+import { EventDispatcher as EventDispatcher$1, Vector3, Group as Group$1, Matrix3, MathUtils, Box3, Matrix4, Ray } from "three";
 import ClipperLib from "clipper-lib";
 import Drawing from "dxf-writer";
 import { Brush, Evaluator, SUBTRACTION } from "three-bvh-csg";
@@ -2243,12 +2243,6 @@ class Point {
     this.y = arr[1];
     return this;
   }
-  /**
-   * 
-   */
-  toArray() {
-    return [this.x, this.y];
-  }
   /**
    * multiplyScalar
    * @param scalar 
@@ -2484,6 +2478,12 @@ class Point {
     this.y = p2.y ?? 0;
     return this;
   }
+  /**
+   * 
+   */
+  toArray() {
+    return [this.x, this.y];
+  }
   toJson(z = 0) {
     return {
       x: this.x,
@@ -2491,6 +2491,9 @@ class Point {
       z
     };
   }
+  toVector3(z = 0) {
+    return new Vector3(this.x, this.y, z);
+  }
   static adsorb(points, tolerance = 15e-5) {
     const grid = new PointVirtualGrid();
     points.forEach((p2) => grid.insert(p2));
@@ -5209,8 +5212,7 @@ function correction$1(targettLine, lines, intersectMap, errAngle = 15) {
     const center = line.center;
     line.start.rotate(center, diff);
     line.end.rotate(center, diff);
-    if (line.userData.isDoor) doorLines.push(line);
-    else parallelLines.push(line);
+    parallelLines.push(line);
     return line;
   }
   function vertical(line) {
@@ -14928,7 +14930,7 @@ const PRE_PROCESSOR = {
     return doorFind.getLines();
   },
   AxisAlignCorr(lines, option, verticalReferenceLine) {
-    verticalReferenceLine = verticalReferenceLine ?? findVerticalReference(lines);
+    verticalReferenceLine = verticalReferenceLine ?? findVerticalReference(lines.filter((line) => !line.userData.isDoor));
     if (verticalReferenceLine) {
       const t2 = performance.now();
       const lineSegments = AxisAlignCorr.correction(lines, verticalReferenceLine, option);
@@ -15859,6 +15861,18 @@ class CommandManager extends EventDispatcher {
   constructor() {
     super();
   }
+  /** 写入记录
+   * @param name 
+   * @param data 
+   */
+  addOperation(name, data) {
+    const commandFlow = this.getCommandFlow(name);
+    if (!commandFlow) throw new Error(`${name} 命令不存在`);
+    if (commandFlow.writeOperationList) {
+      this.operationList.push({ name, data });
+      this.rollbackList.length = 0;
+    }
+  }
   /** 添加命令流
    * @param name 
    * @returns 

package/src/index.css

@@ -125,12 +125,12 @@
   top: 10px;
 }
 
-.top-\[50\%\] {
-  top: 50%;
+.top-\[20px\] {
+  top: 20px;
 }
 
-.right-\[0px\] {
-  right: 0;
+.top-\[50\%\] {
+  top: 50%;
 }
 
 .right-\[10px\] {
@@ -161,6 +161,10 @@
   left: 20px;
 }
 
+.left-\[50\%\] {
+  left: 50%;
+}
+
 .z-20 {
   z-index: 20;
 }
@@ -169,6 +173,10 @@
   z-index: 100;
 }
 
+.z-\[8\] {
+  z-index: 8;
+}
+
 .z-\[11\] {
   z-index: 11;
 }
@@ -403,11 +411,21 @@
   flex-shrink: 1;
 }
 
+.translate-x-\[-50\%\] {
+  --tw-translate-x: -50%;
+  translate: var(--tw-translate-x) var(--tw-translate-y);
+}
+
 .translate-y-\[-50\%\] {
   --tw-translate-y: -50%;
   translate: var(--tw-translate-x) var(--tw-translate-y);
 }
 
+.translate-y-\[100\%\] {
+  --tw-translate-y: 100%;
+  translate: var(--tw-translate-x) var(--tw-translate-y);
+}
+
 .rotate-90 {
   rotate: 90deg;
 }
@@ -553,22 +571,10 @@
   border-bottom-width: 1px;
 }
 
-.\!border-\[var\(--primary-color\)\] {
-  border-color: var(--primary-color) !important;
-}
-
-.border-\[\#00ff0a\] {
-  border-color: #00ff0a;
-}
-
 .border-\[\#ccc\] {
   border-color: #ccc;
 }
 
-.border-\[\#fff\] {
-  border-color: #fff;
-}
-
 .border-t-\[\#eee\] {
   border-top-color: #eee;
 }
@@ -585,6 +591,10 @@
   background-color: var(--primary-color) !important;
 }
 
+.\!bg-transparent {
+  background-color: #0000 !important;
+}
+
 .bg-\[\#717171\] {
   background-color: #717171;
 }
@@ -601,6 +611,10 @@
   background-color: #f0f0f0;
 }
 
+.bg-\[rgba\(0\,0\,0\,0\.5\)\] {
+  background-color: #00000080;
+}
+
 .bg-\[var\(--el-color-primary\)\] {
   background-color: var(--el-color-primary);
 }
@@ -795,6 +809,12 @@
   transition-duration: var(--tw-duration, var(--default-transition-duration));
 }
 
+.transition-transform {
+  transition-property: transform, translate, scale, rotate;
+  transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
+  transition-duration: var(--tw-duration, var(--default-transition-duration));
+}
+
 .select-none {
   -webkit-user-select: none;
   user-select: none;
@@ -1017,8 +1037,15 @@ button[data-v-bb22d14b]:active {
     color: #a7a7a7
 }
 
-[data-v-461b52cf] {
+[data-v-3cf5db0e] {
     font-family: 宋体;
+}
+.button[data-v-3cf5db0e] {
+    padding: 5px 10px;
+    border: none;
+    background: var(--primary-color);
+    color: white;
+    border-radius: 6px;
 }
 
 .editorToolContent .el-checkbox__label {