mxcad 1.0.77 → 1.0.79

package/dist/mxcad.d.ts

@@ -2273,7 +2273,7 @@ export declare class McObject {
 	 * @param isWorkThread 是否使用工作线程打开文件，默认为 true
 	 * @returns 是否成功打开文件
 	 */
-	openWebFile(sFileUrl: string, retCall?: (iRet: number) => void, isWorkThread?: boolean): boolean;
+	openWebFile(sFileUrl: string, retCall?: (iRet: number) => void, isWorkThread?: boolean, sInitialParameter?: string): boolean;
 	/**
 	 * 获取当前文件名
 	 * @returns 当前文件名
@@ -2886,6 +2886,8 @@ export interface MxCadConfig {
 	networkFonts?: string[];
 	/** 是否支持多选 */
 	multipleSelect?: boolean;
+	/** 打开文件参数设置 */
+	openParameter?: string;
 }
 /** 创建MxCad实例 */
 export declare const createMxCad: (config?: MxCadConfig) => Promise<McObject>;

package/dist/mxcad.es.js

@@ -1789,15 +1789,15 @@ class _ {
   getImp() {
     return this.imp;
   }
-  openWebFile(D, C, B = !0) {
-    let F = this.imp.mxdrawObject, A = Math.round(Math.random() * 1e7);
+  openWebFile(D, C, B = !0, F = "") {
+    let A = this.imp.mxdrawObject, e = Math.round(Math.random() * 1e7);
     if (C) {
-      let e = (t, r) => {
-        F.removeEventFuction("openFileComplete", e), A == r && C(t);
+      let t = (r, s) => {
+        A.removeEventFuction("openFileComplete", t), e == s && C(r);
       };
-      F.addEvent("openFileComplete", e);
+      A.addEvent("openFileComplete", t);
     }
-    return _.currentFileName = D.split("/").pop(), this.imp.openWebFile(D, B, A);
+    return _.currentFileName = D.split("/").pop(), this.imp.openWebFile(D, B, e, F || "");
   }
   getCurrentFileName() {
     return _.currentFileName;
@@ -2129,7 +2129,7 @@ class HD {
     return this.App.GetCurrentMxCAD().GetDatabase();
   }
 }
-const hD = "1.0.77", lC = "SharedArrayBuffer" in window, eD = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src), cC = (E, D = self.location.href) => eD ? `https://unpkg.com/mxcad@${hD}/dist/wasm/2d-st/${E}` : D + E, mC = (E, D = self.location.href) => eD ? `https://unpkg.com/mxcad@${hD}/dist/wasm/2d/${E}` : D + E, pC = (E, D = self.location.href) => eD ? `https://unpkg.com/mxcad@${hD}/dist/wasm/3d/${E}` : D + E, ND = (E) => new Promise((D, C) => {
+const hD = "1.0.79", lC = "SharedArrayBuffer" in window, eD = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src), cC = (E, D = self.location.href) => eD ? `https://unpkg.com/mxcad@${hD}/dist/wasm/2d-st/${E}` : D + E, mC = (E, D = self.location.href) => eD ? `https://unpkg.com/mxcad@${hD}/dist/wasm/2d/${E}` : D + E, pC = (E, D = self.location.href) => eD ? `https://unpkg.com/mxcad@${hD}/dist/wasm/3d/${E}` : D + E, ND = (E) => new Promise((D, C) => {
   const B = document.createElement("script");
   B.src = E, B.type = "text/javascript", B.crossOrigin = "anonymous", document.body.appendChild(B), B.onload = () => {
     D();
@@ -2179,7 +2179,7 @@ const hC = (E) => {
   }
 }), wC = async (E) => {
   MD.state.MxFun || await EC();
-  const { multipleSelect: D, networkFonts: C, fontspath: B, locateFile: F, wasmBinary: A, canvas: e, userIdentitySign: t, onOpenFileComplete: r, fileUrl: s, onInit: o = () => {
+  const { multipleSelect: D, openParameter: C, networkFonts: B, fontspath: F, locateFile: A, wasmBinary: e, canvas: t, userIdentitySign: r, onOpenFileComplete: s, fileUrl: o, onInit: u = () => {
     h.setIniset({
       EnableIntelliSelect: !0,
       IntelliSelectType: 1,
@@ -2187,15 +2187,15 @@ const hC = (E) => {
     });
   } } = E || {};
   await _D(() => {
-  }, F, A, B, C), o();
-  let u = await yC(e, t);
-  const l = h.getMxFunTHREE();
-  let c = new l.Vector2();
-  u.getRenderer().getSize(c);
-  const n = i.App.CreateMxCAD(c.width, c.height, u.getCanvas().id, u.isWebgl2(), u.getId());
-  return u.initMxCpp(n), u.addEvent("openFileComplete", () => {
-    r && r();
-  }), s && n.openWebFile(s), n;
+  }, A, e, F, B), u();
+  let l = await yC(t, r);
+  const m = h.getMxFunTHREE();
+  let n = new m.Vector2();
+  l.getRenderer().getSize(n);
+  const c = i.App.CreateMxCAD(n.width, n.height, l.getCanvas().id, l.isWebgl2(), l.getId());
+  return l.initMxCpp(c), l.addEvent("openFileComplete", () => {
+    s && s();
+  }), o && c.openWebFile(o, void 0, !0, C), c;
 };
 async function gC() {
   const E = new O();
@@ -2229,7 +2229,7 @@ class bC extends PD {
   }
 }
 const wD = (E) => {
-  const [D, C, B] = E, { x: F, y: A, z: e } = D, { x: t, y: r, z: s } = C, { x: o, y: u, z: l } = B, c = A * s - r * e - A * l + u * e + r * l - u * s, n = -(F * s - t * e - F * l + o * e + t * l - o * s), m = F * r - t * A - F * u + o * A + t * u - o * r, w = -(F * r * l - F * u * s - t * A * l + t * u * e + o * A * s - o * r * e), b = 2 * (t - F), p = 2 * (r - A), d = 2 * (s - e), x = F * F + A * A + e * e - t * t - r * r - s * s, f = 2 * (o - F), g = 2 * (u - A), M = 2 * (l - e), L = F * F + A * A + e * e - o * o - u * u - l * l, $ = -(n * d * L - n * M * x - p * m * L + p * M * w + g * m * x - g * d * w) / (c * p * M - c * g * d - b * n * M + b * g * m + f * n * d - f * p * m), DC = (c * d * L - c * M * x - b * m * L + b * M * w + f * m * x - f * d * w) / (c * p * M - c * g * d - b * n * M + b * g * m + f * n * d - f * p * m), CC = -(c * p * L - c * g * x - b * n * L + b * g * w + f * n * x - f * p * w) / (c * p * M - c * g * d - b * n * M + b * g * m + f * n * d - f * p * m);
+  const [D, C, B] = E, { x: F, y: A, z: e } = D, { x: t, y: r, z: s } = C, { x: o, y: u, z: l } = B, m = A * s - r * e - A * l + u * e + r * l - u * s, n = -(F * s - t * e - F * l + o * e + t * l - o * s), c = F * r - t * A - F * u + o * A + t * u - o * r, w = -(F * r * l - F * u * s - t * A * l + t * u * e + o * A * s - o * r * e), b = 2 * (t - F), p = 2 * (r - A), d = 2 * (s - e), x = F * F + A * A + e * e - t * t - r * r - s * s, f = 2 * (o - F), g = 2 * (u - A), M = 2 * (l - e), L = F * F + A * A + e * e - o * o - u * u - l * l, $ = -(n * d * L - n * M * x - p * c * L + p * M * w + g * c * x - g * d * w) / (m * p * M - m * g * d - b * n * M + b * g * c + f * n * d - f * p * c), DC = (m * d * L - m * M * x - b * c * L + b * M * w + f * c * x - f * d * w) / (m * p * M - m * g * d - b * n * M + b * g * c + f * n * d - f * p * c), CC = -(m * p * L - m * g * x - b * n * L + b * g * w + f * n * x - f * p * w) / (m * p * M - m * g * d - b * n * M + b * g * c + f * n * d - f * p * c);
   return new THREE.Vector3($, DC, CC);
 };
 function qD() {
@@ -2239,8 +2239,8 @@ function qD() {
   let B = 0, F = "default", A = !0;
   const e = () => {
     E.setUserDraw(
-      (n, m) => {
-        D.radius = A ? D.center.distanceTo(n) : D.center.distanceTo(n) / 2, m.drawCustomEntity(D), m.drawLine(D.center, n);
+      (n, c) => {
+        D.radius = A ? D.center.distanceTo(n) : D.center.distanceTo(n) / 2, c.drawCustomEntity(D), c.drawLine(D.center, n);
       }
     );
   }, t = (n) => {
@@ -2261,11 +2261,11 @@ function qD() {
   const s = (n) => {
     if (F === "3P" && (E.setMessage(`
 \u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E00\u4E2A\u70B9:`), n === T.kOk)) {
-      if (B === 0 && (r.push(E.value()), E.setUserDraw((m, w) => {
-        w.drawLine(r[0], m);
+      if (B === 0 && (r.push(E.value()), E.setUserDraw((c, w) => {
+        w.drawLine(r[0], c);
       }), E.setMessage(`
-\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E8C\u4E2A\u70B9:`)), B === 1 && (r.push(E.value()), E.setUserDraw((m, w) => {
-        const [b, p] = r, d = m;
+\u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E8C\u4E2A\u70B9:`)), B === 1 && (r.push(E.value()), E.setUserDraw((c, w) => {
+        const [b, p] = r, d = c;
         D.center = wD([
           b,
           p,
@@ -2278,25 +2278,25 @@ function qD() {
     }
   };
   let o;
-  const u = (n, m) => {
-    new THREE.Line3(n, m).getCenter(D.center), D.radius = m.distanceTo(n) / 2;
+  const u = (n, c) => {
+    new THREE.Line3(n, c).getCenter(D.center), D.radius = c.distanceTo(n) / 2;
   }, l = (n) => {
     if (F === "2P" && (E.setMessage(`
 \u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E00\u4E2A\u7AEF\u70B9:`), n === T.kOk)) {
-      if (B === 0 && (o = E.value(), E.setUserDraw((m, w) => {
-        u(o, m), w.drawCustomEntity(D), w.drawLine(o, m);
+      if (B === 0 && (o = E.value(), E.setUserDraw((c, w) => {
+        u(o, c), w.drawCustomEntity(D), w.drawLine(o, c);
       }), E.setMessage(`
 \u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E8C\u4E2A\u7AEF\u70B9:`)), B === 1)
         return u(o, E.value()), i.GetCurrentMxCAD().DrawEntity(new W(D.center.x, D.center.y, 0, D.radius)), !0;
       B++;
     }
-  }, c = (n) => {
+  }, m = (n) => {
     if (F === "T") {
       if (E.setMessage(`
 \u6307\u5B9A\u5BF9\u8C61\u4E0E\u5706\u7684\u7B2C\u4E00\u4E2A\u5207\u70B9:`), n === T.kOk) {
         if (B === 0) {
-          const m = E.value();
-          console.log(m), h.getCurrentDraw();
+          const c = E.value();
+          console.log(c), h.getCurrentDraw();
         }
         B++;
       }
@@ -2314,7 +2314,7 @@ function qD() {
         return { exit: !0 };
       if (l(n))
         return { exit: !0 };
-      if (c(n))
+      if (m(n))
         return { exit: !0 };
     },
     (n) => {
@@ -2450,16 +2450,16 @@ async function JD() {
   E.setUserDraw((A, e) => {
     e.setColor(F), C.radius = D.distanceTo(A);
     let t = C.getEndParam().val, s = C.getDistAtParam(t).val / B, o = 0, u = new THREE.Vector3(), l = new THREE.Vector3();
-    for (let c = 0; c < B; c++) {
+    for (let m = 0; m < B; m++) {
       let n = C.getPointAtDist(o).val;
-      o += s, c > 0 ? e.drawMcDbLine(n.x, n.y, n.z, u.x, u.y, u.z) : l = new THREE.Vector3(n.x, n.y, n.z), c == B - 1 && e.drawMcDbLine(n.x, n.y, n.z, l.x, l.y, l.z), u = new THREE.Vector3(n.x, n.y, n.z);
+      o += s, m > 0 ? e.drawMcDbLine(n.x, n.y, n.z, u.x, u.y, u.z) : l = new THREE.Vector3(n.x, n.y, n.z), m == B - 1 && e.drawMcDbLine(n.x, n.y, n.z, l.x, l.y, l.z), u = new THREE.Vector3(n.x, n.y, n.z);
     }
   }), E.setMessage(`
 \u6307\u5B9A\u4E8C\u70B9:`), await E.go(), E.drawReserve();
 }
 h.addCommand("Mx_Polygon", JD);
 function MC(E, D, C) {
-  const B = E.x, F = D.x, A = C.x, e = E.y, t = D.y, r = C.y, s = B - F, o = e - t, u = B - A, l = e - r, c = (B * B - F * F + (e * e - t * t)) / 2, n = (B * B - A * A + (e * e - r * r)) / 2, m = o * u - s * l, w = -(l * c - o * n) / m, b = -(s * n - u * c) / m;
+  const B = E.x, F = D.x, A = C.x, e = E.y, t = D.y, r = C.y, s = B - F, o = e - t, u = B - A, l = e - r, m = (B * B - F * F + (e * e - t * t)) / 2, n = (B * B - A * A + (e * e - r * r)) / 2, c = o * u - s * l, w = -(l * m - o * n) / c, b = -(s * n - u * m) / c;
   return new THREE.Vector3(w, b, 0);
 }
 function PC(E, D) {
@@ -2549,7 +2549,7 @@ async function YD() {
       B = D.value(), D.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u7B2C\u4E8C\u4E2A\u70B9:`), D.setKeyWords("[\u5706\u5FC3(C)/\u7AEF\u70B9(E)]"), D.setUserDraw((p, d) => {
         d.setColor(E), d.drawLine(B, p);
-      }), m();
+      }), c();
     },
     () => {
       if (D.isKeyWordPicked("C")) {
@@ -2581,13 +2581,13 @@ async function YD() {
 \u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F ctrl \u952E\u53D6\u76F8\u53CD\u65B9\u5411)\u6216 [\u89D2\u5EA6(A)/\u5F26\u957F(L)/\u4FEE\u6539\u534A\u5F84(R)]:`
       ), D.setKeyWords("A L R"), o = new Q(), o.setDashLineDisplay(!0), o.setDashArray(0.05), o.setLineWidth(2), o.setColor("#ffd30d"), o.pt1 = A.center, D.setUserDraw((p, d) => {
         A.startPoint = p, o.pt2 = p, d.drawCustomEntity(A), d.drawCustomEntity(o);
-      }), c();
+      }), m();
     },
     () => {
     }
   );
   let l;
-  const c = S(
+  const m = S(
     D,
     () => {
       l = D.value(), A.startPoint = l, A.endPoint = s, w.DrawArc(A.center.x, A.center.y, A.radius, A.startAngle, A.endAngle);
@@ -2619,7 +2619,7 @@ async function YD() {
     }
   );
   let n;
-  const m = S(
+  const c = S(
     D,
     () => {
       n = D.value(), D.setMessage(`
@@ -2783,8 +2783,8 @@ async function RC() {
     return;
   B.setMessage("\u6307\u5B9A\u79FB\u52A8\u5230\u70B9"), B.setBasePt(F), B.setUseBasePt(!0), B.setUserDraw((e, t) => {
     if (D && C) {
-      let r = e.x - F.x, s = e.y - F.y, o = new THREE.Vector3(D.x + r, C.y + s, 0), u = new THREE.Vector3(C.x + r, D.y + s, 0), l = new THREE.Vector3(o.x, u.y, 0), c = new THREE.Vector3(u.x, o.y, 0);
-      t.drawLine(c, o), t.drawLine(o, l), t.drawLine(l, u), t.drawLine(u, c);
+      let r = e.x - F.x, s = e.y - F.y, o = new THREE.Vector3(D.x + r, C.y + s, 0), u = new THREE.Vector3(C.x + r, D.y + s, 0), l = new THREE.Vector3(o.x, u.y, 0), m = new THREE.Vector3(u.x, o.y, 0);
+      t.drawLine(m, o), t.drawLine(o, l), t.drawLine(l, u), t.drawLine(u, m);
     }
     for (let r = 0; r < E.length && r < 10; r++) {
       let s = E[r].clone();
@@ -2819,8 +2819,8 @@ async function OC() {
     return;
   B.setMessage("\u6307\u5B9A\u79FB\u52A8\u5230\u70B9"), B.setBasePt(F), B.setUseBasePt(!0), B.setUserDraw((e, t) => {
     if (D && C) {
-      let r = e.x - F.x, s = e.y - F.y, o = new THREE.Vector3(D.x + r, C.y + s, 0), u = new THREE.Vector3(C.x + r, D.y + s, 0), l = new THREE.Vector3(o.x, u.y, 0), c = new THREE.Vector3(u.x, o.y, 0);
-      t.drawLine(c, o), t.drawLine(o, l), t.drawLine(l, u), t.drawLine(u, c);
+      let r = e.x - F.x, s = e.y - F.y, o = new THREE.Vector3(D.x + r, C.y + s, 0), u = new THREE.Vector3(C.x + r, D.y + s, 0), l = new THREE.Vector3(o.x, u.y, 0), m = new THREE.Vector3(u.x, o.y, 0);
+      t.drawLine(m, o), t.drawLine(o, l), t.drawLine(l, u), t.drawLine(u, m);
     }
     for (let r = 0; r < E.length && r < 10; r++) {
       let s = E[r].clone();
@@ -2850,16 +2850,16 @@ async function SC() {
   let A = await F.go();
   if (A == null)
     return;
-  F.setMessage("\u6307\u5B9A\u65CB\u8F6C\u89D2\u5EA6"), F.setBasePt(A), F.setUseBasePt(!0), F.setUserDraw((l, c) => {
-    let n = l, m = A, b = n.sub(m).angleTo2(y.kXAxis, y.kNegateZAxis), p = new I();
-    if (p.setToRotation(b, y.kZAxis, m), D && C) {
+  F.setMessage("\u6307\u5B9A\u65CB\u8F6C\u89D2\u5EA6"), F.setBasePt(A), F.setUseBasePt(!0), F.setUserDraw((l, m) => {
+    let n = l, c = A, b = n.sub(c).angleTo2(y.kXAxis, y.kNegateZAxis), p = new I();
+    if (p.setToRotation(b, y.kZAxis, c), D && C) {
       let d = new a(D.x, C.y, 0), x = new a(C.x, D.y, 0), f = new a(d.x, x.y, 0), g = new a(x.x, d.y, 0);
-      d.transformBy(p), x.transformBy(p), f.transformBy(p), g.transformBy(p), c.drawLine(g.toVector3(), d.toVector3()), c.drawLine(d.toVector3(), f.toVector3()), c.drawLine(f.toVector3(), x.toVector3()), c.drawLine(x.toVector3(), g.toVector3());
+      d.transformBy(p), x.transformBy(p), f.transformBy(p), g.transformBy(p), m.drawLine(g.toVector3(), d.toVector3()), m.drawLine(d.toVector3(), f.toVector3()), m.drawLine(f.toVector3(), x.toVector3()), m.drawLine(x.toVector3(), g.toVector3());
     }
-    m = i.GetCurrentMxCAD().docCoord2Cad(m), p.setToRotation(b, y.kZAxis, m);
+    c = i.GetCurrentMxCAD().docCoord2Cad(c), p.setToRotation(b, y.kZAxis, c);
     for (let d = 0; d < E.length && d < 10; d++) {
       let x = E[d].clone();
-      !x || (x.TransformBy(p), c.drawMcDbEntity(x));
+      !x || (x.TransformBy(p), m.drawMcDbEntity(x));
     }
   });
   let e = await F.go();
@@ -2868,16 +2868,16 @@ async function SC() {
   let t = e, r = A, o = t.sub(r).angleTo2(y.kXAxis, y.kNegateZAxis), u = new I();
   r = i.GetCurrentMxCAD().docCoord2Cad(r), u.setToRotation(o, y.kZAxis, r);
   for (let l = 0; l < E.length; l++) {
-    let c = E[l].getMcDbObject();
-    !c || c.TransformBy(u);
+    let m = E[l].getMcDbObject();
+    !m || m.TransformBy(u);
   }
 }
 async function LC() {
   let E;
   for (; E = U.getCurrentSelect(), !(E.length > 0); ) {
-    let m = new Z();
-    if (!await m.userSelect(`
-\u9009\u62E9\u7F29\u653E\u5BF9\u8C61`) || (E = m.getIds(), E.length == 0))
+    let c = new Z();
+    if (!await c.userSelect(`
+\u9009\u62E9\u7F29\u653E\u5BF9\u8C61`) || (E = c.getIds(), E.length == 0))
       return;
     break;
   }
@@ -2892,8 +2892,8 @@ async function LC() {
   let r = await t.go();
   if (r == null)
     return;
-  t.setMessage("\u6307\u5B9A\u6BD4\u4F8B\u56E0\u5B50"), t.setBasePt(r), t.setUseBasePt(!0), t.setUserDraw((m, w) => {
-    let b = new a(m), p = new a(r), d = b.distanceTo(p);
+  t.setMessage("\u6307\u5B9A\u6BD4\u4F8B\u56E0\u5B50"), t.setBasePt(r), t.setUseBasePt(!0), t.setUserDraw((c, w) => {
+    let b = new a(c), p = new a(r), d = b.distanceTo(p);
     if (d < 1e-5)
       return;
     let x = d / e;
@@ -2915,12 +2915,12 @@ async function LC() {
   let o = s, u = r, l = o.distanceTo(u);
   if (l < 1e-5)
     return;
-  let c = l / e;
-  c > 1e5 && (c = 1e5);
+  let m = l / e;
+  m > 1e5 && (m = 1e5);
   let n = new I();
-  u = i.GetCurrentMxCAD().docCoord2Cad(u), n.setToScaling(c, u);
-  for (let m = 0; m < E.length; m++) {
-    let w = E[m].getMcDbObject();
+  u = i.GetCurrentMxCAD().docCoord2Cad(u), n.setToScaling(m, u);
+  for (let c = 0; c < E.length; c++) {
+    let w = E[c].getMcDbObject();
     !w || w.TransformBy(n);
   }
 }
@@ -3006,10 +3006,10 @@ class q {
   constructor(D) {
     const C = () => {
       const u = this.canvas.parentElement?.clientWidth || window.innerWidth, l = this.canvas.parentElement?.clientHeight || window.innerHeight;
-      let c = Math.min(u, window.screen.availWidth), n = Math.min(l, window.screen.availHeight);
-      c = Math.max(A, c), n = Math.max(e, n), this.canvas.style.width = c + 1 + "px", this.canvas.style.height = n + "px";
-      const m = window.devicePixelRatio || 1;
-      this.canvas.width = c * m, this.canvas.height = n * m;
+      let m = Math.min(u, window.screen.availWidth), n = Math.min(l, window.screen.availHeight);
+      m = Math.max(A, m), n = Math.max(e, n), this.canvas.style.width = m + 1 + "px", this.canvas.style.height = n + "px";
+      const c = window.devicePixelRatio || 1;
+      this.canvas.width = m * c, this.canvas.height = n * c;
     }, B = zC(C, 50), {
       canvas: F,
       minWidth: A = 300,
@@ -3031,9 +3031,9 @@ class q {
         const l = new FileReader();
         l.onload = () => {
           if (!!l.result && l.result instanceof ArrayBuffer) {
-            var c = new Uint8Array(l.result);
-            const n = this._malloc(c.length);
-            this.HEAPU8.set(c, n), this.openFromMemory(u.name, n, c.length, !0), this.displayGround(!0), this.canvas.focus();
+            var m = new Uint8Array(l.result);
+            const n = this._malloc(m.length);
+            this.HEAPU8.set(m, n), this.openFromMemory(u.name, n, m.length, !0), this.displayGround(!0), this.canvas.focus();
           }
         }, l.readAsArrayBuffer(u);
       };