build-dxf 0.0.20-1 → 0.0.20-10

package/package.json

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

package/src/build.js

@@ -365,10 +365,11 @@ class Point {
     this.x = p.x ?? 0;
     this.y = p.y ?? 0;
   }
-  toJson() {
+  toJson(z = 0) {
     return {
       x: this.x,
-      y: this.y
+      y: this.y,
+      z
     };
   }
   static from(arr) {
@@ -852,6 +853,10 @@ class LineSegment {
   constructor(p1 = new Point(), p2 = new Point()) {
     this.points = [p1, p2];
   }
+  set(p1, p2) {
+    this.start.copy(p1);
+    this.end.copy(p2);
+  }
   /** 膨胀
    * @description 向线段的两个端点分别膨胀 width
    * @param width 
@@ -1475,7 +1480,7 @@ class Dxf extends Component {
         filterLines.push(line2);
       } else filterLines.push(line);
     }
-    return filterLines.length > 2 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
+    return filterLines.length > 3 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
   }
   /**
    * 移除短线段
@@ -1485,7 +1490,7 @@ class Dxf extends Component {
   removeShortLine(path, shortLine = this.shortLine) {
     const lines = pathToLines(path), filterLines = [], PI_1 = Math.PI / 180;
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i], len = line.length();
+      const line = lines[i], len = line.length(), currentIndex = i;
       if (len > shortLine || filterLines.length === 0) {
         filterLines.push(line);
         continue;
@@ -1499,24 +1504,29 @@ class Dxf extends Component {
         } else break;
       }
       if (!nextline) continue;
-      const intersectPoint = preLine.getIntersection(nextline);
-      if (intersectPoint) {
-        const p0 = preLine.points[1].clone(), p1 = nextline.points[0].clone();
-        preLine.points[1].copy(intersectPoint);
-        nextline.points[0].copy(intersectPoint);
-        if (preLine.length() < this.width) {
-          preLine.points[1].copy(p0);
-          nextline.points[0].copy(p0);
-        } else if (nextline.length() < this.width) {
-          preLine.points[1].copy(p1);
-          nextline.points[0].copy(p1);
+      const targetLine = lines[i - 1];
+      if (preLine.length() > targetLine.length()) {
+        const intersectPoint = preLine.getIntersection(nextline);
+        if (intersectPoint) {
+          const p0 = preLine.points[1].clone(), p1 = nextline.points[0].clone();
+          preLine.points[1].copy(intersectPoint);
+          nextline.points[0].copy(intersectPoint);
+          if (preLine.length() < this.width) {
+            preLine.points[1].copy(p0);
+            nextline.points[0].copy(p0);
+          } else if (nextline.length() < this.width) {
+            preLine.points[1].copy(p1);
+            nextline.points[0].copy(p1);
+          }
+        } else {
+          preLine.points[1].copy(nextline.points[0]);
         }
+        filterLines.push(nextline);
       } else {
-        preLine.points[1].copy(nextline.points[0]);
+        i = currentIndex;
       }
-      filterLines.push(nextline);
     }
-    return filterLines.length > 2 ? linesToPath(filterLines) : [];
+    return filterLines.length > 3 ? linesToPath(filterLines) : [];
   }
   /** 线偏移
    * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
@@ -2284,7 +2294,6 @@ class DoorsAnalysis {
         console.warn(`门的线段顺序${item[4]} 没有drawDoorData属性`);
       }
     });
-    console.log("门点位数量：", doorPoints.length);
     return doorPoints;
   }
   /**

package/src/index.css

@@ -104,12 +104,12 @@
   z-index: 11;
 }
 
-.z-\[1000\] {
-  z-index: 1000;
+.z-\[20\] {
+  z-index: 20;
 }
 
-.z-\[10000\] {
-  z-index: 10000;
+.z-\[1000\] {
+  z-index: 1000;
 }
 
 .container {
@@ -214,10 +214,6 @@
   height: 20px;
 }
 
-.h-\[20px\] {
-  height: 20px;
-}
-
 .h-\[100vh\] {
   height: 100vh;
 }
@@ -238,34 +234,42 @@
   width: 200px;
 }
 
+.w-fit {
+  width: fit-content;
+}
+
 .w-full {
   width: 100%;
 }
 
-.max-w-\[100px\] {
-  max-width: 100px;
+.max-w-\[150px\] {
+  max-width: 150px;
 }
 
-.max-w-\[260px\] {
-  max-width: 260px;
+.max-w-\[180px\] {
+  max-width: 180px;
 }
 
-.min-w-\[140px\] {
-  min-width: 140px;
+.max-w-\[200px\] {
+  max-width: 200px;
 }
 
-.min-w-\[150px\] {
-  min-width: 150px;
+.max-w-\[260px\] {
+  max-width: 260px;
 }
 
-.flex-1 {
-  flex: 1;
+.min-w-\[150px\] {
+  min-width: 150px;
 }
 
 .rotate-90 {
   rotate: 90deg;
 }
 
+.\!cursor-no-drop {
+  cursor: no-drop !important;
+}
+
 .cursor-pointer {
   cursor: pointer;
 }
@@ -318,6 +322,10 @@
   border-radius: 2px;
 }
 
+.rounded-\[4px\] {
+  border-radius: 4px;
+}
+
 .rounded-\[6px\] {
   border-radius: 6px;
 }
@@ -338,7 +346,7 @@
   border-radius: var(--radius-lg);
 }
 
-.border {
+.border, .border-1 {
   border-style: var(--tw-border-style);
   border-width: 1px;
 }
@@ -353,6 +361,10 @@
   border-bottom-width: 1px;
 }
 
+.border-\[\#ccc\] {
+  border-color: #ccc;
+}
+
 .border-t-\[\#eee\] {
   border-top-color: #eee;
 }
@@ -369,6 +381,10 @@
   background-color: var(--primary-color) !important;
 }
 
+.bg-\[\#ccc\] {
+  background-color: #ccc;
+}
+
 .bg-\[\#f0f0f0\] {
   background-color: #f0f0f0;
 }
@@ -407,6 +423,10 @@
   padding: 0 10px;
 }
 
+.p-\[2px\] {
+  padding: 2px;
+}
+
 .p-\[2px_5px\] {
   padding: 2px 5px;
 }
@@ -465,6 +485,14 @@
   font-weight: var(--font-weight-bold);
 }
 
+.text-nowrap {
+  text-wrap: nowrap;
+}
+
+.text-wrap {
+  text-wrap: wrap;
+}
+
 .text-\[\#333\] {
   color: #333;
 }
@@ -489,6 +517,10 @@
   color: var(--color-primary);
 }
 
+.opacity-30 {
+  opacity: .3;
+}
+
 .blur {
   --tw-blur: blur(8px);
   filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
@@ -522,6 +554,10 @@
   }
 }
 
+.active\:\!scale-\[1\]:active {
+  scale: 1 !important;
+}
+
 .active\:scale-\[0\.7\]:active {
   scale: .7;
 }
@@ -612,7 +648,7 @@
   inherits: false
 }
 
-[data-v-a5aa9d5a] {
+[data-v-953dfd98] {
     font-family: 宋体;
 }
 

package/src/index2.js

@@ -289,7 +289,6 @@ class OriginalLineRender extends Component {
       const dxf = this.Dxf;
       const center = dxf.originalBox.center;
       this.Renderer?.orbitControls?.target.set(center.x, center.y, 0);
-      this.Renderer?.camera?.position.set(center.x, center.y, 0).add(new THREE.Vector3(1, 1, 1).multiplyScalar(10));
       const lineAnalysis = parent.findComponentByName("LineAnalysis");
       const array = lineAnalysis.appendLineSegmentList.flatMap((line) => line.points.flatMap((p) => [p.x, p.y, dxf.originalZAverage]));
       this.appendLineMode.geometry = new THREE.BufferGeometry().setAttribute("position", new THREE.BufferAttribute(new Float32Array(array), 3, true));
@@ -465,7 +464,7 @@ class EventInput extends Component {
    * @returns 
    */
   isKeyDown(key) {
-    return this.keyList.has(key) || this.mouseList.has(key);
+    return this.keyList.has(key.toLocaleLowerCase()) || this.mouseList.has(key.toLocaleLowerCase());
   }
   /**
    * 是否按下按键组
@@ -644,17 +643,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])),
               _: 1,
               __: [9]
-            }),
-            createVNode(unref(ElButton), {
-              size: "small",
-              type: "success",
-              onClick: selectDetailsPointFile
-            }, {
-              default: withCtx(() => _cache[10] || (_cache[10] = [
-                createTextVNode(" 编辑模式 ", -1)
-              ])),
-              _: 1,
-              __: [10]
             })
           ]),
           isLook.value ? (openBlock(), createElementBlock("div", {
@@ -680,7 +668,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 label: "墙体(E)"
               }, null, 8, ["modelValue"])
             ]),
-            _cache[11] || (_cache[11] = createStaticVNode('<div class="mt-[5px] text-[#c9c9c9] text-[10px]"><p class="text-right">详情点射线辅助线快捷键：R</p><p class="text-right">墙壁合并追加线快捷键：A</p><p class="text-right">线段序号快捷键：T</p><p class="text-right">线段端点标示快捷键：P</p><p class="text-right">线段长度（单位米）快捷键：L</p></div>', 1))
+            _cache[10] || (_cache[10] = createStaticVNode('<div class="mt-[5px] text-[#c9c9c9] text-[10px]"><p class="text-right">详情点射线辅助线快捷键：R</p><p class="text-right">墙壁合并追加线快捷键：A</p><p class="text-right">线段序号快捷键：T</p><p class="text-right">线段端点标示快捷键：P</p><p class="text-right">线段长度（单位米）快捷键：L</p></div>', 1))
           ])
         ])
       ], 512);