build-dxf 0.0.20-16 → 0.0.20-18

package/package.json

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

package/src/build.js

@@ -1376,11 +1376,15 @@ class X extends j {
       let [a, h, l, d] = c;
       const f = Math.min(h, d), m = Math.max(h, d), g = (i.width * 0.5 - 0.4 * n.scale) * (a < 0 ? -1 : 1), u = (m - f) * 0.45;
       r.fillStyle = "#fff", r.font = `${0.15 * n.scale}px Arial`, r.textAlign = "center", r.textBaseline = "middle", r.fillText((m - f).toFixed(2) + "cm", g, f + (m - f) * 0.5), r.moveTo(g - 0.1 * n.scale, f), r.lineTo(g + 0.1 * n.scale, f), r.moveTo(g, f), r.lineTo(g, u + f), r.moveTo(g, m), r.lineTo(g, m - u), r.moveTo(g - 0.1 * n.scale, m), r.lineTo(g + 0.1 * n.scale, m);
-    }), r.closePath(), r.strokeStyle = "#fff", r.stroke(), i instanceof HTMLCanvasElement ? new Promise((c) => {
+    }), r.closePath(), r.strokeStyle = "#fff", r.stroke(), "toBlob" in i ? new Promise((c) => {
       i.toBlob((a) => {
         c(a);
       }, e, 1);
-    }) : i.toBuffer(e);
+    }) : new Promise((c) => {
+      i.toBuffer((a, h) => {
+        console.error(a), c(h);
+      }, e);
+    });
   }
   /**
    * 将点json结构转换为Dxf string
@@ -1424,7 +1428,7 @@ class X extends j {
     if (typeof window < "u") {
       const o = document.createElement("a");
       o.href = URL.createObjectURL(i), o.download = t, o.click();
-    } else typeof global < "u" && (await G("fs", !1)).writeFileSync(t, i);
+    } else typeof global < "u" ? (await G("fs", !1)).writeFileSync(t, i) : console.error("图片下载失败");
     return !0;
   }
   /**
@@ -1959,17 +1963,17 @@ class rt {
       x.start === u && L.multiplyScalar(-1);
       const P = o.queryCircle(u, n).filter((D) => D.userData !== x).sort((D, E) => D.point.distance(u) - E.point.distance(u)), A = [];
       for (let D = 0; D < P.length; D++) {
-        const E = e.findIndex((T) => T.point === P[D].point), Y = t[w].uuid, B = e[E].uuid;
-        if (S.has(`${Y}.${B}`)) continue;
-        S.add(`${Y}.${B}`), S.add(`${B}.${Y}`);
+        const E = e.findIndex((T) => T.point === P[D].point), B = t[w].uuid, Y = e[E].uuid;
+        if (S.has(`${B}.${Y}`)) continue;
+        S.add(`${B}.${Y}`), S.add(`${Y}.${B}`);
         const Q = P[D].point, C = new b(u.clone(), Q.clone());
         if (C.direction().angleBetween(L, "angle") < i) {
           const T = t[E].line.direction();
           P[D].userData.start.equal(P[D].point) && T.multiplyScalar(-1), C.direction().multiplyScalar(-1).angleBetween(T, "angle") < i && (s.queryLineSegment(C).length || A.push({
             findData: P[D],
-            findUuid: B,
+            findUuid: Y,
             doorLine: C,
-            doorUuid: Y
+            doorUuid: B
           }));
         }
       }
@@ -2019,16 +2023,16 @@ class rt {
       const x = t.findIndex((E) => E.uuid === u.doorUuid), w = e.findIndex((E) => E.uuid === u.findUuid), S = t[x].point.clone(), L = e[w].point.clone(), P = this.findLongLineSegment(t[x].line), A = this.findLongLineSegment(e[w].line), D = P.projectPoint(L);
       if (D) {
         S.copy(D);
-        const E = new b(S, L), Y = A.includedAngle(E);
-        (Y < 10 || Y > 170 || Math.abs(90 - Y) < 10) && g.push({
+        const E = new b(S, L), B = A.includedAngle(E);
+        (B < 10 || B > 170 || Math.abs(90 - B) < 10) && g.push({
           start: S,
           end: L
         });
       } else {
         const E = A.projectPoint(S);
         E && L.copy(E);
-        const Y = new b(S, L), B = P.includedAngle(Y);
-        (B < 10 || B > 170 || Math.abs(90 - B) < 10) && g.push({
+        const B = new b(S, L), Y = P.includedAngle(B);
+        (Y < 10 || Y > 170 || Math.abs(90 - Y) < 10) && g.push({
           start: S,
           end: L
         });