build-dxf 0.0.20-9 → 0.0.20

package/package.json

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

package/src/build.d.ts

@@ -14,7 +14,6 @@ export declare function createEditor(dom: HTMLDivElement, camera?: THREE.Camera,
         obj: File;
         glb: File;
         gltf: File;
-        json: File;
     }>;
 }>;
 /**
@@ -26,7 +25,6 @@ export declare function getFileAll(dxfSystem?: DxfSystem): Promise<{
     obj: File;
     glb: File;
     gltf: File;
-    json: File;
 }>;
 /** 获取全局DxfSystem
  * @returns

package/src/build.js

@@ -365,11 +365,10 @@ class Point {
     this.x = p.x ?? 0;
     this.y = p.y ?? 0;
   }
-  toJson(z = 0) {
+  toJson() {
     return {
       x: this.x,
-      y: this.y,
-      z
+      y: this.y
     };
   }
   static from(arr) {
@@ -1476,7 +1475,7 @@ class Dxf extends Component {
         filterLines.push(line2);
       } else filterLines.push(line);
     }
-    return filterLines.length > 3 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
+    return filterLines.length > 2 ? linesToPath(this.mergeSameDirectionLine(filterLines)) : [];
   }
   /**
    * 移除短线段
@@ -1486,7 +1485,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(), currentIndex = i;
+      const line = lines[i], len = line.length();
       if (len > shortLine || filterLines.length === 0) {
         filterLines.push(line);
         continue;
@@ -1500,29 +1499,24 @@ class Dxf extends Component {
         } else break;
       }
       if (!nextline) continue;
-      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]);
+      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);
         }
-        filterLines.push(nextline);
       } else {
-        i = currentIndex;
+        preLine.points[1].copy(nextline.points[0]);
       }
+      filterLines.push(nextline);
     }
-    return filterLines.length > 3 ? linesToPath(filterLines) : [];
+    return filterLines.length > 2 ? linesToPath(filterLines) : [];
   }
   /** 线偏移
    * @description 使用 ClipperLib 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径
@@ -3132,13 +3126,11 @@ async function getFileAll(dxfSystem = gloabalDxfSystem) {
   const obj = new File([await whiteModel.toOBJBlob()], "model.obj", { type: "application/octet-stream" });
   const glb = new File([await whiteModel.toGltfBlob(true)], "model.glb", { type: "application/octet-stream" });
   const gltf = new File([await whiteModel.toGltfBlob(false)], "model.gltf", { type: "application/json" });
-  const json = new File([JSON.stringify(dxfSystem.Dxf.originalData)], "json.json", { type: "application/json" });
   return {
     dxf,
     obj,
     glb,
-    gltf,
-    json
+    gltf
   };
 }
 function getGlobalDxfSystem() {

package/src/index.css

@@ -104,14 +104,14 @@
   z-index: 11;
 }
 
-.z-\[20\] {
-  z-index: 20;
-}
-
 .z-\[1000\] {
   z-index: 1000;
 }
 
+.z-\[10000\] {
+  z-index: 10000;
+}
+
 .container {
   width: 100%;
 }
@@ -214,6 +214,10 @@
   height: 20px;
 }
 
+.h-\[20px\] {
+  height: 20px;
+}
+
 .h-\[100vh\] {
   height: 100vh;
 }
@@ -234,36 +238,32 @@
   width: 200px;
 }
 
-.w-fit {
-  width: fit-content;
-}
-
 .w-full {
   width: 100%;
 }
 
-.max-w-\[150px\] {
-  max-width: 150px;
-}
-
-.max-w-\[180px\] {
-  max-width: 180px;
+.max-w-\[100px\] {
+  max-width: 100px;
 }
 
 .max-w-\[260px\] {
   max-width: 260px;
 }
 
+.min-w-\[140px\] {
+  min-width: 140px;
+}
+
 .min-w-\[150px\] {
   min-width: 150px;
 }
 
-.rotate-90 {
-  rotate: 90deg;
+.flex-1 {
+  flex: 1;
 }
 
-.\!cursor-no-drop {
-  cursor: no-drop !important;
+.rotate-90 {
+  rotate: 90deg;
 }
 
 .cursor-pointer {
@@ -338,7 +338,7 @@
   border-radius: var(--radius-lg);
 }
 
-.border, .border-1 {
+.border {
   border-style: var(--tw-border-style);
   border-width: 1px;
 }
@@ -353,10 +353,6 @@
   border-bottom-width: 1px;
 }
 
-.border-\[\#ccc\] {
-  border-color: #ccc;
-}
-
 .border-t-\[\#eee\] {
   border-top-color: #eee;
 }
@@ -369,12 +365,12 @@
   border-bottom-color: #ffffff1a;
 }
 
-.\!bg-\[var\(--primary-color\)\] {
-  background-color: var(--primary-color) !important;
+.\!bg-\[\#409eff\] {
+  background-color: #409eff !important;
 }
 
-.bg-\[\#ccc\] {
-  background-color: #ccc;
+.\!bg-\[var\(--primary-color\)\] {
+  background-color: var(--primary-color) !important;
 }
 
 .bg-\[\#f0f0f0\] {
@@ -415,8 +411,8 @@
   padding: 0 10px;
 }
 
-.p-\[2px\] {
-  padding: 2px;
+.p-\[2px_0px\] {
+  padding: 2px 0;
 }
 
 .p-\[2px_5px\] {
@@ -431,6 +427,10 @@
   padding: 5px;
 }
 
+.p-\[5px_0px\] {
+  padding: 5px 0;
+}
+
 .p-\[5px_20px\] {
   padding: 5px 20px;
 }
@@ -477,14 +477,14 @@
   font-weight: var(--font-weight-bold);
 }
 
-.text-nowrap {
-  text-wrap: nowrap;
-}
-
 .text-\[\#333\] {
   color: #333;
 }
 
+.text-\[\#888\] {
+  color: #888;
+}
+
 .text-\[\#999\] {
   color: #999;
 }
@@ -505,10 +505,6 @@
   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, );
@@ -542,10 +538,6 @@
   }
 }
 
-.active\:\!scale-\[1\]:active {
-  scale: 1 !important;
-}
-
 .active\:scale-\[0\.7\]:active {
   scale: .7;
 }
@@ -636,7 +628,7 @@
   inherits: false
 }
 
-[data-v-6aea548c] {
+[data-v-a5aa9d5a] {
     font-family: 宋体;
 }
 

package/src/index2.js

@@ -289,6 +289,7 @@ 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));
@@ -464,7 +465,7 @@ class EventInput extends Component {
    * @returns 
    */
   isKeyDown(key) {
-    return this.keyList.has(key.toLocaleLowerCase()) || this.mouseList.has(key.toLocaleLowerCase());
+    return this.keyList.has(key) || this.mouseList.has(key);
   }
   /**
    * 是否按下按键组
@@ -643,6 +644,17 @@ 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", {
@@ -668,7 +680,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 label: "墙体(E)"
               }, null, 8, ["modelValue"])
             ]),
-            _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))
+            _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))
           ])
         ])
       ], 512);