mxcad 1.0.63 → 1.0.64

package/dist/mxcad.es.js

@@ -1,4 +1,4 @@
-import _D, { MxFun as d, MrxDbgUiPrPoint as T, MxCursorType as qD, MrxDbgUtils as $D, store as oD, loadCoreCode as JD, MxPaintBrush as L, MrxDbgUiPrBaseReturn as y, MxDbCircleShape as aD, MxDbLine as J, MxDbPolyline as ZD, MxDbCircleArc as q, Mx3PointArc as YD, MxDbEllipseShape as QD, McEdGetPointWorldDrawObject as XD, MxDbEllipse as DC } from "mxdraw";
+import _D, { MxFun as d, MrxDbgUiPrPoint as T, MxCursorType as qD, MrxDbgUtils as $D, store as oD, loadCoreCode as JD, MxPaintBrush as v, MrxDbgUiPrBaseReturn as y, MxDbCircleShape as aD, MxDbLine as J, MxDbPolyline as ZD, MxDbCircleArc as q, Mx3PointArc as YD, MxDbEllipseShape as QD, McEdGetPointWorldDrawObject as XD, MxDbEllipse as DC } from "mxdraw";
 function uD(E) {
   return btoa(unescape(encodeURIComponent(E)));
 }
@@ -56,7 +56,7 @@ function pD(E, D) {
     B.href = window.URL.createObjectURL(C), B.download = D, B.click();
   });
 }
-const N = {
+const H = {
   b64Encode: uD,
   b64Decode: lD,
   saveAsFileDialog: cD,
@@ -67,7 +67,7 @@ class p {
   static kOrigin;
   imp;
   constructor(D, C, B) {
-    this.imp = new r.mxcadassemblyimp.MdGePoint3d(), D instanceof Object ? (this.imp.x = D.x, this.imp.y = D.y, this.imp.z = D.z) : (this.imp.x = D || 0, this.imp.y = C || 0, this.imp.z = B || 0);
+    this.imp = new i.mxcadassemblyimp.MdGePoint3d(), D instanceof Object ? (this.imp.x = D.x, this.imp.y = D.y, this.imp.z = D.z) : (this.imp.x = D || 0, this.imp.y = C || 0, this.imp.z = B || 0);
   }
   copy(D) {
     return this.imp.x = D.x, this.imp.y = D.y, this.imp.z = D.z, this;
@@ -118,7 +118,7 @@ class w {
   static kZAxis;
   imp;
   constructor(D, C, B) {
-    this.imp = new r.mxcadassemblyimp.MdGeVector3d(), D instanceof Object ? (this.imp.x = D.x, this.imp.y = D.y, this.imp.z = D.z) : (this.imp.x = D || 0, this.imp.y = C || 0, this.imp.z = B || 0);
+    this.imp = new i.mxcadassemblyimp.MdGeVector3d(), D instanceof Object ? (this.imp.x = D.x, this.imp.y = D.y, this.imp.z = D.z) : (this.imp.x = D || 0, this.imp.y = C || 0, this.imp.z = B || 0);
   }
   copy(D) {
     return this.imp.x = D.imp.x, this.imp.y = D.imp.y, this.imp.z = D.imp.z, this;
@@ -186,7 +186,7 @@ class W {
   static kIdentity;
   imp;
   constructor(D) {
-    this.imp = r.mxcadassemblyimp.MdGeMatrix3d(), D instanceof Object && this.imp.copy(D);
+    this.imp = i.mxcadassemblyimp.MdGeMatrix3d(), D instanceof Object && this.imp.copy(D);
   }
   copy(D) {
     return this.imp.copy(D.imp), this;
@@ -291,7 +291,7 @@ class CC {
 }
 let x = new CC();
 const BC = new FinalizationRegistry((E) => {
-  r.App.DestroyObject(E);
+  i.App.DestroyObject(E);
 }), EC = {};
 class O {
   imp = 0;
@@ -333,11 +333,11 @@ class M {
     this.type == 1 ? d.getCurrentDraw().eraseMxEntity(this.id) : this.type == 0 && eD.eraseEntity(this.id);
   }
   getMcDbObject() {
-    return this.type == 0 ? r.App.ObjectIdToObject(this.id) : null;
+    return this.type == 0 ? i.App.ObjectIdToObject(this.id) : null;
   }
   getObjectName() {
     if (this.type == 0)
-      return r.App.getImp().ObjectIdToObjectName(this.id);
+      return i.App.getImp().ObjectIdToObjectName(this.id);
     if (this.type == 1) {
       let D = d.getCurrentDraw().getMxEntity(this.id);
       if (D)
@@ -349,7 +349,7 @@ class M {
     return this.type == 1 ? d.getCurrentDraw().getMxEntity(this.id) : null;
   }
 }
-class v extends O {
+class L extends O {
   constructor(D) {
     super(D);
   }
@@ -361,7 +361,7 @@ class v extends O {
   }
   Clone() {
     let D = this.imp.Clone();
-    return r.App.CreateCloneObject(D);
+    return i.App.CreateCloneObject(D);
   }
   GetHandle() {
     return this.imp.GetHandle();
@@ -388,7 +388,7 @@ var BD;
 class j {
   imp;
   constructor(D, C, B) {
-    this.imp = new r.mxcadassemblyimp.MdCmColor(), D instanceof Object ? (this.imp.red = D.red, this.imp.green = D.green, this.imp.blue = D.blue, this.imp.method = D.method, this.imp.n = D.n, this.imp.colorIndex = D.colorIndex) : D && C && B && this.imp.setRGB(D, C, B);
+    this.imp = new i.mxcadassemblyimp.MdCmColor(), D instanceof Object ? (this.imp.red = D.red, this.imp.green = D.green, this.imp.blue = D.blue, this.imp.method = D.method, this.imp.n = D.n, this.imp.colorIndex = D.colorIndex) : D && C && B && this.imp.setRGB(D, C, B);
   }
   getImp() {
     return this.imp;
@@ -442,9 +442,9 @@ class j {
     this.imp.colorIndex = D;
   }
 }
-class FC extends v {
+class FC extends L {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbLayerTableRecord());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbLayerTableRecord());
   }
   get name() {
     return this.imp.getName();
@@ -489,17 +489,17 @@ class FC extends v {
     this.imp.setLineWeight(D);
   }
 }
-class dD extends v {
+class dD extends L {
   constructor(D) {
     super(D);
   }
 }
-class hD extends v {
+class hD extends L {
   constructor(D) {
     super(D);
   }
 }
-class wD extends v {
+class wD extends L {
   constructor(D) {
     super(D);
   }
@@ -583,9 +583,9 @@ class gD extends O {
     return this.imp.step(D, C);
   }
 }
-class Q extends v {
+class Q extends L {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbBlockTableRecord());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbBlockTableRecord());
   }
   appendAcDbEntity(D) {
     return new M(
@@ -622,9 +622,9 @@ class yD extends O {
     this.imp.start(D, C);
   }
 }
-class xD extends v {
+class xD extends L {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbBlockTable());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbBlockTable());
   }
   getAt(D) {
     let C = this.getAt(D);
@@ -641,13 +641,13 @@ class xD extends v {
     return this.imp.add(D.getImp());
   }
 }
-class V extends v {
+class V extends L {
   constructor(D) {
     super(D);
   }
   explode() {
     let D = this.imp.explode();
-    return new H(D);
+    return new N(D);
   }
   get trueColor() {
     return new j(this.imp.TrueColor());
@@ -713,7 +713,7 @@ class V extends v {
     let D = this.imp.GetBoundingBox();
     if (D) {
       let C = { minPt: new p(D.AtPoint(0).val), maxPt: new p(D.AtPoint(1).val), ret: 0 };
-      return r.App.DestroyObject(D), C;
+      return i.App.DestroyObject(D), C;
     } else
       return { minPt: new p(), maxPt: new p(), ret: 1 };
   }
@@ -723,66 +723,66 @@ class _ extends V {
     super(D);
   }
   getStartParam() {
-    return { val: this.imp.getStartParam(), ret: r.getCallResult() };
+    return { val: this.imp.getStartParam(), ret: i.getCallResult() };
   }
   getEndParam() {
-    return { val: this.imp.getEndParam(), ret: r.getCallResult() };
+    return { val: this.imp.getEndParam(), ret: i.getCallResult() };
   }
   getDistAtParam(D) {
-    return { val: this.imp.getDistAtParam(D), ret: r.getCallResult() };
+    return { val: this.imp.getDistAtParam(D), ret: i.getCallResult() };
   }
   getParamAtDist(D) {
-    return { val: this.imp.getParamAtDist(D), ret: r.getCallResult() };
+    return { val: this.imp.getParamAtDist(D), ret: i.getCallResult() };
   }
   getDistAtPoint(D) {
-    return { val: this.imp.getDistAtPoint(D.imp), ret: r.getCallResult() };
+    return { val: this.imp.getDistAtPoint(D.imp), ret: i.getCallResult() };
   }
   getPointAtDist(D) {
-    return { val: new p(this.imp.getPointAtDist(D)), ret: r.getCallResult() };
+    return { val: new p(this.imp.getPointAtDist(D)), ret: i.getCallResult() };
   }
   getStartPoint() {
-    return { val: new p(this.imp.getStartPoint()), ret: r.getCallResult() };
+    return { val: new p(this.imp.getStartPoint()), ret: i.getCallResult() };
   }
   getEndPoint() {
-    return { val: new p(this.imp.getStartPoint()), ret: r.getCallResult() };
+    return { val: new p(this.imp.getStartPoint()), ret: i.getCallResult() };
   }
   getPointAtParam(D) {
-    return { val: new p(this.imp.getPointAtParam(D)), ret: r.getCallResult() };
+    return { val: new p(this.imp.getPointAtParam(D)), ret: i.getCallResult() };
   }
   getParamAtPoint(D) {
-    return { val: this.imp.getParamAtPoint(D.imp), ret: r.getCallResult() };
+    return { val: this.imp.getParamAtPoint(D.imp), ret: i.getCallResult() };
   }
   getFirstDeriv(D) {
-    return { val: new w(this.imp.getFirstDeriv(D)), ret: r.getCallResult() };
+    return { val: new w(this.imp.getFirstDeriv(D)), ret: i.getCallResult() };
   }
   getFirstDerivEx(D) {
-    return { val: new w(this.imp.getFirstDerivEx(D.imp)), ret: r.getCallResult() };
+    return { val: new w(this.imp.getFirstDerivEx(D.imp)), ret: i.getCallResult() };
   }
   getClosestPointTo(D, C) {
-    return { val: new p(this.imp.getClosestPointTo(D.imp, C)), ret: r.getCallResult() };
+    return { val: new p(this.imp.getClosestPointTo(D.imp, C)), ret: i.getCallResult() };
   }
   offsetCurves(D, C) {
     let B = this.imp.offsetCurves(D, C.imp);
-    return new H(B);
+    return new N(B);
   }
   splitCurves(D) {
     let C = this.imp.splitCurves(D);
-    return new H(C);
+    return new N(C);
   }
   getArea() {
-    return { val: this.imp.getArea(), ret: r.getCallResult() };
+    return { val: this.imp.getArea(), ret: i.getCallResult() };
   }
   getSamplePoints(D) {
     let C = this.imp.getSamplePoints(D);
-    return new H(C);
+    return new N(C);
   }
   getLength() {
-    return { val: this.imp.getLength(), ret: r.getCallResult() };
+    return { val: this.imp.getLength(), ret: i.getCallResult() };
   }
 }
 class Z extends _ {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbLine());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbLine());
   }
   get startPoint() {
     return new p(this.imp.startPoint());
@@ -799,7 +799,7 @@ class Z extends _ {
 }
 class Y extends V {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbText());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbText());
   }
   get position() {
     return new p(this.imp.position());
@@ -858,7 +858,7 @@ class Y extends V {
 }
 class FD extends V {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbMText());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbMText());
   }
   get location() {
     return new p(this.imp.location());
@@ -899,7 +899,7 @@ class FD extends V {
 }
 class AD extends _ {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbCircle());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbCircle());
   }
   setCenter(D, C, B) {
     this.imp.setCenter(new p(D, C, B).imp);
@@ -919,7 +919,7 @@ class AD extends _ {
 }
 class bD extends _ {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbPolyline());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbPolyline());
   }
   get isClosed() {
     return this.imp.isClosed();
@@ -943,13 +943,13 @@ class bD extends _ {
     return this.imp.numVerts();
   }
   getPointAt(D) {
-    return { val: this.imp.getPointAt(D), ret: r.getCallResult() };
+    return { val: this.imp.getPointAt(D), ret: i.getCallResult() };
   }
   getBulgeAt(D) {
     return this.imp.getBulgeAt(D);
   }
   getWidthsAt(D) {
-    return { val1: this.imp.getStartWidthsAt(D), val2: this.imp.getEndWidthsAt(D), ret: r.getCallResult() };
+    return { val1: this.imp.getStartWidthsAt(D), val2: this.imp.getEndWidthsAt(D), ret: i.getCallResult() };
   }
   setPointAt(D, C) {
     return this.imp.setPointAt(D, C.imp);
@@ -960,7 +960,7 @@ class bD extends _ {
 }
 class fD extends V {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbBlockReference());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbBlockReference());
   }
   get blockTableRecordId() {
     return new M(this.imp.blockTableRecord(), b.kMxCAD);
@@ -1078,7 +1078,7 @@ class tD extends V {
 }
 class MD extends tD {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbAlignedDimension());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbAlignedDimension());
   }
   get xLine1Point() {
     return new p(this.imp.xLine1Point());
@@ -1107,7 +1107,7 @@ class MD extends tD {
 }
 class TD extends tD {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbRotatedDimension());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbRotatedDimension());
   }
   get xLine1Point() {
     return new p(this.imp.xLine1Point());
@@ -1142,7 +1142,7 @@ class TD extends tD {
 }
 class kD extends _ {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.MdDbArc());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.MdDbArc());
   }
   setCenter(D, C, B) {
     this.imp.setCenter(new p(D, C, B).imp);
@@ -1174,11 +1174,11 @@ class kD extends _ {
 }
 function K(E = null) {
   let D;
-  return E == null ? D = new r.mxcadassemblyimp.McDrawResbuf() : D = E.getImp(), D;
+  return E == null ? D = new i.mxcadassemblyimp.McDrawResbuf() : D = E.getImp(), D;
 }
-class H extends O {
+class N extends O {
   constructor(D) {
-    super(D), D || this.initTempObject(new r.mxcadassemblyimp.McDrawResbuf());
+    super(D), D || this.initTempObject(new i.mxcadassemblyimp.McDrawResbuf());
   }
   Clear() {
     this.imp.Clear();
@@ -1187,16 +1187,16 @@ class H extends O {
     return this.imp.GetCount();
   }
   AtDouble(D) {
-    return { val: this.imp.AtDouble(D), ret: r.getCallResult() };
+    return { val: this.imp.AtDouble(D), ret: i.getCallResult() };
   }
   Atlong(D) {
-    return { val: this.imp.Atlong(D), ret: r.getCallResult() };
+    return { val: this.imp.Atlong(D), ret: i.getCallResult() };
   }
   AtObject(D) {
     if (this.imp.AtObjectName(D) == "McDbMText") {
       let B = this.imp.AtObjectMdDbMText(D);
       if (B)
-        return { val: new FD(B), ret: r.getCallResult() };
+        return { val: new FD(B), ret: i.getCallResult() };
     }
     return { val: void 0, ret: -1 };
   }
@@ -1204,13 +1204,13 @@ class H extends O {
     this.imp.AddObject(D.getImp());
   }
   AtObjectId(D) {
-    return { val: new M(this.imp.AtObjectId(D), b.kMxCAD), ret: r.getCallResult() };
+    return { val: new M(this.imp.AtObjectId(D), b.kMxCAD), ret: i.getCallResult() };
   }
   AtString(D) {
-    return { val: x.decodeFromGb2312(this.imp.AtString(D)), ret: r.getCallResult() };
+    return { val: x.decodeFromGb2312(this.imp.AtString(D)), ret: i.getCallResult() };
   }
   AtPoint(D) {
-    return { val: new p(this.imp.AtPoint(D)), ret: r.getCallResult() };
+    return { val: new p(this.imp.AtPoint(D)), ret: i.getCallResult() };
   }
   ItemDataType() {
     return this.imp.ItemDataType();
@@ -1263,8 +1263,8 @@ class PD {
       }
       $D.findEntAtPoint(A).then((t) => {
         let e = [];
-        t.forEach((i) => {
-          e.push(new M(i, b.kMxDraw));
+        t.forEach((r) => {
+          e.push(new M(r, b.kMxDraw));
         });
         let s = this.findEntAtPoint(A.x, A.y, A.z, -1, C);
         s.isValid() && e.push(s), B(e);
@@ -1272,13 +1272,13 @@ class PD {
     });
   }
   init() {
-    this.imp || (this.imp = new r.mxcadassemblyimp.McDrawUtility());
+    this.imp || (this.imp = new i.mxcadassemblyimp.McDrawUtility());
   }
 }
 let eD = new PD();
 class RD extends O {
   constructor() {
-    super(), this.initTempObject(new r.mxcadassemblyimp.McDrawSelSet());
+    super(), this.initTempObject(new i.mxcadassemblyimp.McDrawSelSet());
   }
   allSelect(D = null) {
     return this.imp.allSelect(K(D));
@@ -1313,7 +1313,7 @@ class U {
     return this.imp;
   }
   getMxCppImp() {
-    return r.mxcadassemblyimp;
+    return i.mxcadassemblyimp;
   }
   updateDisplay(D, C) {
     this.imp.updateDisplay(D, C);
@@ -1347,7 +1347,7 @@ class U {
       if (C && C(t), !!t) {
         if (B) {
           let e;
-          /^((?!chrome|android).)*safari/i.test(navigator.userAgent) ? e = new Blob([t.buffer], { type: "application/octet-stream" }) : e = new Blob([t.buffer], { type: "application/octet-binary" }), F ? N.saveAsFileDialog({
+          /^((?!chrome|android).)*safari/i.test(navigator.userAgent) ? e = new Blob([t.buffer], { type: "application/octet-stream" }) : e = new Blob([t.buffer], { type: "application/octet-binary" }), F ? H.saveAsFileDialog({
             blob: e,
             filename: D,
             types: [{
@@ -1356,7 +1356,7 @@ class U {
                 "application/octet-stream": [".mxweb"]
               }
             }]
-          }) : N.downloadFile(e, D);
+          }) : H.downloadFile(e, D);
         }
         A.mx_saveFile_call = null;
       }
@@ -1531,17 +1531,17 @@ class U {
     return this.imp.DrawEntity(D.getImp());
   }
   ObjectIdToObject(D) {
-    return r.App.ObjectIdToObject(D);
+    return i.App.ObjectIdToObject(D);
   }
   CloneMcDbObject(D) {
     let C = this.imp.CloneMcDbObject(D);
-    return r.App.CreateCloneObject(C);
+    return i.App.CreateCloneObject(C);
   }
   ObjectIdToMdObjectImp(D) {
-    return r.App.getImp().ObjectIdToMdObject(D);
+    return i.App.getImp().ObjectIdToMdObject(D);
   }
   DestroyObject(D) {
-    !D || r.App.getImp().DestroyObject(D);
+    !D || i.App.getImp().DestroyObject(D);
   }
 }
 class SD {
@@ -1606,18 +1606,18 @@ class SD {
     let C = D.getObjectName();
     if (C == "McDbLine") {
       let B = new Z();
-      return B.getImp().ConnectionTempObject(D), r.App.DestroyObject(D), B;
+      return B.getImp().ConnectionTempObject(D), i.App.DestroyObject(D), B;
     } else if (C == "McDbText") {
       let B = new Y();
-      return B.getImp().ConnectionTempObject(D), r.App.DestroyObject(D), B;
+      return B.getImp().ConnectionTempObject(D), i.App.DestroyObject(D), B;
     }
-    return console.log("Mx: Clone error type"), new v(D);
+    return console.log("Mx: Clone error type"), new L(D);
   }
   setFontFilePath(D) {
     return this.imp.setFontFilePath(D);
   }
 }
-class LD {
+class vD {
   mxcadassemblyimp;
   App = new SD();
   getCallResult() {
@@ -1632,7 +1632,7 @@ class LD {
     return D && D.x && D.y && (B.x = D.x, B.y = D.y, D.z && (B.y = D.z)), B;
   }
 }
-const iD = "1.0.63", AC = "SharedArrayBuffer" in window, X = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src), tC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d-st/${E}` : D + E, eC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d/${E}` : D + E, iC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/3d/${E}` : D + E, vD = (E) => new Promise((D, C) => {
+const iD = "1.0.64", AC = "SharedArrayBuffer" in window, X = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src), tC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d-st/${E}` : D + E, eC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/2d/${E}` : D + E, iC = (E, D = self.location.href) => X ? `https://unpkg.com/mxcad@${iD}/dist/wasm/3d/${E}` : D + E, LD = (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();
@@ -1641,21 +1641,21 @@ const iD = "1.0.63", AC = "SharedArrayBuffer" in window, X = document.currentScr
   };
 }), rC = async (E, D, C) => {
   const { locateFile: B } = C, F = B(E + ".js");
-  return await vD(F), await globalThis[D](C);
+  return await LD(F), await globalThis[D](C);
 };
-let r;
+let i;
 async function OD(E, D = AC || !X ? tC : eC, C, B) {
   return new Promise(async (F, A) => {
     try {
-      if (r || (r = new LD()), r.mxcadassemblyimp)
-        return E && E(r), F(r);
+      if (i || (i = new vD()), i.mxcadassemblyimp)
+        return E && E(i), F(i);
       const e = await rC("mxdrawassembly_min", "mxdrawassembly", {
         locateFile: D,
         wasmBinary: C
       });
-      r.mxcadassemblyimp = e;
+      i.mxcadassemblyimp = e;
       let s = new e.McApp();
-      B && s.setFontFilePath(B), s.Init(), r.App.init(s), E && E(r), F(r);
+      B && s.setFontFilePath(B), s.Init(), i.App.init(s), E && E(i), F(i);
     } catch (t) {
       A(t);
     }
@@ -1691,12 +1691,12 @@ const sC = (E) => {
   } } = E || {};
   await OD(() => {
   }, C, B, D), s();
-  let i = await nC(F, A);
+  let r = await nC(F, A);
   const o = d.getMxFunTHREE();
   let a = new o.Vector2();
-  i.getRenderer().getSize(a);
-  const l = r.App.CreateMxCAD(a.width, a.height, i.getCanvas().id, i.isWebgl2(), i.getId());
-  return i.initMxCpp(l), i.addEvent("openFileComplete", () => {
+  r.getRenderer().getSize(a);
+  const l = i.App.CreateMxCAD(a.width, a.height, r.getCanvas().id, r.isWebgl2(), r.getId());
+  return r.initMxCpp(l), r.addEvent("openFileComplete", () => {
     t && t();
   }), e && l.openWebFile(e), l;
 };
@@ -1711,7 +1711,7 @@ async function aC() {
   if (C.length <= 0)
     return;
   let B = d.screenCoordLong2Doc(50);
-  C = N.b64Encode(C);
+  C = H.b64Encode(C);
   const F = {
     postx: D.x,
     posty: D.y,
@@ -1732,13 +1732,13 @@ class uC extends aD {
   }
 }
 const sD = (E) => {
-  const [D, C, B] = E, { x: F, y: A, z: t } = D, { x: e, y: s, z: i } = C, { x: o, y: a, z: l } = B, n = A * i - s * t - A * l + a * t + s * l - a * i, u = -(F * i - e * t - F * l + o * t + e * l - o * i), h = F * s - e * A - F * a + o * A + e * a - o * s, g = -(F * s * l - F * a * i - e * A * l + e * a * t + o * A * i - o * s * t), c = 2 * (e - F), m = 2 * (s - A), k = 2 * (i - t), I = F * F + A * A + t * t - e * e - s * s - i * i, P = 2 * (o - F), R = 2 * (a - A), S = 2 * (l - t), G = F * F + A * A + t * t - o * o - a * a - l * l, KD = -(u * k * G - u * S * I - m * h * G + m * S * g + R * h * I - R * k * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h), HD = (n * k * G - n * S * I - c * h * G + c * S * g + P * h * I - P * k * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h), ND = -(n * m * G - n * R * I - c * u * G + c * R * g + P * u * I - P * m * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h);
-  return new THREE.Vector3(KD, HD, ND);
+  const [D, C, B] = E, { x: F, y: A, z: t } = D, { x: e, y: s, z: r } = C, { x: o, y: a, z: l } = B, n = A * r - s * t - A * l + a * t + s * l - a * r, u = -(F * r - e * t - F * l + o * t + e * l - o * r), h = F * s - e * A - F * a + o * A + e * a - o * s, g = -(F * s * l - F * a * r - e * A * l + e * a * t + o * A * r - o * s * t), c = 2 * (e - F), m = 2 * (s - A), k = 2 * (r - t), I = F * F + A * A + t * t - e * e - s * s - r * r, P = 2 * (o - F), R = 2 * (a - A), S = 2 * (l - t), G = F * F + A * A + t * t - o * o - a * a - l * l, KD = -(u * k * G - u * S * I - m * h * G + m * S * g + R * h * I - R * k * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h), ND = (n * k * G - n * S * I - c * h * G + c * S * g + P * h * I - P * k * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h), HD = -(n * m * G - n * R * I - c * u * G + c * R * g + P * u * I - P * m * g) / (n * m * S - n * R * k - c * u * S + c * R * h + P * u * k - P * m * h);
+  return new THREE.Vector3(KD, ND, HD);
 };
 function jD() {
   const E = new T();
   let D = new uC();
-  L.use(D), D.closed = !1;
+  v.use(D), D.closed = !1;
   let C = 0, B = "default", F = !0;
   const A = () => {
     E.setUserDraw(
@@ -1753,7 +1753,7 @@ function jD() {
           E.setMessage(`
 \u6307\u5B9A\u5706\u7684\u534A\u5F84:`), E.setKeyWords("[\u76F4\u5F84(D)]"), D.center = E.value(), A();
         else if (C === 1)
-          return r.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
+          return i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
         C++;
       }
       n === y.kKeyWord && E.isKeyWordPicked("D") && (F = !1, A(), E.setMessage(`
@@ -1776,21 +1776,21 @@ function jD() {
         ]), D.radius = D.center.distanceTo(g), h.drawCustomEntity(D);
       }), E.setMessage(`
 \u6307\u5B9A\u5706\u4E0A\u7684\u7B2C\u4E09\u4E2A\u70B9:`)), C === 2)
-        return e.push(E.value()), D.center = sD(e), D.radius = D.center.distanceTo(e[0]), r.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
+        return e.push(E.value()), D.center = sD(e), D.radius = D.center.distanceTo(e[0]), i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
       C++;
     }
   };
-  let i;
+  let r;
   const o = (n, u) => {
     new THREE.Line3(n, u).getCenter(D.center), D.radius = u.distanceTo(n) / 2;
   }, a = (n) => {
     if (B === "2P" && (E.setMessage(`
 \u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E00\u4E2A\u7AEF\u70B9:`), n === y.kOk)) {
-      if (C === 0 && (i = E.value(), E.setUserDraw((u, h) => {
-        o(i, u), h.drawCustomEntity(D), h.drawLine(i, u);
+      if (C === 0 && (r = E.value(), E.setUserDraw((u, h) => {
+        o(r, u), h.drawCustomEntity(D), h.drawLine(r, u);
       }), E.setMessage(`
 \u6307\u5B9A\u5706\u76F4\u5F84\u7684\u7B2C\u4E8C\u4E2A\u7AEF\u70B9:`)), C === 1)
-        return o(i, E.value()), r.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
+        return o(r, E.value()), i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius), !0;
       C++;
     }
   }, l = (n) => {
@@ -1821,7 +1821,7 @@ function jD() {
         return { exit: !0 };
     },
     (n) => {
-      n === y.kCancel && r.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius);
+      n === y.kCancel && i.App.GetCurrentMxCAD().DrawCircle(D.center.x, D.center.y, D.radius);
     }
   );
 }
@@ -1851,17 +1851,17 @@ async function ID() {
   };
   F(), E.goWhile(
     (A) => {
-      if (A === y.kOk && (D = new J(), L.use(D), D.pt1 = B, D.pt2 = E.value(), B = D.pt2.clone(), C.push(D), F()), A === y.kKeyWord) {
+      if (A === y.kOk && (D = new J(), v.use(D), D.pt1 = B, D.pt2 = E.value(), B = D.pt2.clone(), C.push(D), F()), A === y.kKeyWord) {
         if (E.isKeyWordPicked("E"))
           nD();
         else if (E.isKeyWordPicked("C")) {
           const t = new J();
-          return t.pt1 = B.clone(), t.pt2 = C[0].pt1.clone(), L.use(t), C.push(t), B = t.pt2.clone(), nD(), { exit: !0 };
+          return t.pt1 = B.clone(), t.pt2 = C[0].pt1.clone(), v.use(t), C.push(t), B = t.pt2.clone(), nD(), { exit: !0 };
         }
       }
     },
     (A) => (A === y.kCancel && C.forEach((t) => {
-      r.App.GetCurrentMxCAD().DrawLine(t.pt1.x, t.pt1.y, 0, t.pt2.x, t.pt2.y, 0);
+      i.App.GetCurrentMxCAD().DrawLine(t.pt1.x, t.pt1.y, 0, t.pt2.x, t.pt2.y, 0);
     }), { exit: !0 })
   );
 }
@@ -1874,11 +1874,11 @@ async function lC() {
     if (!D)
       return;
     let C = new Z(), B = new Y();
-    B.textString = "\u6D4B\u8BD5Test", B.height = d.viewCoordLong2Cad(100), C.startPoint = r.NewMcGePoint3d(D), E.setUserDraw((A, t) => {
-      C.endPoint = r.NewMcGePoint3d(A), B.position = r.NewMcGePoint3d(A), B.alignmentPoint = B.position, t.drawMcDbEntity(C), t.drawMcDbEntity(B);
+    B.textString = "\u6D4B\u8BD5Test", B.height = d.viewCoordLong2Cad(100), C.startPoint = i.NewMcGePoint3d(D), E.setUserDraw((A, t) => {
+      C.endPoint = i.NewMcGePoint3d(A), B.position = i.NewMcGePoint3d(A), B.alignmentPoint = B.position, t.drawMcDbEntity(C), t.drawMcDbEntity(B);
     }), E.setMessage(`
 \u6307\u5B9A\u4E8C\u70B9:`), await E.go();
-    let F = r.App.GetCurrentMxCAD();
+    let F = i.App.GetCurrentMxCAD();
     F.DrawEntity(B), F.DrawEntity(C);
   }
 }
@@ -1894,19 +1894,29 @@ async function cC() {
         return;
       let e = t.GetCount();
       for (let s = 0; s < e; s++) {
-        let i = t.AtObject(s).val;
-        i?.ObjectName == "McDbMText" && console.log(i.contents);
+        let r = t.AtObject(s).val;
+        r?.ObjectName == "McDbMText" && console.log(r.contents);
       }
     }
   }
 }
 function mC() {
-  r.App.GetCurrentMxCAD().saveFile("xxxxx");
+  i.App.GetCurrentMxCAD().saveFile("xxxxx");
+}
+function pC() {
+  i.App.GetCurrentMxCAD().saveFileToUrl("http://localhost:3337/mxcad/savefiledwg", (E, D) => {
+    try {
+      let C = JSON.parse(D);
+      console.log(C), console.log(E);
+    } catch {
+      console.log("Mx: sserverResult error");
+    }
+  });
 }
 d.on("init", () => {
-  d.addCommand("Mx_Line", ID), d.addCommand("Mx_TestDraw", lC), d.addCommand("Mx_Test_GetDim", cC), d.addCommand("Mx_Test_SaveFile", mC);
+  d.addCommand("Mx_Line", ID), d.addCommand("Mx_TestDraw", lC), d.addCommand("Mx_Test_GetDim", cC), d.addCommand("Mx_Test_SaveFile", mC), d.addCommand("Mx_Test_SaveFileDwg", pC);
 });
-async function pC() {
+async function dC() {
   const E = new T();
   E.setMessage(`
 \u6307\u5B9A\u63D2\u5165\u4F4D\u7F6E:`);
@@ -1918,7 +1928,7 @@ async function pC() {
   if (C.length <= 0)
     return;
   let B = d.screenCoordLong2Doc(50);
-  C = N.b64Encode(C);
+  C = H.b64Encode(C);
   const F = {
     postx: D.x,
     posty: D.y,
@@ -1929,7 +1939,7 @@ async function pC() {
 }
 async function GD() {
   const E = new T(), D = new ZD();
-  L.use(D), E.setMessage(`
+  v.use(D), E.setMessage(`
 \u6307\u5B9A\u8D77\u70B9:`);
   let C;
   E.setUserDraw((B, F) => {
@@ -1945,7 +1955,7 @@ async function GD() {
     },
     (B) => {
       if (B === y.kCancel) {
-        let F = r.App.GetCurrentMxCAD();
+        let F = i.App.GetCurrentMxCAD();
         for (let A = 0; A < D.points.length; A++)
           A == 0 ? F.PathMoveTo(D.points[A].x, D.points[A].y) : F.PathLineTo(D.points[A].x, D.points[A].y);
         F.DrawPathToPolyline();
@@ -1965,24 +1975,24 @@ async function WD() {
   let B = 5;
   E.setUserDraw((F, A) => {
     C.radius = D.distanceTo(F);
-    let t = C.getEndParam().val, s = C.getDistAtParam(t).val / B, i = 0, o = new THREE.Vector3(), a = new THREE.Vector3();
+    let t = C.getEndParam().val, s = C.getDistAtParam(t).val / B, r = 0, o = new THREE.Vector3(), a = new THREE.Vector3();
     for (let l = 0; l < B; l++) {
-      let n = C.getPointAtDist(i).val;
-      i += s, l > 0 ? A.drawMcDbLine(n.x, n.y, n.z, o.x, o.y, o.z) : a = new THREE.Vector3(n.x, n.y, n.z), l == B - 1 && A.drawMcDbLine(n.x, n.y, n.z, a.x, a.y, a.z), o = new THREE.Vector3(n.x, n.y, n.z);
+      let n = C.getPointAtDist(r).val;
+      r += s, l > 0 ? A.drawMcDbLine(n.x, n.y, n.z, o.x, o.y, o.z) : a = new THREE.Vector3(n.x, n.y, n.z), l == B - 1 && A.drawMcDbLine(n.x, n.y, n.z, a.x, a.y, a.z), o = new THREE.Vector3(n.x, n.y, n.z);
     }
   }), E.setMessage(`
 \u6307\u5B9A\u4E8C\u70B9:`), await E.go(), E.drawReserve();
 }
 d.addCommand("Mx_Polygon", WD);
-function dC(E, D, C) {
-  const B = E.x, F = D.x, A = C.x, t = E.y, e = D.y, s = C.y, i = B - F, o = t - e, a = B - A, l = t - s, n = (B * B - F * F + (t * t - e * e)) / 2, u = (B * B - A * A + (t * t - s * s)) / 2, h = o * a - i * l, g = -(l * n - o * u) / h, c = -(i * u - a * n) / h;
+function hC(E, D, C) {
+  const B = E.x, F = D.x, A = C.x, t = E.y, e = D.y, s = C.y, r = B - F, o = t - e, a = B - A, l = t - s, n = (B * B - F * F + (t * t - e * e)) / 2, u = (B * B - A * A + (t * t - s * s)) / 2, h = o * a - r * l, g = -(l * n - o * u) / h, c = -(r * u - a * n) / h;
   return new THREE.Vector3(g, c, 0);
 }
-function hC(E, D) {
+function wC(E, D) {
   const C = E.x, B = E.y, F = D.x, A = D.y;
   return Math.sqrt((C - F) * (C - F) + (B - A) * (B - A));
 }
-function wC(E, D, C) {
+function gC(E, D, C) {
   let B;
   E < C ? B = C - E : B = C - E + 360;
   let F;
@@ -1990,11 +2000,11 @@ function wC(E, D, C) {
 }
 function CD(E, D, C) {
   const B = E.x, F = D.x, A = E.y, t = D.y;
-  let e, s, i;
-  return e = (A - t) / C, s = (B - F) / C, s >= 0.99999 && (s = 0.99999), s <= -0.99999 && (s = -0.99999), i = Math.acos(s), i = i / Math.PI * 180, e < -0.05 && (i = 360 - i), {
+  let e, s, r;
+  return e = (A - t) / C, s = (B - F) / C, s >= 0.99999 && (s = 0.99999), s <= -0.99999 && (s = -0.99999), r = Math.acos(s), r = r / Math.PI * 180, e < -0.05 && (r = 360 - r), {
     sin: e,
     cos: s,
-    angle: i
+    angle: r
   };
 }
 const $ = _D.MrxDbgUiPrBaseReturn, f = (E, D, C) => {
@@ -2026,12 +2036,12 @@ class rD extends aD {
   getArcMidPoint(D, C, B, F, A) {
     const t = D, e = B * Math.PI / 180;
     let s = F * Math.PI / 180;
-    const i = new THREE.Vector3(), o = new THREE.Vector3();
-    i.x = t.x + C * Math.cos(e), i.y = t.y + C * Math.sin(e), o.x = t.x + C * Math.cos(s), o.y = t.y + C * Math.sin(s);
+    const r = new THREE.Vector3(), o = new THREE.Vector3();
+    r.x = t.x + C * Math.cos(e), r.y = t.y + C * Math.sin(e), o.x = t.x + C * Math.cos(s), o.y = t.y + C * Math.sin(s);
     const a = C;
     (A ? B < F : B > F) && (s += Math.PI * 2);
     const l = new THREE.Vector3();
-    return l.x = t.x + a * Math.cos((e + s) / 2), l.y = t.y + a * Math.sin((e + s) / 2), [i, l, o, this.center];
+    return l.x = t.x + a * Math.cos((e + s) / 2), l.y = t.y + a * Math.sin((e + s) / 2), [r, l, o, this.center];
   }
   getGripPoints() {
     return this.getArcMidPoint(
@@ -2051,12 +2061,12 @@ class rD extends aD {
   upDatePoints(D, C, B) {
     D[C].add(B);
     const [F, A, t] = D;
-    this.center = dC(F, t, A), this.radius = hC(A, this.center);
-    const e = CD(F, this.center, this.radius), s = CD(t, this.center, this.radius), i = CD(A, this.center, this.radius);
-    this.clockwise = wC(
+    this.center = hC(F, t, A), this.radius = wC(A, this.center);
+    const e = CD(F, this.center, this.radius), s = CD(t, this.center, this.radius), r = CD(A, this.center, this.radius);
+    this.clockwise = gC(
       s.angle,
       e.angle,
-      i.angle
+      r.angle
     ), this.startAngle = THREE.MathUtils.degToRad(e.angle), this.endAngle = THREE.MathUtils.degToRad(s.angle);
   }
 }
@@ -2065,7 +2075,7 @@ async function UD() {
   E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u8D77\u70B9:`), E.setKeyWords("[\u5706\u5FC3(C)]");
   let D = new rD();
-  D.closed = !1, L.use(D);
+  D.closed = !1, v.use(D);
   let C, B, F;
   const A = f(
     E,
@@ -2088,7 +2098,7 @@ async function UD() {
   const e = f(
     E,
     () => {
-      t = E.value(), F = new q(), F.closed = !1, L.use(F), F.center = t, D.center = t, E.setMessage(`
+      t = E.value(), F = new q(), F.closed = !1, v.use(F), F.center = t, D.center = t, E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u8D77\u70B9:`), E.setUserDraw((c, m) => {
         m.drawCustomEntity(F), m.drawLine(t, c);
       }), o();
@@ -2096,15 +2106,15 @@ async function UD() {
     () => {
     }
   );
-  let s, i;
+  let s, r;
   const o = f(
     E,
     () => {
       s = E.value(), F.endPoint = s, E.setMessage(
         `
 \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)]:`
-      ), E.setKeyWords("A L R"), i = new J(), i.setDashLineDisplay(!0), i.setDashArray(0.05), i.setLineWidth(2), i.setColor("#ffd30d"), i.pt1 = F.center, E.setUserDraw((c, m) => {
-        F.startPoint = c, i.pt2 = c, m.drawCustomEntity(F), m.drawCustomEntity(i);
+      ), E.setKeyWords("A L R"), r = new J(), r.setDashLineDisplay(!0), r.setDashArray(0.05), r.setLineWidth(2), r.setColor("#ffd30d"), r.pt1 = F.center, E.setUserDraw((c, m) => {
+        F.startPoint = c, r.pt2 = c, m.drawCustomEntity(F), m.drawCustomEntity(r);
       }), l();
     },
     () => {
@@ -2122,14 +2132,14 @@ async function UD() {
           `
 \u6307\u5B9A\u5706\u5F27\u7684\u5939\u89D2(\u6309\u4F4F ctrl \u952E\u53D6\u76F8\u53CD\u65B9\u5411)\u6216 [\u4FEE\u6539\u534A\u5F84(R)]:`
         ), E.setKeyWords("R"), E.setUserDraw((c, m) => {
-          F.startPoint = c, m.drawCustomEntity(F), m.drawCustomEntity(i);
+          F.startPoint = c, m.drawCustomEntity(F), m.drawCustomEntity(r);
         }), !0;
       if (E.isKeyWordPicked("L"))
         return E.setMessage(
           `
 \u6307\u5B9A\u5706\u5F27\u7684\u5939\u89D2(\u6309\u4F4F ctrl \u952E\u53D6\u76F8\u53CD\u65B9\u5411)\u6216 [\u4FEE\u6539\u534A\u5F84(R)]:`
         ), E.setKeyWords("R"), E.setUserDraw((c, m) => {
-          F.startPoint = c, m.drawCustomEntity(F), m.drawCustomEntity(i);
+          F.startPoint = c, m.drawCustomEntity(F), m.drawCustomEntity(r);
         }), !0;
       if (E.isKeyWordPicked("R"))
         E.setMessage(
@@ -2147,18 +2157,18 @@ async function UD() {
     E,
     () => {
       n = E.value(), E.setMessage(`
-\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9:`), B = new YD(), B.autoClockwise = !0, B.closed = !1, L.use(B), B.point1 = C, B.point3 = n, E.setUserDraw((c, m) => {
+\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9:`), B = new YD(), B.autoClockwise = !0, B.closed = !1, v.use(B), B.point1 = C, B.point3 = n, E.setUserDraw((c, m) => {
         B.point2 = c, m.drawCustomEntity(B);
       }), g();
     },
     () => {
       if (E.isKeyWordPicked("C"))
-        F = new q(), F.closed = !1, L.use(F), E.setMessage(`
+        F = new q(), F.closed = !1, v.use(F), E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3`), E.setKeyWords(""), E.setUserDraw((c, m) => {
           F.startPoint = C, m.drawLine(c, F.startPoint);
         }), e();
       else if (E.isKeyWordPicked("E"))
-        F = new q(), F.closed = !1, L.use(F), E.setMessage(`
+        F = new q(), F.closed = !1, v.use(F), E.setMessage(`
 \u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3`), E.setKeyWords(""), E.setUserDraw((c, m) => {
           F.startPoint = C, m.drawLine(c, F.startPoint);
         }), e();
@@ -2166,7 +2176,7 @@ async function UD() {
         return !0;
     }
   );
-  let h = r.App.GetCurrentMxCAD();
+  let h = i.App.GetCurrentMxCAD();
   const g = f(
     E,
     () => {
@@ -2188,15 +2198,15 @@ d.on("init", () => {
 });
 function zD() {
   const E = new T(), D = new QD();
-  D.closed = !1, L.use(D), E.setMessage(`
+  D.closed = !1, v.use(D), E.setMessage(`
 \u6307\u5B9A\u692D\u5706\u7684\u8F74\u7AEF\u70B9`), E.setKeyWords("[\u4E2D\u5FC3\u70B9(C)]");
   let C, B = new THREE.Vector3();
   f(
     E,
     () => {
-      C = E.value(), E.setUserDraw((i, o) => {
-        const a = new THREE.Line3(C, i);
-        a.getCenter(B), D.center = B, D.xRadius = a.distance() / 2, D.yRadius = D.xRadius, D.rotation = DD(i.x, i.y, B.x, B.y), o.drawLine(i, C);
+      C = E.value(), E.setUserDraw((r, o) => {
+        const a = new THREE.Line3(C, r);
+        a.getCenter(B), D.center = B, D.xRadius = a.distance() / 2, D.yRadius = D.xRadius, D.rotation = DD(r.x, r.y, B.x, B.y), o.drawLine(r, C);
       }), E.setMessage(`
 \u6307\u5B9A\u692D\u5706\u5F27\u8F74\u7684\u53E6\u4E00\u4E2A\u7AEF\u70B9:`), E.setKeyWords(""), A();
     },
@@ -2206,8 +2216,8 @@ function zD() {
   const A = f(
     E,
     () => {
-      E.setUserDraw((i, o) => {
-        D.yRadius = B.distanceTo(i), o.drawLine(B, i), o.drawCustomEntity(D);
+      E.setUserDraw((r, o) => {
+        D.yRadius = B.distanceTo(r), o.drawLine(B, r), o.drawCustomEntity(D);
       }), E.setMessage(`
 \u6307\u5B9A\u53E6\u4E00\u6761\u534A\u8F74\u957F\u5EA6`), E.setKeyWords(""), t();
     },
@@ -2217,8 +2227,8 @@ function zD() {
     E,
     () => {
       E.setMessage(`
-\u6307\u5B9A\u8D77\u59CB\u89D2\u5EA6`), E.setKeyWords(""), E.setUserDraw((i, o) => {
-        D.startAngle = DD(i.x, i.y, B.x, B.y) - D.rotation, o.drawLine(B, i), o.drawCustomEntity(D);
+\u6307\u5B9A\u8D77\u59CB\u89D2\u5EA6`), E.setKeyWords(""), E.setUserDraw((r, o) => {
+        D.startAngle = DD(r.x, r.y, B.x, B.y) - D.rotation, o.drawLine(B, r), o.drawCustomEntity(D);
       }), e();
     },
     () => {
@@ -2226,8 +2236,8 @@ function zD() {
   ), e = f(
     E,
     () => {
-      E.setUserDraw((i, o) => {
-        D.endAngle = DD(i.x, i.y, B.x, B.y) - D.rotation, o.drawLine(B, i), o.drawCustomEntity(D);
+      E.setUserDraw((r, o) => {
+        D.endAngle = DD(r.x, r.y, B.x, B.y) - D.rotation, o.drawLine(B, r), o.drawCustomEntity(D);
       }), E.setMessage(`
 \u6307\u5B9A\u7EC8\u6B62\u89D2\u5EA6`), E.setKeyWords(""), s();
     },
@@ -2236,14 +2246,14 @@ function zD() {
   ), s = f(
     E,
     () => {
-      let i = new w(D.xRadius, 0, 0);
-      i.rotateBy(D.rotation, w.kZAxis), r.App.GetCurrentMxCAD().DrawEllipseArc(D.center.x, D.center.y, i.x, i.y, D.yRadius / D.xRadius, D.startAngle, D.endAngle);
+      let r = new w(D.xRadius, 0, 0);
+      r.rotateBy(D.rotation, w.kZAxis), i.App.GetCurrentMxCAD().DrawEllipseArc(D.center.x, D.center.y, r.x, r.y, D.yRadius / D.xRadius, D.startAngle, D.endAngle);
     },
     () => {
     }
   );
 }
-function gC() {
+function yC() {
   const E = new T(), D = new XD(), C = new DC();
   E.setMessage(`
 \u70B9\u51FB\u5F00\u59CB\u7ED8\u5236\u692D\u5706:`), E.go(() => {
@@ -2251,12 +2261,12 @@ function gC() {
       C.point2 = B, D.drawCustomEntity(C);
     }), E.setUserDraw(D), E.setMessage(`
 \u518D\u6B21\u70B9\u51FB\u7ED3\u675F\u7ED8\u5236\u692D\u5706:`), E.go(() => {
-      r.App.GetCurrentMxCAD().DrawEllipse(C.center.x, C.center.y, C.xRadius, 0, C.yRadius / C.xRadius);
+      i.App.GetCurrentMxCAD().DrawEllipse(C.center.x, C.center.y, C.xRadius, 0, C.yRadius / C.xRadius);
     });
   });
 }
 d.on("init", () => {
-  d.addCommand("Mx_EllipseArc", zD), d.addCommand("Mx_Ellipse", gC);
+  d.addCommand("Mx_EllipseArc", zD), d.addCommand("Mx_Ellipse", yC);
 });
 async function VD() {
   (await eD.selectEnt(`
@@ -2265,16 +2275,16 @@ async function VD() {
   });
 }
 d.addCommand("Mx_Erase", VD);
-const yC = async (E, D, C) => {
+const xC = async (E, D, C) => {
   const { locateFile: B } = C, F = B(E + ".js");
-  return await vD(F), await globalThis[D](C);
+  return await LD(F), await globalThis[D](C);
 };
-function xC(E) {
+function bC(E) {
   return typeof ResizeObserver == "function" ? new ResizeObserver(E) : null;
 }
-function bC(E, D) {
+function fC(E, D) {
   const C = () => requestAnimationFrame(D);
-  let B = xC(C);
+  let B = bC(C);
   if (B) {
     B.observe(E);
     return;
@@ -2284,7 +2294,7 @@ function bC(E, D) {
     return;
   }
 }
-function fC(E, D) {
+function MC(E, D) {
   let C = null;
   return function(...B) {
     C || (C = setTimeout(() => {
@@ -2302,23 +2312,23 @@ class z {
       n = Math.max(A, n), u = Math.max(t, u), this.canvas.style.width = n + 1 + "px", this.canvas.style.height = u + "px";
       const h = window.devicePixelRatio || 1;
       this.canvas.width = n * h, this.canvas.height = u * h;
-    }, B = fC(C, 50), {
+    }, B = MC(C, 50), {
       canvas: F,
       minWidth: A = 300,
       minHeight: t = 300,
       updateCanvasSize: e = B,
       ...s
     } = D;
-    let i = typeof F == "string" ? document.querySelectorAll(F)[0] : F, o = i.getContext("webgl2", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 });
-    o == null && (o = i.getContext("webgl", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 })), this.canvas = i, this.ctx = o, s.canvas = this.canvas;
+    let r = typeof F == "string" ? document.querySelectorAll(F)[0] : F, o = r.getContext("webgl2", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 });
+    o == null && (o = r.getContext("webgl", { alpha: !1, depth: !0, antialias: !1, preserveDrawingBuffer: !0 })), this.canvas = r, this.ctx = o, s.canvas = this.canvas;
     for (let a in s)
       this[a] = s[a];
     if (this.canvas instanceof HTMLCanvasElement) {
       const a = this.canvas.parentElement || document.body;
-      bC(a, e);
+      fC(a, e);
     } else
       console.error("createMxDraw3d canvas \u53C2\u6570\u4E0D\u6B63\u786E \u65E0\u6CD5\u83B7\u53D6\u5230canvas\u5143\u7D20");
-    window.onresize = C, C(), yC("mxdraw3d_min", "mxdraw3d", this).then(() => {
+    window.onresize = C, C(), xC("mxdraw3d_min", "mxdraw3d", this).then(() => {
       z.onloadWasmMxDraw3dModel && z.onloadWasmMxDraw3dModel(this), this.updateCanvasSize = e, this.open3DFile = (a) => {
         const l = new FileReader();
         l.onload = () => {
@@ -2332,7 +2342,7 @@ class z {
     });
   }
 }
-function MC(E, D) {
+function TC(E, D) {
   return new Promise(async (C, B) => {
     try {
       E.locateFile || (E.locateFile = iC);
@@ -2345,26 +2355,26 @@ function MC(E, D) {
     }
   });
 }
-const kC = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const PC = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   b64Encode: uD,
   b64Decode: lD,
   saveAsFileDialog: cD,
   downloadFile: mD,
   downloadFileFromUrl: pD,
-  MxTools: N,
+  MxTools: H,
   McGePoint3d: p,
   McGeVector3d: w,
   McGeMatrix3d: W,
   getFilterImp: K,
-  McDrawResbuf: H,
+  McDrawResbuf: N,
   McDrawUtilityClass: PD,
   McDrawUtility: eD,
   McDrawSelSet: RD,
   McRxObject: O,
   McObjectIdType: b,
   McObjectId: M,
-  McDbObject: v,
+  McDbObject: L,
   get McDb() {
     return BD;
   },
@@ -2392,23 +2402,23 @@ const kC = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   McDbArc: kD,
   McObject: U,
   McAppType: SD,
-  MxCppType: LD,
+  MxCppType: vD,
   get MxCpp() {
-    return r;
+    return i;
   },
   loadMxCADassembly: OD,
   createMxCad: oC,
   drawText: aC,
   drawCircle: jD,
   drawLine: ID,
-  drawMText: pC,
+  drawMText: dC,
   drawPolyLine: GD,
   drawPolygon: WD,
   drawArc: UD,
   drawEllipticalArc: zD,
   mxErase: VD,
   MxDraw3d: z,
-  loadMxCADassembly3d: MC
+  loadMxCADassembly3d: TC
 }, Symbol.toStringTag, { value: "Module" }));
 export {
   SD as McAppType,
@@ -2431,12 +2441,12 @@ export {
   Z as McDbLine,
   hD as McDbLinetypeTable,
   FD as McDbMText,
-  v as McDbObject,
+  L as McDbObject,
   bD as McDbPolyline,
   TD as McDbRotatedDimension,
   Y as McDbText,
   wD as McDbTextStyleTable,
-  H as McDrawResbuf,
+  N as McDrawResbuf,
   RD as McDrawSelSet,
   eD as McDrawUtility,
   PD as McDrawUtilityClass,
@@ -2447,27 +2457,27 @@ export {
   M as McObjectId,
   b as McObjectIdType,
   O as McRxObject,
-  r as MxCpp,
-  LD as MxCppType,
+  i as MxCpp,
+  vD as MxCppType,
   z as MxDraw3d,
-  N as MxTools,
+  H as MxTools,
   lD as b64Decode,
   uD as b64Encode,
   oC as createMxCad,
-  kC as default,
+  PC as default,
   mD as downloadFile,
   pD as downloadFileFromUrl,
   UD as drawArc,
   jD as drawCircle,
   zD as drawEllipticalArc,
   ID as drawLine,
-  pC as drawMText,
+  dC as drawMText,
   GD as drawPolyLine,
   WD as drawPolygon,
   aC as drawText,
   K as getFilterImp,
   OD as loadMxCADassembly,
-  MC as loadMxCADassembly3d,
+  TC as loadMxCADassembly3d,
   VD as mxErase,
   cD as saveAsFileDialog
 };