build-dxf 0.0.20-2 → 0.0.20-4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.0.20-2",
+  "version": "0.0.20-4",
   "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) {
@@ -1475,7 +1476,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 +1486,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 +1500,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 对每个点组进行线偏移处理，生成具有指定宽度的墙体路径

package/src/index.css

@@ -104,6 +104,10 @@
   z-index: 11;
 }
 
+.z-\[20\] {
+  z-index: 20;
+}
+
 .z-\[1000\] {
   z-index: 1000;
 }
@@ -238,12 +242,12 @@
   width: 200px;
 }
 
-.w-full {
-  width: 100%;
+.w-fit {
+  width: fit-content;
 }
 
-.max-w-\[100px\] {
-  max-width: 100px;
+.w-full {
+  width: 100%;
 }
 
 .max-w-\[150px\] {
@@ -616,7 +620,7 @@
   inherits: false
 }
 
-[data-v-26d57fb7] {
+[data-v-a95f67da] {
     font-family: 宋体;
 }
 

package/src/index2.js

@@ -644,17 +644,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 +669,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);

package/src/index3.js

@@ -1498,11 +1498,12 @@ class RenderManager extends Component {
       const drawDoorData = userData.drawDoorData;
       const insetionArr = this.quadtree.queryLineSegment(line2).filter((r) => r.line !== line2 && !r.userData?.isDoor).map((r) => ({ index: this.lines.indexOf(r.line) }));
       return {
-        start: line2.start.toJson(),
-        end: line2.end.toJson(),
+        start: line2.start.toJson(this.dxf.originalZAverage),
+        end: line2.end.toJson(this.dxf.originalZAverage),
         insetionArr,
         isDoor: userData.isDoor,
         doorDirectConnection: userData.isDoor,
+        length: line2.length(),
         isWindow: userData.isWindow,
         drawDoorData: drawDoorData && drawDoorData.map((w) => ({
           p: { x: w.p.x, y: w.p.y, z: w.p.z },
@@ -1735,7 +1736,7 @@ const _hoisted_11 = {
 };
 const _hoisted_12 = {
   key: 0,
-  class: "flex flex-row items-center flex-wrap justify-between gap-[10px] mt-[10px] text-[10px]"
+  class: "flex flex-row items-center justify-between gap-[10px] mt-[10px] text-[10px]"
 };
 const _hoisted_13 = { class: "border-t-1 border-t-[#eee] mt-[5px] pt-[5px] h-[20px] flex items-center gap-[10px]" };
 const _hoisted_14 = {
@@ -1885,7 +1886,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           nextTick(() => resizeObserver.observe(elRef.value));
         }
-      }, 20);
+      }, 100);
       defaultComponent.addEventListener("selectLineChange", () => {
         selectLineCount.value = defaultComponent.selectLines.length;
         hasWindowLine.value = defaultComponent.selectLines.some((l) => l.userData.isWindow);
@@ -1900,13 +1901,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", {
         ref_key: "elRef",
         ref: elRef,
-        class: "editorTool pointer-events-none overflow-hidden absolute left-0 top-0 w-full h-full z-[10000] flex flex-row justify-between p-[5px] box-border select-none pointer-events-[all]"
+        class: "editorTool pointer-events-none overflow-hidden absolute left-0 top-0 w-full h-full z-[20] flex flex-row justify-between p-[5px] box-border select-none pointer-events-[all]"
       }, [
         createVNode(Transition, null, {
           default: withCtx(() => [
             showShortcutKey.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
               (openBlock(), createElementBlock(Fragment, null, renderList(shortcutKeys, (item) => {
-                return createElementVNode("p", {
+                return createElementVNode("div", {
                   class: "p-[4px_0px] flex justify-between text-right border-b-1 border-b-[rgba(255,255,255,0.1)] last-of-type:border-b-0",
                   key: item.name
                 }, [
@@ -1922,14 +1923,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "toolBarRef",
           ref: toolBarRef,
           style: normalizeStyle({ left: toolBarPosition.value.left + "px", top: toolBarPosition.value.top + "px" }),
-          class: normalizeClass(["pointer-events-auto max-w-[260px] transition-[border-radius] text-[#333] absolute z-[11] bg-white select-none", { "rounded-[8px] ": toolBarExpand.value }]),
+          class: normalizeClass(["pointer-events-auto w-fit max-w-[260px] transition-[border-radius] text-[#333] absolute z-[11] bg-white select-none", { "rounded-[8px] ": toolBarExpand.value }]),
           onMousedown: _cache[13] || (_cache[13] = (e) => e.stopPropagation())
         }, [
           createElementVNode("div", {
             onMousedown: dragMoveHelper,
             class: normalizeClass([{ "border-b-[#eee]": toolBarExpand.value }, "flex flex-row justify-between header text-[14px] font-bold p-[10px 0px] border-b-1"])
           }, [
-            _cache[15] || (_cache[15] = createStaticVNode('<div class="flex flex-row" data-v-26d57fb7><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-26d57fb7><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-26d57fb7><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-26d57fb7></path></svg></div><h5 class="flex text-[12px] items-center pointer-events-none" data-v-26d57fb7>绘制工具</h5></div>', 1)),
+            _cache[15] || (_cache[15] = createStaticVNode('<div class="flex flex-row" data-v-a95f67da><div class="p-[2px_5px] flex items-center pointer-events-none" data-v-a95f67da><svg fill="#aaa" width="20" height="20" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" data-v-a95f67da><path d="M341.333333 298.666667a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m0 298.666666a85.333333 85.333333 0 1 0 0-170.666666 85.333333 85.333333 0 0 0 0 170.666666z m85.333334 213.333334a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m256-512a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z m85.333333 213.333333a85.333333 85.333333 0 1 1-170.666667 0 85.333333 85.333333 0 0 1 170.666667 0z m-85.333333 384a85.333333 85.333333 0 1 0 0-170.666667 85.333333 85.333333 0 0 0 0 170.666667z" data-v-a95f67da></path></svg></div><h5 class="flex text-[12px] items-center pointer-events-none" data-v-a95f67da>绘制工具</h5></div>', 1)),
             createElementVNode("div", {
               onMousedown: _cache[0] || (_cache[0] = (e) => e.stopPropagation()),
               onClick: _cache[1] || (_cache[1] = ($event) => toolBarExpand.value = !toolBarExpand.value),
@@ -2008,7 +2009,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _ctx.permission === "admin" ? (openBlock(), createElementBlock("div", _hoisted_12, [
               createVNode(unref(ElButton), {
-                style: { "padding": "5px", "font-size": "10px" },
+                style: { "padding": "0px", "font-size": "10px" },
                 size: "small",
                 type: "success",
                 onClick: selectLocalFile
@@ -2020,37 +2021,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 __: [17]
               }),
               createVNode(unref(ElButton), {
-                style: { "padding": "5px", "font-size": "10px" },
+                style: { "padding": "0px", "font-size": "10px" },
                 size: "small",
                 type: "primary",
-                onClick: _cache[5] || (_cache[5] = ($event) => unref(dxfSystem).Dxf.download("test.dxf"))
+                onClick: _cache[5] || (_cache[5] = ($event) => console.log(unref(dxfSystem).Dxf.originalData))
               }, {
                 default: withCtx(() => _cache[18] || (_cache[18] = [
-                  createTextVNode(" 下载 DXF ", -1)
+                  createTextVNode(" 打印Json ", -1)
                 ])),
                 _: 1,
                 __: [18]
               }),
               createVNode(unref(ElButton), {
-                style: { "padding": "5px", "font-size": "10px" },
+                style: { "padding": "0px", "font-size": "10px" },
                 size: "small",
                 type: "primary",
-                onClick: _cache[6] || (_cache[6] = ($event) => unref(whiteModel).downloadGltf("test.glb", true))
+                onClick: _cache[6] || (_cache[6] = ($event) => unref(dxfSystem).Dxf.download("test.dxf"))
               }, {
                 default: withCtx(() => _cache[19] || (_cache[19] = [
-                  createTextVNode(" 下载 白膜 ", -1)
+                  createTextVNode(" 下载DXF ", -1)
                 ])),
                 _: 1,
                 __: [19]
               }),
               createVNode(unref(ElButton), {
-                style: { "padding": "5px", "font-size": "10px" },
+                style: { "padding": "0px", "font-size": "10px" },
                 size: "small",
                 type: "primary",
-                onClick: _cache[7] || (_cache[7] = ($event) => console.log(unref(dxfSystem).Dxf.originalData))
+                onClick: _cache[7] || (_cache[7] = ($event) => unref(whiteModel).downloadGltf("test.glb", true))
               }, {
                 default: withCtx(() => _cache[20] || (_cache[20] = [
-                  createTextVNode(" 打印Json ", -1)
+                  createTextVNode(" 下载白膜 ", -1)
                 ])),
                 _: 1,
                 __: [20]
@@ -2165,7 +2166,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26d57fb7"]]);
+const EditorTool = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a95f67da"]]);
 let Editor$1 = class Editor extends Component {
   static name = "Editor";
   container = new THREE.Group();

package/src/utils/DxfSystem/components/Dxf.d.ts

@@ -22,6 +22,7 @@ export interface OriginalDataItem {
             z?: number;
         };
     }[];
+    length: number;
     isDoor?: boolean;
     doorDirectConnection?: boolean;
     drawDoorData?: {

package/src/utils/Quadtree/Point.d.ts

@@ -125,9 +125,10 @@ export declare class Point<T = Record<string, any>> {
         x: number;
         y: number;
     }): void;
-    toJson(): {
+    toJson(z?: number): {
         x: number;
         y: number;
+        z: number;
     };
     static from(arr: any): Point<Record<string, any>>;
     static zero(): Point<Record<string, any>>;