mxcad 1.0.383 → 1.0.385

package/dist/mxcad.es.js

@@ -2740,321 +2740,6 @@ try {
   }
 }
 
-function b64Encode(str) {
-  return btoa(unescape(encodeURIComponent(str)));
-}
-function b64Decode(str) {
-  return decodeURIComponent(escape(atob(str)));
-}
-function crateHexString(str) {
-  return Array.from(new TextEncoder().encode(str)).map(function (byte) {
-    return byte.toString(16).padStart(2, "0");
-  }).join("");
-}
-function saveAsFileDialog(_x) {
-  return _saveAsFileDialog.apply(this, arguments);
-}
-function _saveAsFileDialog() {
-  _saveAsFileDialog = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee3(_ref) {
-    var blob, _ref$filename, filename, _ref$types, types, _window$navigator, userActivation, handle, writable, blobWithTypeName, objectUrl, link;
-    return regenerator.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          blob = _ref.blob, _ref$filename = _ref.filename, filename = _ref$filename === void 0 ? "" : _ref$filename, _ref$types = _ref.types, types = _ref$types === void 0 ? [{
-            description: "mxweb File",
-            accept: {
-              "application/octet-stream": [".mxweb"]
-            }
-          }] : _ref$types;
-          if (blob) {
-            _context3.next = 4;
-            break;
-          }
-          console.error("Invalid blob provided");
-          return _context3.abrupt("return");
-        case 4:
-          _context3.prev = 4;
-          if (!(typeof window.showSaveFilePicker === "function")) {
-            _context3.next = 31;
-            break;
-          }
-          userActivation = (_window$navigator = window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userActivation;
-          if (!(userActivation !== null && userActivation !== void 0 && userActivation.isActive || userActivation !== null && userActivation !== void 0 && userActivation.hasBeenActive)) {
-            _context3.next = 30;
-            break;
-          }
-          _context3.prev = 8;
-          _context3.next = 11;
-          return window.showSaveFilePicker({
-            suggestedName: filename,
-            types: types
-          });
-        case 11:
-          handle = _context3.sent;
-          _context3.next = 14;
-          return handle.createWritable();
-        case 14:
-          writable = _context3.sent;
-          _context3.next = 17;
-          return writable.write(blob);
-        case 17:
-          _context3.next = 19;
-          return writable.close();
-        case 19:
-          return _context3.abrupt("return", handle);
-        case 22:
-          _context3.prev = 22;
-          _context3.t0 = _context3["catch"](8);
-          if (!(_context3.t0.name === "AbortError")) {
-            _context3.next = 27;
-            break;
-          }
-          console.log("\u7528\u6237\u53D6\u6D88\u6216\u6743\u9650\u88AB\u62D2");
-          return _context3.abrupt("return", false);
-        case 27:
-          if (_context3.t0.name === "AbortError" || _context3.t0.name === "NotAllowedError") {
-            console.warn("Save cancelled or not allowed:", _context3.t0.message);
-          } else {
-            console.error("showSaveFilePicker failed:", _context3.t0);
-          }
-        case 28:
-          _context3.next = 31;
-          break;
-        case 30:
-          console.warn("No user activation, skipping showSaveFilePicker");
-        case 31:
-          if (!(window.navigator.msSaveOrOpenBlob && typeof window.navigator.msSaveOrOpenBlob === "function")) {
-            _context3.next = 35;
-            break;
-          }
-          blobWithTypeName = blob.slice(0, blob.size, blob.type || "application/octet-stream");
-          window.navigator.msSaveOrOpenBlob(blobWithTypeName, filename);
-          return _context3.abrupt("return");
-        case 35:
-          objectUrl = window.URL.createObjectURL(blob);
-          link = document.createElement("a");
-          link.href = objectUrl;
-          link.download = filename;
-          link.style.display = "none";
-          document.body.appendChild(link);
-          link.click();
-          setTimeout(function () {
-            window.URL.revokeObjectURL(objectUrl);
-          }, 100);
-          document.body.removeChild(link);
-          return _context3.abrupt("return");
-        case 47:
-          _context3.prev = 47;
-          _context3.t1 = _context3["catch"](4);
-          console.error("File save failed:", _context3.t1.name, _context3.t1.message);
-        case 50:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3, null, [[4, 47], [8, 22]]);
-  }));
-  return _saveAsFileDialog.apply(this, arguments);
-}
-function downloadFile(blob, filename) {
-  var link = document.createElement("a");
-  link.href = window.URL.createObjectURL(blob);
-  link.download = filename;
-  link.click();
-}
-function downloadFileFromUrl(url, filename) {
-  fetch(url).then(function (response) {
-    return response.blob();
-  }).then(function (blob) {
-    var link = document.createElement("a");
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-    link.click();
-  });
-}
-var getJsonFromUrl = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee(url) {
-    return regenerator.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          _context.next = 3;
-          return fetch(url);
-        case 3:
-          _context.next = 5;
-          return _context.sent.json();
-        case 5:
-          return _context.abrupt("return", _context.sent);
-        case 8:
-          _context.prev = 8;
-          _context.t0 = _context["catch"](0);
-          console.error("MxTip:error getJsonFromurl:" + url);
-        case 11:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 8]]);
-  }));
-  return function getJsonFromUrl(_x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-var getFileFromUrl = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee2(url) {
-    return regenerator.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.prev = 0;
-          _context2.next = 3;
-          return fetch(url);
-        case 3:
-          return _context2.abrupt("return", _context2.sent);
-        case 6:
-          _context2.prev = 6;
-          _context2.t0 = _context2["catch"](0);
-          console.error("MxTip:error getFileFromUrl:" + url);
-        case 9:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2, null, [[0, 6]]);
-  }));
-  return function getFileFromUrl(_x3) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-function _ML_String(strId, str) {
-  return MxFun.getLanguageString(strId, str);
-}
-function IsZero(val) {
-  return Math.abs(val) < 1e-7;
-}
-function postMemoryFile(memoryData, url, filename, retCall, param) {
-  try {
-    var formData = new FormData();
-    var blob = new Blob([memoryData], {
-      type: "application/octet-stream"
-    });
-    formData.append("file", new File([blob], filename));
-    if (param) formData.append("param", param);
-    var xhr = new XMLHttpRequest();
-    xhr.open("POST", url);
-    xhr.send(formData);
-    xhr.onreadystatechange = function () {
-      if (xhr.readyState === XMLHttpRequest.DONE) {
-        if (xhr.status === 200) {
-          retCall(0, xhr.responseText);
-        } else {
-          console.log(xhr.responseText);
-          retCall(4, "server error");
-        }
-      }
-    };
-  } catch (error) {
-    retCall(-1, "catch error");
-  }
-}
-function postEmscriptenIndexedDBFile(filekey, url, retCall, param) {
-  var request = window.indexedDB.open("emscripten_filesystem", 1);
-  request.onerror = function () {
-    retCall(1, "open emscripten_filesystem failed");
-  };
-  request.onsuccess = function (event) {
-    try {
-      if (event.target != null) {
-        var db = event.target.result;
-        var transaction = db.transaction("FILES", "readonly");
-        var objectStore = transaction.objectStore("FILES");
-        var request2 = objectStore.get(filekey);
-        request2.onerror = function () {
-          retCall(3, "get file error");
-        };
-        request2.onsuccess = function () {
-          var file = request2.result;
-          if (file) {
-            var formData = new FormData();
-            formData.append("file", file);
-            if (param) formData.append("param", param);
-            var xhr = new XMLHttpRequest();
-            xhr.open("POST", url);
-            xhr.send(formData);
-            xhr.onreadystatechange = function () {
-              if (xhr.readyState === XMLHttpRequest.DONE) {
-                if (xhr.status === 200) {
-                  retCall(0, xhr.responseText);
-                } else {
-                  console.log(xhr.responseText);
-                  retCall(4, "server error");
-                }
-              }
-            };
-          } else {
-            retCall(5, "get file data error");
-          }
-        };
-      } else {
-        retCall(2, "event.target == null");
-      }
-    } catch (error) {
-      retCall(-1, "catch error");
-    }
-  };
-}
-function createCursorHelp() {
-  var canvasSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 128;
-  var squareSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
-  var isRoss = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var color = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "#ffffff";
-  var canvas = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : document.createElement("canvas");
-  var background = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "transparent";
-  canvas.width = canvas.height = canvasSize;
-  canvas.style.background = background;
-  var ctx = canvas.getContext("2d");
-  var canvasDevil = canvasSize % 2 === 0 ? -0.5 : 0;
-  var squareDevil = squareSize % 2 === 0 ? -0.5 : 0;
-  ctx.strokeStyle = color;
-  ctx.lineWidth = 0;
-  ctx.imageSmoothingEnabled = false;
-  if (isRoss) {
-    ctx.beginPath();
-    ctx.moveTo(canvas.width / 2 + canvasDevil, canvasDevil);
-    ctx.lineTo(canvas.width / 2 + canvasDevil, canvas.height + canvasDevil);
-    ctx.stroke();
-    ctx.beginPath();
-    ctx.moveTo(canvasDevil, canvas.height / 2 + canvasDevil);
-    ctx.lineTo(canvas.width + canvasDevil, canvas.height / 2 + canvasDevil);
-    ctx.stroke();
-  }
-  ctx.beginPath();
-  ctx.strokeRect(canvasSize / 2 - squareSize / 2 + squareDevil, canvasSize / 2 - squareSize / 2 + squareDevil, squareSize, squareSize);
-  ctx.stroke();
-  return canvas.toDataURL("image/png");
-}
-function createCursor() {
-  var cursorSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 128;
-  var targetFrameSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
-  var color = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "#ffffff";
-  return {
-    Rect: "url('".concat(createCursorHelp(cursorSize, targetFrameSize, false, color), "') ").concat(cursorSize / 2, " ").concat(cursorSize / 2, ", auto"),
-    Cross: "url('".concat(createCursorHelp(cursorSize, 0, true, color), "') ").concat(cursorSize / 2, " ").concat(cursorSize / 2, " , auto"),
-    Normal: "url('".concat(createCursorHelp(cursorSize, targetFrameSize, true, color), "') ").concat(cursorSize / 2, " ").concat(cursorSize / 2, ", auto"),
-    Pan: "grabbing"
-  };
-}
-var MxTools = {
-  b64Encode: b64Encode,
-  b64Decode: b64Decode,
-  saveAsFileDialog: saveAsFileDialog,
-  downloadFile: downloadFile,
-  downloadFileFromUrl: downloadFileFromUrl,
-  getJsonFromUrl: getJsonFromUrl,
-  getFileFromUrl: getFileFromUrl,
-  _ML_String: _ML_String,
-  IsZero: IsZero,
-  postEmscriptenIndexedDBFile: postEmscriptenIndexedDBFile,
-  postMemoryFile: postMemoryFile,
-  createCursor: createCursor
-};
-
 function _classCallCheck$1(instance, Constructor) {
   if (!(instance instanceof Constructor)) {
     throw new TypeError("Cannot call a class as a function");
@@ -3120,175 +2805,6 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
-var MxCanvas2Image = /*#__PURE__*/function () {
-  function MxCanvas2Image() {
-    var in_document = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : void 0;
-    _classCallCheck$1(this, MxCanvas2Image);
-    _defineProperty(this, "$support", void 0);
-    _defineProperty(this, "downloadMime", "image/octet-stream");
-    _defineProperty(this, "mydocument", document);
-    if (in_document) this.mydocument = in_document;
-    this.$support = function () {
-      var canvas = in_document.createElement("canvas"),
-        ctx = canvas.getContext("2d");
-      return {
-        canvas: !!ctx,
-        imageData: !!ctx.getImageData,
-        dataURL: !!canvas.toDataURL,
-        btoa: !!window.btoa
-      };
-    }();
-  }
-  _createClass$1(MxCanvas2Image, [{
-    key: "scaleCanvas",
-    value: function scaleCanvas(canvas, width, height) {
-      var w = canvas.width,
-        h = canvas.height;
-      if (width == void 0) {
-        width = w;
-      }
-      if (height == void 0) {
-        height = h;
-      }
-      var retCanvas = this.mydocument.createElement("canvas");
-      var retCtx = retCanvas.getContext("2d");
-      retCanvas.width = width;
-      retCanvas.height = height;
-      retCtx.drawImage(canvas, 0, 0, w, h, 0, 0, width, height);
-      return retCanvas;
-    }
-  }, {
-    key: "getDataURL",
-    value: function getDataURL(canvas, type, width, height) {
-      canvas = this.scaleCanvas(canvas, width, height);
-      return canvas.toDataURL(type);
-    }
-  }, {
-    key: "saveFile",
-    value: function saveFile(strData) {
-      var link = this.mydocument.createElement("a");
-      link.href = strData;
-      link.download = "save.bmp";
-      link.click();
-    }
-  }, {
-    key: "genImage",
-    value: function genImage(strData) {
-      var img = this.mydocument.createElement("img");
-      img.src = strData;
-      return img;
-    }
-  }, {
-    key: "fixType",
-    value: function fixType(type) {
-      type = type.toLowerCase().replace(/jpg/i, "jpeg");
-      var r = type.match(/png|jpeg|bmp|gif/)[0];
-      return "image/" + r;
-    }
-  }, {
-    key: "encodeData",
-    value: function encodeData(data) {
-      if (!window.btoa) {
-        throw "btoa undefined";
-      }
-      var str = "";
-      if (typeof data == "string") {
-        str = data;
-      } else {
-        for (var i = 0; i < data.length; i++) {
-          str += String.fromCharCode(data[i]);
-        }
-      }
-      return btoa(str);
-    }
-  }, {
-    key: "getImageData",
-    value: function getImageData(canvas) {
-      var w = canvas.width,
-        h = canvas.height;
-      return canvas.getContext("2d").getImageData(0, 0, w, h);
-    }
-  }, {
-    key: "makeURI",
-    value: function makeURI(strData, type) {
-      return "data:" + type + ";base64," + strData;
-    }
-  }, {
-    key: "genBitmapImage",
-    value: function genBitmapImage(oData) {
-      var biWidth = oData.width;
-      var biHeight = oData.height;
-      var biSizeImage = biWidth * biHeight * 3;
-      var bfSize = biSizeImage + 54;
-      var BITMAPFILEHEADER = [66, 77, bfSize & 255, bfSize >> 8 & 255, bfSize >> 16 & 255, bfSize >> 24 & 255, 0, 0, 0, 0, 54, 0, 0, 0];
-      var BITMAPINFOHEADER = [40, 0, 0, 0, biWidth & 255, biWidth >> 8 & 255, biWidth >> 16 & 255, biWidth >> 24 & 255, biHeight & 255, biHeight >> 8 & 255, biHeight >> 16 & 255, biHeight >> 24 & 255, 1, 0, 24, 0, 0, 0, 0, 0, biSizeImage & 255, biSizeImage >> 8 & 255, biSizeImage >> 16 & 255, biSizeImage >> 24 & 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-      var iPadding = (4 - biWidth * 3 % 4) % 4;
-      var aImgData = oData.data;
-      var strPixelData = "";
-      var biWidth4 = biWidth << 2;
-      var y = biHeight;
-      var fromCharCode = String.fromCharCode;
-      do {
-        var iOffsetY = biWidth4 * (y - 1);
-        var strPixelRow = "";
-        for (var x = 0; x < biWidth; x++) {
-          var iOffsetX = x << 2;
-          strPixelRow += fromCharCode(aImgData[iOffsetY + iOffsetX + 2]) + fromCharCode(aImgData[iOffsetY + iOffsetX + 1]) + fromCharCode(aImgData[iOffsetY + iOffsetX]);
-        }
-        for (var c = 0; c < iPadding; c++) {
-          strPixelRow += String.fromCharCode(0);
-        }
-        strPixelData += strPixelRow;
-      } while (--y);
-      var strEncoded = this.encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + this.encodeData(strPixelData);
-      return strEncoded;
-    }
-  }, {
-    key: "saveAsImage",
-    value: function saveAsImage(canvas, width, height, type) {
-      if (this.$support.canvas && this.$support.dataURL) {
-        if (typeof canvas == "string") {
-          canvas = this.mydocument.getElementById(canvas);
-        }
-        if (type == void 0) {
-          type = "png";
-        }
-        type = this.fixType(type);
-        if (/bmp/.test(type)) {
-          var data = this.getImageData(this.scaleCanvas(canvas, width, height));
-          var strData = this.genBitmapImage(data);
-          this.saveFile(this.makeURI(strData, this.downloadMime));
-        } else {
-          var _strData = this.getDataURL(canvas, type, width, height);
-          this.saveFile(_strData.replace(type, this.downloadMime));
-        }
-      }
-    }
-  }, {
-    key: "convertToImage",
-    value: function convertToImage(canvas, width, height, type) {
-      if (this.$support.canvas && this.$support.dataURL) {
-        if (typeof canvas == "string") {
-          canvas = this.mydocument.getElementById(canvas);
-        }
-        if (type == void 0) {
-          type = "png";
-        }
-        type = this.fixType(type);
-        if (/bmp/.test(type)) {
-          var data = this.getImageData(this.scaleCanvas(canvas, width, height));
-          var strData = this.genBitmapImage(data);
-          return this.genImage(this.makeURI(strData, "image/bmp"));
-        } else {
-          var _strData2 = this.getDataURL(canvas, type, width, height);
-          return this.genImage(_strData2);
-        }
-      }
-    }
-  }]);
-  return MxCanvas2Image;
-}();
-
 var lib = {exports: {}};
 
 /* eslint-disable node/no-deprecated-api */
@@ -15080,7 +14596,7 @@ win.McDrawObjectEvent_asciiToUTF8 = function (hexstr) {
   return MxG2312Obj.decodeFromGb2312Imp(hexstr);
 };
 
-const version$1 = "1.0.382";
+const version$1 = "1.0.384";
 
 var isSharedArrayBuffer = "SharedArrayBuffer" in window;
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -15095,6 +14611,16 @@ var get2DSTFileURL = function get2DSTFileURL(fileName) {
   if (isCdn) return "https://unpkg.com/mxcad@".concat(version$1, "/dist/wasm/2d/").concat(fileName);
   return base + fileName;
 };
+var get2D64FileURL = function get2D64FileURL(fileName) {
+  var base = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : self.location.href;
+  if (isCdn) return "https://unpkg.com/mxcad@".concat(version$1, "/dist/wasm/2d-x64-st/").concat(fileName);
+  return base + fileName;
+};
+var get2D64STFileURL = function get2D64STFileURL(fileName) {
+  var base = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : self.location.href;
+  if (isCdn) return "https://unpkg.com/mxcad@".concat(version$1, "/dist/wasm/2d-x64/").concat(fileName);
+  return base + fileName;
+};
 
 var loadScript = function loadScript(url) {
   return new Promise(function (resolve, reject) {
@@ -15318,8 +14844,53 @@ var McObjectId = /*#__PURE__*/function () {
         this.type = type;
       }
     }
+    if (MxCpp.App.isWasmx64()) {
+      if (this.type == 0 /* kMxCAD */) {
+        if (typeof this.id === "string") {
+          this.id = BigInt(this.id);
+        } else if (typeof this.id === "number") {
+          if (this.id == 0) {
+            this.id = BigInt(0);
+          } else {
+            this.id = BigInt(0);
+            console.log("mx:error id:" + this.id);
+          }
+        }
+      } else if (this.type == 2 /* kInvalid */) {
+        if (this.id == 0) {
+          this.id = BigInt(0);
+        }
+      }
+    }
   }
   _createClass$1(McObjectId, [{
+    key: "initFromCpp",
+    value: function initFromCpp(id) {
+      this.type = 0 /* kMxCAD */;
+      if (MxCpp.App.isWasmx64()) {
+        if (typeof id === "string") {
+          this.id = BigInt(id);
+        } else {
+          this.id = id;
+        }
+      } else {
+        this.id = id;
+      }
+    }
+  }, {
+    key: "getValueFromCpp",
+    value: function getValueFromCpp() {
+      if (this.type == 0 /* kMxCAD */) {
+        if (MxCpp.App.isWasmx64()) {
+          return this.id.toString();
+        } else {
+          return this.id;
+        }
+      } else {
+        return this.id;
+      }
+    }
+  }, {
     key: "isValid",
     value: function isValid() {
       return this.type != 2 /* kInvalid */ && this.id != 0;
@@ -15917,6 +15488,14 @@ var MxCADResbuf = /*#__PURE__*/function (_McRxObject) {
         ret: MxCpp.getCallResult() == 0
       };
     }
+  }, {
+    key: "AtObjectIdValue",
+    value: function AtObjectIdValue(lItem) {
+      return {
+        val: this.imp.AtObjectId(lItem),
+        ret: MxCpp.getCallResult() == 0
+      };
+    }
   }, {
     key: "AtString",
     value: function AtString(lItem) {
@@ -16175,13 +15754,13 @@ var MxCADUtilityClass = /*#__PURE__*/function () {
         }
         if (filter != null || isFilterLockLayer) {
           if (!filter) filter = new MxCADResbuf();
-          var _aryId = new McGeLongArray();
+          var aryId_imp = new MxCpp.mxcadassemblyimp.MdGeLongLongArray();
           aryMxCADId.forEach(function (val) {
-            _aryId.append(val);
+            aryId_imp.append(val);
           });
           var ssimp = new MxCpp.mxcadassemblyimp.McDrawSelSet();
           ssimp.setFilterLockLayer(isFilterLockLayer);
-          var aryOutId = ssimp.getFilterEntity(_aryId.imp, getFilterImp(filter));
+          var aryOutId = ssimp.getFilterEntity(aryId_imp, getFilterImp(filter));
           aryMxCADId = [];
           var len = aryOutId.length();
           for (var k = 0; k < len; k++) {
@@ -16908,7 +16487,18 @@ var MxCADUiPrBase = /*#__PURE__*/function () {
   }, {
     key: "setLastInputPoint",
     value: function setLastInputPoint(pt) {
-      this.imp.setLastInputPoint(this.cad2doc1(pt));
+      if (pt == void 0) {
+        this.imp.clearLastInputPoint();
+      } else {
+        this.imp.setLastInputPoint(this.cad2doc1(pt));
+      }
+    }
+  }, {
+    key: "getLastInputPoint",
+    value: function getLastInputPoint() {
+      var pt = this.imp.getLastInputPoint();
+      if (pt == void 0) return pt;
+      return this.doc2cad1(pt);
     }
   }, {
     key: "message",
@@ -18442,7 +18032,7 @@ var McDbBlockReference = /*#__PURE__*/function (_McDbEntity4) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -19396,7 +18986,7 @@ var McDbProxyEntity = /*#__PURE__*/function (_McDbEntity8) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -20276,7 +19866,7 @@ var MxCustomEntityManagerImp = /*#__PURE__*/function () {
   }, {
     key: "allocId",
     value: function allocId() {
-      if (this.alloc_id > 9007199254740900) {
+      if (this.alloc_id > 2147483646) {
         this.alloc_id = 1;
       }
       this.alloc_id += 1;
@@ -20291,7 +19881,7 @@ var MxCustomEntityManagerImp = /*#__PURE__*/function () {
     key: "createMxEntity",
     value: function createMxEntity(typeName, imp) {
       if (typeName.length == 0) {
-        console.log("MxTip:assert(0) typeName is empty ");
+        console.log("mx:assert(0) typeName is empty ");
         return null;
       }
       var create = this.mapType2Create.get(typeName);
@@ -20411,11 +20001,13 @@ var MxCustomEntityManagerImp = /*#__PURE__*/function () {
           ent = MxCustomEntityManager.getObject(customid, indexIdDatabase);
         }
         if (!ent) return;
-        var mxcadWorldDraw = new MxCADWorldDraw(ptrWorldDraw);
-        if (ptrVecOsnapEntity !== 0) mxcadWorldDraw.imp.connectVecOsnapEntity(ptrVecOsnapEntity);
+        var mxcadWorldDraw = new MxCADWorldDraw(MxCpp.getIdFromCpp(ptrWorldDraw));
+        var ptrVecOsnapEntityId = MxCpp.getIdFromCpp(ptrVecOsnapEntity);
+        if (ptrVecOsnapEntityId !== 0) mxcadWorldDraw.imp.connectVecOsnapEntity(ptrVecOsnapEntityId);
         if (lPtrVecExplodeEntity !== 0) {
           mxcadWorldDraw.initType(MxCADWorldDrawType.kExplodeDraw);
-          mxcadWorldDraw.imp.connectVecExplodeEntity(lPtrVecExplodeEntity);
+          var lPtrVecExplodeEntityId = MxCpp.getIdFromCpp(lPtrVecExplodeEntity);
+          mxcadWorldDraw.imp.connectVecExplodeEntity(lPtrVecExplodeEntityId);
         }
         ent.worldDraw(mxcadWorldDraw);
       };
@@ -20442,7 +20034,8 @@ var MxCustomEntityManagerImp = /*#__PURE__*/function () {
       };
       win.MxCustomEntityManager_transformBy = function (customid, indexIdDatabase, ptrMat, tempid) {
         var mat = new McGeMatrix3d();
-        mat.imp.copyFormPointer(ptrMat);
+        var ptrMatId = MxCpp.getIdFromCpp(ptrMat);
+        mat.imp.copyFormPointer(ptrMatId);
         var ent;
         if (tempid != 0) {
           ent = MxCustomEntityManager.getTmpObject(tempid);
@@ -20810,11 +20403,11 @@ var McCmColor = /*#__PURE__*/function () {
   }, {
     key: "getColorValue",
     value: function getColorValue(layerId, blkRefId) {
-      var lId1 = 0;
+      var lId1 = MxCpp.App.isWasmx64() ? BigInt(0) : 0;
       if ((layerId === null || layerId === void 0 ? void 0 : layerId.type) == McObjectIdType.kMxCAD) {
         lId1 = layerId.id;
       }
-      var lId2 = 0;
+      var lId2 = MxCpp.App.isWasmx64() ? BigInt(0) : 0;
       if ((blkRefId === null || blkRefId === void 0 ? void 0 : blkRefId.type) == McObjectIdType.kMxCAD) {
         lId2 = blkRefId.id;
       }
@@ -20893,12 +20486,12 @@ var McDbLinetypeTableRecord = /*#__PURE__*/function (_McDbObject) {
   }, {
     key: "shapeStyleAt",
     value: function shapeStyleAt(index) {
-      return this.imp.shapeStyleAt(index);
+      return new McObjectId(this.imp.shapeStyleAt(index), McObjectIdType.kMxCAD);
     }
   }, {
     key: "setShapeStyleAt",
-    value: function setShapeStyleAt(index, value) {
-      return this.imp.setShapeStyleAt(index, value);
+    value: function setShapeStyleAt(index, id) {
+      return this.imp.setShapeStyleAt(index, id.id);
     }
   }, {
     key: "shapeNumberAt",
@@ -21288,7 +20881,7 @@ var McDbLayerTable = /*#__PURE__*/function (_McDbObject5) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21330,7 +20923,7 @@ var McDbLinetypeTable = /*#__PURE__*/function (_McDbObject6) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21372,7 +20965,7 @@ var McDbDimStyleTable = /*#__PURE__*/function (_McDbObject7) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21414,7 +21007,7 @@ var McDbTextStyleTable = /*#__PURE__*/function (_McDbObject8) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21468,11 +21061,11 @@ var McDbDatabase = /*#__PURE__*/function (_McRxObject) {
     key: "wblock",
     value: function wblock(database, aryId, ptBase, param) {
       if (!ptBase) ptBase = McGePoint3d.kOrigin;
-      var ids = new McGeLongArray();
+      var ids_imp = new MxCpp.mxcadassemblyimp.MdGeLongLongArray();
       aryId.forEach(function (val) {
-        ids.append(val.id);
+        ids_imp.append(val.id);
       });
-      return this.imp.wblock(database.getImp(), ids.imp, ptBase.imp, param ? JSON.stringify(param) : "");
+      return this.imp.wblock(database.getImp(), ids_imp, ptBase.imp, param ? JSON.stringify(param) : "");
     }
   }, {
     key: "insert",
@@ -21545,7 +21138,7 @@ var McDbDatabase = /*#__PURE__*/function (_McRxObject) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21769,7 +21362,7 @@ var McDbBlockTableRecord = /*#__PURE__*/function (_McDbObject9) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21846,7 +21439,7 @@ var McDbBlockTable = /*#__PURE__*/function (_McDbObject0) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -21935,7 +21528,7 @@ var McDbDictionary = /*#__PURE__*/function (_McDbObject10) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -22049,9 +21642,11 @@ var McDbGroup = /*#__PURE__*/function (_McDbObject12) {
   }, {
     key: "appendArray",
     value: function appendArray(aryId) {
-      var aryIdLong = new McGeLongArray();
-      aryIdLong.copyFormAryId(aryId);
-      return this.imp.appendArray(aryIdLong.imp);
+      var ids_imp = new MxCpp.mxcadassemblyimp.MdGeLongLongArray();
+      aryId.forEach(function (val) {
+        ids_imp.append(val.id);
+      });
+      return this.imp.appendArray(ids_imp);
     }
   }, {
     key: "has",
@@ -22067,7 +21662,7 @@ var McDbGroup = /*#__PURE__*/function (_McDbObject12) {
       for (var i = 0; i < iLen; i++) {
         ret.push(new McObjectId(aryId.at(i), McObjectIdType.kMxCAD));
       }
-      MxCpp.App.getImp().DestroyMdGeLongArray(aryId);
+      MxCpp.App.getImp().DestroyMdGeLongLongArray(aryId);
       return ret;
     }
   }, {
@@ -22918,6 +22513,9 @@ var McObject = /*#__PURE__*/function () {
       }
       this.currentFileName = sFileUrl.split("/").pop();
       this.currentOriginalFileName = this.currentFileName;
+      if (mxObject) {
+        mxObject.clearMxCurrentSelect(true);
+      }
       var sParam = "";
       if (obj_param) {
         sParam = JSON.stringify(obj_param);
@@ -22959,7 +22557,7 @@ var McObject = /*#__PURE__*/function () {
             if (xhr.readyState === 4) {
               if (!xhr.responseText || xhr.responseText.length == 0) {
                 myThis.imp.openWebFile("", isWorkThread, lOptID, sParam, fetchAttributes, isFetchTzFile);
-                console.log("MxTip:authorized service retrun error!");
+                console.log("mx:authorized service retrun error!");
               } else {
                 myThis.imp.openWebFile(xhr.responseText, isWorkThread, lOptID, sParam, fetchAttributes, isFetchTzFile);
               }
@@ -22967,7 +22565,7 @@ var McObject = /*#__PURE__*/function () {
           } else {
             if (iErrorTip == 0) {
               myThis.imp.openWebFile("", isWorkThread, lOptID, sParam, fetchAttributes, isFetchTzFile);
-              console.log("MxTip:authorized service net error!");
+              console.log("mx:authorized service net error!");
             }
             iErrorTip = 1;
           }
@@ -22987,7 +22585,7 @@ var McObject = /*#__PURE__*/function () {
       this.currentOriginalFileName = "";
       var mxobj = this.getMxDrawObject();
       mxobj.clearAllObject();
-      mxobj.clearMxCurrentSelect();
+      mxobj.clearMxCurrentSelect(true);
       return this.imp.newFile();
     }
   }, {
@@ -23016,7 +22614,9 @@ var McObject = /*#__PURE__*/function () {
           if (param.result != 0) {
             console.log("insertBlock result:" + param.result);
           }
-          resolve(new McObjectId(param.blkrecid, McObjectIdType.kMxCAD));
+          var blkId = new McObjectId();
+          blkId.initFromCpp(param.blkrecid);
+          resolve(blkId);
         };
         mxObject.addEvent("insertBlockComplete", funCall);
         var initialParameter = "";
@@ -23781,6 +23381,7 @@ var McAppType = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "dMcGeBakTol", -1);
+    _defineProperty(this, "iIsWasmx64", -1);
   }
   _createClass$1(McAppType, [{
     key: "init",
@@ -23796,6 +23397,9 @@ var McAppType = /*#__PURE__*/function () {
       this.MxCADAssist = new MxCpp.mxcadassemblyimp.MxDrawAssist();
       this.initCalls();
       McAppFuncton.init();
+      if (this.isWasmx64()) {
+        console.log("mx:full support for 64-bit WebAssembly programs requires Chrome version greater than 133");
+      }
     }
   }, {
     key: "setImp",
@@ -24183,6 +23787,14 @@ var McAppType = /*#__PURE__*/function () {
         _this9.imp.addFontsLoadOnInitialization(val, 0);
       });
     }
+  }, {
+    key: "isWasmx64",
+    value: function isWasmx64() {
+      if (this.iIsWasmx64 === -1) {
+        this.iIsWasmx64 = this.imp.isWasmx64();
+      }
+      return this.iIsWasmx64;
+    }
   }, {
     key: "IniSet",
     value: function IniSet(ini) {
@@ -24375,6 +23987,20 @@ var MxCppType = /*#__PURE__*/function () {
     value: function encodeToGb2312(str) {
       return MxG2312Obj.encodeToGb2312(str);
     }
+  }, {
+    key: "getIdFromCpp",
+    value: function getIdFromCpp(id) {
+      if (typeof id === "string") {
+        return BigInt(id);
+      } else {
+        if (MxCpp.App.isWasmx64()) {
+          if (typeof id === "number") {
+            return BigInt(id);
+          }
+        }
+        return id;
+      }
+    }
   }]);
   return MxCppType;
 }();
@@ -24507,9 +24133,9 @@ var MxCompare = /*#__PURE__*/function () {
         var ret = new MxCADResbuf(this.imp.getResult());
         var count = ret.GetCount();
         for (var i = 0; i + 3 < count; i += 4) {
-          var id_current = ret.AtLong(i);
+          var id_current = ret.AtObjectIdValue(i);
           if (!id_current.ret) break;
-          var id_base = ret.AtLong(i + 1);
+          var id_base = ret.AtObjectIdValue(i + 1);
           if (!id_base.ret) break;
           var pos = ret.AtPoint(i + 2);
           if (!pos.ret) break;
@@ -24704,15 +24330,17 @@ function _loadMxCADassembly() {
       fontspath,
       networkFonts,
       mxcad,
+      wasmx64,
       _args2 = arguments;
     return regenerator.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          locateFile = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : isSharedArrayBuffer || !isCdn ? get2DFileURL : get2DSTFileURL;
+          locateFile = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : void 0;
           wasmBinary = _args2.length > 2 ? _args2[2] : undefined;
           fontspath = _args2.length > 3 ? _args2[3] : undefined;
           networkFonts = _args2.length > 4 ? _args2[4] : undefined;
           mxcad = _args2.length > 5 ? _args2[5] : undefined;
+          wasmx64 = _args2.length > 6 ? _args2[6] : undefined;
           return _context2.abrupt("return", new Promise(/*#__PURE__*/function () {
             var _ref = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee(resolve, reject) {
               var baseFileName, mxcadassemblyimp, app, win;
@@ -24728,13 +24356,20 @@ function _loadMxCADassembly() {
                     call && call(MxCpp);
                     return _context.abrupt("return", resolve(MxCpp));
                   case 5:
+                    if (locateFile == void 0) {
+                      if (wasmx64) {
+                        locateFile = isSharedArrayBuffer || !isCdn ? get2D64FileURL : get2D64STFileURL;
+                      } else {
+                        locateFile = isSharedArrayBuffer || !isCdn ? get2DFileURL : get2DSTFileURL;
+                      }
+                    }
                     baseFileName = "mxdrawassembly_min";
-                    _context.next = 8;
+                    _context.next = 9;
                     return loadWams(baseFileName, "mxdrawassembly", {
                       locateFile: locateFile,
                       wasmBinary: wasmBinary
                     });
-                  case 8:
+                  case 9:
                     mxcadassemblyimp = _context.sent;
                     MxCpp.mxcadassemblyimp = mxcadassemblyimp;
                     app = new mxcadassemblyimp.McApp();
@@ -24759,23 +24394,23 @@ function _loadMxCADassembly() {
                     win["__MxCpp__"] = MxCpp;
                     call && call(MxCpp);
                     resolve(MxCpp);
-                    _context.next = 27;
+                    _context.next = 28;
                     break;
-                  case 24:
-                    _context.prev = 24;
+                  case 25:
+                    _context.prev = 25;
                     _context.t0 = _context["catch"](0);
                     reject(_context.t0);
-                  case 27:
+                  case 28:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 24]]);
+              }, _callee, null, [[0, 25]]);
             }));
             return function (_x2, _x3) {
               return _ref.apply(this, arguments);
             };
           }()));
-        case 6:
+        case 7:
         case "end":
           return _context2.stop();
       }
@@ -37150,9 +36785,9 @@ var createMxDraw = function createMxDraw(canvas, middlePan, map, webgl1, mxcadob
           }
           mxDraw.addEvent("initObject", function () {
             if (mxDraw.isWebgl2()) {
-              console.log("MxTip: use webgl2");
+              console.log("mx: use webgl2");
             } else {
-              console.log("MxTip: use webgl1");
+              console.log("mx: use webgl1");
             }
             resolve(mxDraw);
           });
@@ -37178,7 +36813,7 @@ function Mx_About() {
 }
 var createMxCad = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee(config, mxcadobj) {
-    var _ref2, openParameter, networkFonts, fontspath, locateFile, wasmBinary, canvas, onOpenFileComplete, fileUrl, onInit, middlePan, registdata, registfile, authorized_service, viewBackgroundColor, map, multipleSelect, enableUndo, enableIntelliSelect, browse, webgl1, mxDraw, THREE, size, mxCadObj, iCodeVersion, registfileurl, regdataobj, sMxId, win, agent, fetchAttributes;
+    var _ref2, wasmx64, openParameter, networkFonts, fontspath, locateFile, wasmBinary, canvas, onOpenFileComplete, fileUrl, onInit, middlePan, registdata, registfile, authorized_service, viewBackgroundColor, map, multipleSelect, enableUndo, enableIntelliSelect, browse, webgl1, mxDraw, THREE, size, mxCadObj, iCodeVersion, registfileurl, regdataobj, sMxId, win, agent, fetchAttributes;
     return regenerator.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -37189,11 +36824,11 @@ var createMxCad = /*#__PURE__*/function () {
           _context.next = 3;
           return loadCoreCode();
         case 3:
-          _ref2 = config || {}, openParameter = _ref2.openParameter, networkFonts = _ref2.networkFonts, fontspath = _ref2.fontspath, locateFile = _ref2.locateFile, wasmBinary = _ref2.wasmBinary, canvas = _ref2.canvas, onOpenFileComplete = _ref2.onOpenFileComplete, fileUrl = _ref2.fileUrl, onInit = _ref2.onInit, middlePan = _ref2.middlePan, registdata = _ref2.registdata, registfile = _ref2.registfile, authorized_service = _ref2.authorized_service, viewBackgroundColor = _ref2.viewBackgroundColor, map = _ref2.map, multipleSelect = _ref2.multipleSelect, enableUndo = _ref2.enableUndo, enableIntelliSelect = _ref2.enableIntelliSelect, browse = _ref2.browse, webgl1 = _ref2.webgl1;
+          _ref2 = config || {}, wasmx64 = _ref2.wasmx64, openParameter = _ref2.openParameter, networkFonts = _ref2.networkFonts, fontspath = _ref2.fontspath, locateFile = _ref2.locateFile, wasmBinary = _ref2.wasmBinary, canvas = _ref2.canvas, onOpenFileComplete = _ref2.onOpenFileComplete, fileUrl = _ref2.fileUrl, onInit = _ref2.onInit, middlePan = _ref2.middlePan, registdata = _ref2.registdata, registfile = _ref2.registfile, authorized_service = _ref2.authorized_service, viewBackgroundColor = _ref2.viewBackgroundColor, map = _ref2.map, multipleSelect = _ref2.multipleSelect, enableUndo = _ref2.enableUndo, enableIntelliSelect = _ref2.enableIntelliSelect, browse = _ref2.browse, webgl1 = _ref2.webgl1;
           _context.next = 6;
           return loadMxCADassembly(function () {
             return void 0;
-          }, locateFile, wasmBinary, fontspath, networkFonts, mxcadobj);
+          }, locateFile, wasmBinary, fontspath, networkFonts, mxcadobj, wasmx64);
         case 6:
           MxFun.initMxCpp(MxCpp);
           MxCADUtility.init();
@@ -37272,7 +36907,7 @@ var createMxCad = /*#__PURE__*/function () {
             if (authorized_service) {
               mxCadObj.iniAuthorizedService(authorized_service);
             }
-            console.log("MxTip:empty regist data");
+            console.log("mx:empty regist data");
           }
         case 36:
           if (!(iCodeVersion == 3)) {
@@ -38861,12 +38496,12 @@ function _drawPolyLine() {
           window.addEventListener("keydown", onKeydown);
           window.addEventListener("keyup", onkeyup);
           _loop = /*#__PURE__*/regenerator.mark(function _loop() {
-            var sPrompt, sKeyWord, getNextPoint, drawData, ptNext, nextData, pPolyline, getWidth, dWVal, _getWidth, _dWVal, _vecData, vet, pt, _pt, endPoint, length, nextPoint, _nextData, _pPolyline, _sPrompt, _sKeyWord, _getNextPoint, vecArcTangent, iSzie, pt1, dBluge, pt2, tmpPl, tmpVec, userDrawFristData, _ptNext, _nextData2, iSize, _pPolyline2, getAngle, angle, startPoint, getBulge, _pt2, center, radius, _endPoint, nextData2, iSize2, _pPolyline3, getDist, _radius, oppositeSide, _pt3, _endPoint2, _nextData3, _iSize, _pPolyline4, _nextData4, _iSize2, _pPolyline5, _center, _startPoint, _radius2, _pt4, _getAngle, angle2, angleA, mVet, eVet, midPoint2, endPoint2, dBulge2, _nextData5, _iSize3, _pPolyline6, _getDist, dist, includedAngle, vet2, _midPoint, _endPoint3, _dBulge, _nextData6, _iSize4, _pPolyline7, _endPoint4, _angle, midPt, _vet, midPoint, dBulge, _nextData7, _iSize5, _pPolyline8, getRadius, dRVal, _startPoint2, _pt5, _getAngle2, _angle2, chordLength, _pt6, _vet2, entPoint, center2, _midPoint2, _dBulge2, _nextData8, _iSize6, _pPolyline9, _dist, _angle3, _center2, _midPoint3, _dBulge3, _nextData9, _iSize7, _pPolyline0, _getWidth2, _dWVal2, val, vecArcTangent2, _pt7, _nextData0, _iSize8, _pPolyline1, _pt8, getSecondPoint, _pt9, getThirdPoint, _nextPoint, _midPoint4, arc, retBulge, _nextData1, _iSize9, _pPolyline10, _getWidth3, _dWVal3;
+            var sPrompt, sKeyWord, getNextPoint, drawData, ptNext, nextData, pPolyline, lastPointBak, getWidth, dWVal, _getWidth, _dWVal, _vecData, vet, pt, _pt, endPoint, length, nextPoint, _nextData, _pPolyline, _sPrompt, _sKeyWord, _getNextPoint, vecArcTangent, iSzie, pt1, dBluge, pt2, tmpPl, tmpVec, userDrawFristData, _ptNext, _nextData2, iSize, _pPolyline2, getAngle, angle, startPoint, getBulge, _pt2, center, radius, _endPoint, nextData2, iSize2, _pPolyline3, getDist, _radius, oppositeSide, _pt3, _endPoint2, _nextData3, _iSize, _pPolyline4, _nextData4, _iSize2, _pPolyline5, _center, _startPoint, _radius2, _pt4, _getAngle, angle2, angleA, mVet, eVet, midPoint2, endPoint2, dBulge2, _nextData5, _iSize3, _pPolyline6, _getDist, dist, includedAngle, vet2, _midPoint, _endPoint3, _dBulge, _nextData6, _iSize4, _pPolyline7, _endPoint4, _angle, midPt, _vet, midPoint, dBulge, _nextData7, _iSize5, _pPolyline8, getRadius, dRVal, _startPoint2, _pt5, _getAngle2, _angle2, chordLength, _pt6, _vet2, entPoint, center2, _midPoint2, _dBulge2, _nextData8, _iSize6, _pPolyline9, _dist, _angle3, _center2, _midPoint3, _dBulge3, _nextData9, _iSize7, _pPolyline0, _getWidth2, _dWVal2, val, vecArcTangent2, _pt7, _nextData0, _iSize8, _pPolyline1, _pt8, getSecondPoint, _pt9, getThirdPoint, _nextPoint, _midPoint4, arc, retBulge, _nextData1, _iSize9, _pPolyline10, _lastPointBak, _getWidth3, _dWVal3;
             return regenerator.wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!isDrawLine) {
-                    _context.next = 107;
+                    _context.next = 109;
                     break;
                   }
                   sPrompt = _ML_String("ID_ARX_PL2", "\u6307\u5B9A\u4E0B\u4E00\u4E2A\u70B9:");
@@ -38910,11 +38545,11 @@ function _drawPolyLine() {
                     pPolyline.addVertexAt(vecData[vecData.length - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(pPolyline));
                   }
-                  _context.next = 105;
+                  _context.next = 107;
                   break;
                 case 22:
                   if (!(getNextPoint.getStatus() == MrxDbgUiPrBaseReturn.kKeyWord)) {
-                    _context.next = 104;
+                    _context.next = 106;
                     break;
                   }
                   if (!getNextPoint.isKeyWordPicked("A")) {
@@ -38922,90 +38557,92 @@ function _drawPolyLine() {
                     break;
                   }
                   isDrawLine = false;
-                  _context.next = 102;
+                  _context.next = 104;
                   break;
                 case 27:
                   if (!getNextPoint.isKeyWordPicked("W")) {
-                    _context.next = 49;
+                    _context.next = 51;
                     break;
                   }
+                  lastPointBak = getNextPoint.getLastInputPoint();
                   getWidth = new MxCADUiPrDist();
                   getWidth.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u5BBD\u5EA6"));
-                  _context.next = 32;
+                  _context.next = 33;
                   return getWidth.go();
-                case 32:
+                case 33:
                   dWVal = _context.sent;
                   if (!(dWVal === null)) {
-                    _context.next = 35;
+                    _context.next = 36;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 35:
+                case 36:
                   dStartWidth = getWidth.value();
                   getWidth.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u5BBD\u5EA6"));
-                  _context.next = 39;
+                  _context.next = 40;
                   return getWidth.go();
-                case 39:
+                case 40:
                   dWVal = _context.sent;
                   if (!(dWVal === null)) {
-                    _context.next = 42;
+                    _context.next = 43;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 42:
+                case 43:
                   dEndWidth = getWidth.value();
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 102;
+                  getNextPoint.setLastInputPoint(lastPointBak);
+                  _context.next = 104;
                   break;
-                case 49:
+                case 51:
                   if (!getNextPoint.isKeyWordPicked("H")) {
-                    _context.next = 71;
+                    _context.next = 73;
                     break;
                   }
                   _getWidth = new MxCADUiPrDist();
                   _getWidth.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u534A\u5BBD"));
-                  _context.next = 54;
+                  _context.next = 56;
                   return _getWidth.go();
-                case 54:
+                case 56:
                   _dWVal = _context.sent;
                   if (!(_dWVal === null)) {
-                    _context.next = 57;
+                    _context.next = 59;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 57:
+                case 59:
                   dStartWidth = _getWidth.value() * 2;
                   _getWidth.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u534A\u5BBD"));
-                  _context.next = 61;
+                  _context.next = 63;
                   return _getWidth.go();
-                case 61:
+                case 63:
                   _dWVal = _context.sent;
                   if (!(_dWVal === null)) {
-                    _context.next = 64;
+                    _context.next = 66;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 64:
+                case 66:
                   dEndWidth = _getWidth.value() * 2;
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 102;
+                  _context.next = 104;
                   break;
-                case 71:
+                case 73:
                   if (!getNextPoint.isKeyWordPicked("C")) {
-                    _context.next = 76;
+                    _context.next = 78;
                     break;
                   }
                   isClose = true;
                   return _context.abrupt("return", 0);
-                case 76:
+                case 78:
                   if (!getNextPoint.isKeyWordPicked("U")) {
-                    _context.next = 80;
+                    _context.next = 82;
                     break;
                   }
                   if (vecData.length > 1) {
@@ -39016,28 +38653,28 @@ function _drawPolyLine() {
                       getNextPoint.setLastInputPoint(vecData[vecData.length - 1].pt);
                     }
                   }
-                  _context.next = 102;
+                  _context.next = 104;
                   break;
-                case 80:
+                case 82:
                   if (!getNextPoint.isKeyWordPicked("L")) {
-                    _context.next = 102;
+                    _context.next = 104;
                     break;
                   }
                   vet = McGeVector3d.kXAxis;
                   getNextPoint.setMessage("\u6307\u5B9A\u76F4\u7EBF\u957F\u5EA6");
                   getNextPoint.setKeyWords("");
-                  _context.next = 86;
+                  _context.next = 88;
                   return getNextPoint.go();
-                case 86:
+                case 88:
                   _pt = _context.sent;
                   if (_pt) {
-                    _context.next = 89;
+                    _context.next = 91;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 89:
+                case 91:
                   endPoint = vecData[vecData.length - 1].pt;
                   length = _pt.distanceTo(endPoint);
                   nextPoint = (_vecData = vecData[vecData.length - 2]) === null || _vecData === void 0 ? void 0 : _vecData.pt;
@@ -39058,15 +38695,15 @@ function _drawPolyLine() {
                     _pPolyline.addVertexAt(vecData[vecData.length - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline));
                   }
-                case 102:
-                  _context.next = 105;
-                  break;
                 case 104:
-                  return _context.abrupt("return", 0);
-                case 105:
-                  _context.next = 495;
+                  _context.next = 107;
                   break;
+                case 106:
+                  return _context.abrupt("return", 0);
                 case 107:
+                  _context.next = 499;
+                  break;
+                case 109:
                   _sPrompt = _ML_String("NO1_ID_ARX_PL5", "\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
                   _sKeyWord = "[\u89D2\u5EA6(A)/\u7B2C\u4E8C\u4E2A\u70B9(S)/\u5706\u5FC3(CE)/\u65B9\u5411(D)/\u76F4\u7EBF(L)/\u534A\u5F84(R)/\u5BBD\u5EA6(W)/\u534A\u5BBD(H)]";
                   if (vecData.length >= 3) {
@@ -39111,12 +38748,12 @@ function _drawPolyLine() {
                     pl.addVertexAt(currendPoint);
                     pWorldDraw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 119;
+                  _context.next = 121;
                   return _getNextPoint.go();
-                case 119:
+                case 121:
                   _ptNext = _context.sent;
                   if (!(_ptNext !== null)) {
-                    _context.next = 132;
+                    _context.next = 134;
                     break;
                   }
                   _nextData2 = {};
@@ -39133,30 +38770,30 @@ function _drawPolyLine() {
                     _pPolyline2.addVertexAt(vecData[iSize - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline2));
                   }
-                  _context.next = 495;
+                  _context.next = 499;
                   break;
-                case 132:
+                case 134:
                   if (!(_getNextPoint.getStatus() == MrxDbgUiPrBaseReturn.kKeyWord)) {
-                    _context.next = 494;
+                    _context.next = 498;
                     break;
                   }
                   if (!_getNextPoint.isKeyWordPicked("A")) {
-                    _context.next = 215;
+                    _context.next = 217;
                     break;
                   }
                   getAngle = new MxCADUiPrAngle();
                   getAngle.setBasePt(userDrawFristData.pt);
                   getAngle.setMessage(_ML_String("ID_ARX_PLGET_I_ANGLE", "\u6307\u5B9A\u5939\u89D2"));
-                  _context.next = 139;
+                  _context.next = 141;
                   return getAngle.go();
-                case 139:
+                case 141:
                   angle = _context.sent;
                   if (!(angle === null)) {
-                    _context.next = 142;
+                    _context.next = 144;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 142:
+                case 144:
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
                   _getNextPoint.setKeyWords("[\u5706\u5FC3(CE)/\u534A\u5F84(R)]");
                   _getNextPoint.setLastInputPoint(userDrawFristData.pt);
@@ -39178,12 +38815,12 @@ function _drawPolyLine() {
                     pl.addVertexAt(currendPoint);
                     pWorldDraw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 150;
+                  _context.next = 152;
                   return _getNextPoint.go();
-                case 150:
+                case 152:
                   _pt2 = _context.sent;
                   if (!_getNextPoint.isKeyWordPicked("CE")) {
-                    _context.next = 174;
+                    _context.next = 176;
                     break;
                   }
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3");
@@ -39198,16 +38835,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 158;
+                  _context.next = 160;
                   return _getNextPoint.go();
-                case 158:
+                case 160:
                   center = _context.sent;
                   if (center) {
-                    _context.next = 161;
+                    _context.next = 163;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 161:
+                case 163:
                   radius = center.distanceTo(startPoint);
                   _endPoint = center.addvec(center.sub(startPoint).rotateBy(angle).normalize().mult(radius));
                   nextData2 = {};
@@ -39226,24 +38863,24 @@ function _drawPolyLine() {
                   }
                   _getNextPoint.setLastInputPoint(_endPoint);
                   return _context.abrupt("return", 1);
-                case 174:
+                case 176:
                   if (!_getNextPoint.isKeyWordPicked("R")) {
-                    _context.next = 204;
+                    _context.next = 206;
                     break;
                   }
                   getDist = new MxCADUiPrDist();
                   getDist.setMessage("\u6307\u5B9A\u5706\u5F27\u534A\u5F84");
                   getDist.setKeyWords("");
-                  _context.next = 180;
+                  _context.next = 182;
                   return getDist.go();
-                case 180:
+                case 182:
                   _radius = _context.sent;
                   if (!(typeof _radius !== "number")) {
-                    _context.next = 183;
+                    _context.next = 185;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 183:
+                case 185:
                   oppositeSide = _radius * Math.sin(angle / 2);
                   _getNextPoint.setBasePt(startPoint);
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5F26\u65B9\u5411(\u6309\u4F4FCtrl\u952E\u5207\u6362\u65B9\u5411)");
@@ -39256,16 +38893,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 190;
+                  _context.next = 192;
                   return _getNextPoint.go();
-                case 190:
+                case 192:
                   _pt3 = _context.sent;
                   if (_pt3) {
-                    _context.next = 193;
+                    _context.next = 195;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 193:
+                case 195:
                   _endPoint2 = startPoint.clone().addvec(_pt3.sub(startPoint).normalize().mult(oppositeSide * 2));
                   _nextData3 = {};
                   _nextData3.dStartWidth = dStartWidth;
@@ -39282,13 +38919,13 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline4));
                   }
                   return _context.abrupt("return", 1);
-                case 204:
+                case 206:
                   if (_pt2) {
-                    _context.next = 206;
+                    _context.next = 208;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 206:
+                case 208:
                   _nextData4 = {};
                   _nextData4.dStartWidth = dStartWidth;
                   _nextData4.dEndWidth = dEndWidth;
@@ -39303,26 +38940,26 @@ function _drawPolyLine() {
                     _pPolyline5.addVertexAt(vecData[_iSize2 - 1].pt);
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline5));
                   }
-                case 215:
+                case 217:
                   if (!_getNextPoint.isKeyWordPicked("CE")) {
-                    _context.next = 311;
+                    _context.next = 313;
                     break;
                   }
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5706\u5FC3");
                   _getNextPoint.setKeyWords("");
                   _getNextPoint.setUserDraw(function () {});
-                  _context.next = 221;
+                  _context.next = 223;
                   return _getNextPoint.go();
-                case 221:
+                case 223:
                   _center = _context.sent;
                   if (_center) {
-                    _context.next = 224;
+                    _context.next = 226;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 224:
+                case 226:
                   _startPoint = userDrawFristData.pt;
                   _radius2 = _center.distanceTo(_startPoint);
                   _getNextPoint.setLastInputPoint(_startPoint);
@@ -39342,12 +38979,12 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 233;
+                  _context.next = 235;
                   return _getNextPoint.go();
-                case 233:
+                case 235:
                   _pt4 = _context.sent;
                   if (!_getNextPoint.isKeyWordPicked("A")) {
-                    _context.next = 261;
+                    _context.next = 263;
                     break;
                   }
                   _getAngle = new MxCADUiPrAngle();
@@ -39367,16 +39004,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint3);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 242;
+                  _context.next = 244;
                   return _getAngle.go();
-                case 242:
+                case 244:
                   angle2 = _context.sent;
                   if (!(angle2 === null)) {
-                    _context.next = 245;
+                    _context.next = 247;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 245:
+                case 247:
                   angleA = isCtrl ? Math.PI * 2 - angle2 / 2 : angle2 / 2;
                   mVet = _startPoint.sub(_center).rotateBy(angleA).normalize().mult(_radius2);
                   eVet = _startPoint.sub(_center).rotateBy(angle2).normalize().mult(_radius2);
@@ -39398,9 +39035,9 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline6));
                   }
                   return _context.abrupt("return", 1);
-                case 261:
+                case 263:
                   if (!_getNextPoint.isKeyWordPicked("L")) {
-                    _context.next = 292;
+                    _context.next = 294;
                     break;
                   }
                   _getDist = new MxCADUiPrDist();
@@ -39420,24 +39057,24 @@ function _drawPolyLine() {
                     pl.addVertexAt(endPoint3);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 269;
+                  _context.next = 271;
                   return _getDist.go();
-                case 269:
+                case 271:
                   dist = _context.sent;
                   if (!(typeof dist !== "number")) {
-                    _context.next = 272;
+                    _context.next = 274;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 272:
+                case 274:
                   if (!(dist > _radius2 * 2)) {
-                    _context.next = 276;
+                    _context.next = 278;
                     break;
                   }
                   MxFun.acutPrintf("*\u5F26\u957F\u4E0D\u80FD\u5927\u4E8E\u76F4\u5F84 \u65E0\u6548*");
                   _getNextPoint.setLastInputPoint(_startPoint);
                   return _context.abrupt("return", 1);
-                case 276:
+                case 278:
                   includedAngle = Math.asin(dist / 2 / _radius2) * 2;
                   vet2 = _startPoint.sub(_center).normalize().mult(_radius2);
                   _midPoint = _center.clone().addvec(vet2.clone().rotateBy(isCtrl ? Math.PI - includedAngle / 2 : includedAngle / 2));
@@ -39459,15 +39096,15 @@ function _drawPolyLine() {
                   }
                   _getNextPoint.setLastInputPoint(_endPoint3);
                   return _context.abrupt("return", 1);
-                case 292:
+                case 294:
                   if (_pt4) {
-                    _context.next = 294;
+                    _context.next = 296;
                     break;
                   }
                   return _context.abrupt("return", {
                     v: void 0
                   });
-                case 294:
+                case 296:
                   _endPoint4 = _center.clone().addvec(_pt4.sub(_center).normalize().mult(_radius2));
                   _angle = _center.sub(_startPoint).angleTo2(_center.sub(_endPoint4), McGeVector3d.kZAxis);
                   midPt = new McGePoint3d((_startPoint.x + _endPoint4.x) / 2, (_startPoint.y + _endPoint4.y) / 2);
@@ -39490,24 +39127,24 @@ function _drawPolyLine() {
                   }
                   _getNextPoint.setLastInputPoint(_endPoint4);
                   return _context.abrupt("return", 1);
-                case 311:
+                case 313:
                   if (!_getNextPoint.isKeyWordPicked("R")) {
-                    _context.next = 383;
+                    _context.next = 385;
                     break;
                   }
                   getRadius = new MxCADUiPrDist();
                   getRadius.setMessage(_ML_String("ID_ARX_PLGETSTARTRADIUS", "\u6307\u5B9A\u5706\u5F27\u7684\u534A\u5F84"));
                   getRadius.setKeyWords("");
-                  _context.next = 317;
+                  _context.next = 319;
                   return getRadius.go();
-                case 317:
+                case 319:
                   dRVal = _context.sent;
                   if (!(dRVal === null)) {
-                    _context.next = 320;
+                    _context.next = 322;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 320:
+                case 322:
                   _startPoint2 = userDrawFristData.pt;
                   _getNextPoint.setLastInputPoint(_startPoint2);
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
@@ -39525,28 +39162,28 @@ function _drawPolyLine() {
                     pl.addVertexAt(pt2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 327;
+                  _context.next = 329;
                   return _getNextPoint.go();
-                case 327:
+                case 329:
                   _pt5 = _context.sent;
                   if (!_getNextPoint.isKeyWordPicked("A")) {
-                    _context.next = 363;
+                    _context.next = 365;
                     break;
                   }
                   _getAngle2 = new MxCADUiPrAngle();
                   _getAngle2.setMessage(_ML_String("ID_ARX_PLGET_I_ANGLE", "\u6307\u5B9A\u5939\u89D2"));
                   _getAngle2.setKeyWords("");
                   _getAngle2.setBasePt(_startPoint2);
-                  _context.next = 335;
+                  _context.next = 337;
                   return _getAngle2.go();
-                case 335:
+                case 337:
                   _angle2 = _context.sent;
                   if (!(typeof _angle2 !== "number")) {
-                    _context.next = 338;
+                    _context.next = 340;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 338:
+                case 340:
                   chordLength = Math.sin(_angle2 / 2) * dRVal * 2;
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u7684\u5F26\u65B9\u5411(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)");
                   _getNextPoint.setKeyWords("");
@@ -39563,16 +39200,16 @@ function _drawPolyLine() {
                     pl.addVertexAt(entPoint2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 345;
+                  _context.next = 347;
                   return _getNextPoint.go();
-                case 345:
+                case 347:
                   _pt6 = _context.sent;
                   if (_pt6) {
-                    _context.next = 348;
+                    _context.next = 350;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 348:
+                case 350:
                   _vet2 = _pt6.sub(_startPoint2).normalize();
                   entPoint = _startPoint2.clone().addvec(_vet2.clone().mult(chordLength));
                   center2 = entPoint.clone().addvec(_vet2.clone().negate().rotateBy(-(Math.PI / 2 - _angle2 / 2)).mult(dRVal));
@@ -39593,21 +39230,21 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline9));
                   }
                   return _context.abrupt("return", 1);
-                case 363:
+                case 365:
                   if (_pt5) {
-                    _context.next = 365;
+                    _context.next = 367;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 365:
+                case 367:
                   _dist = _pt5.distanceTo(_startPoint2);
                   if (!(_dist > dRVal * 2)) {
-                    _context.next = 369;
+                    _context.next = 371;
                     break;
                   }
                   MxFun.acutPrintf("\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9 *\u65E0\u6548*");
                   return _context.abrupt("return", 1);
-                case 369:
+                case 371:
                   _angle3 = Math.acos(_dist / 2 / dRVal);
                   _center2 = _startPoint2.clone().addvec(_pt5.sub(_startPoint2).rotateBy(_angle3).normalize().mult(dRVal));
                   _midPoint3 = _center2.clone().addvec(new McGePoint3d((_startPoint2.x + _pt5.x) / 2, (_startPoint2.y + _pt5.y) / 2).sub(_center2).normalize().mult(isCtrl ? -dRVal : dRVal));
@@ -39627,44 +39264,44 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline0));
                   }
                   return _context.abrupt("return", 1);
-                case 383:
+                case 385:
                   if (!_getNextPoint.isKeyWordPicked("H")) {
-                    _context.next = 404;
+                    _context.next = 406;
                     break;
                   }
                   _getWidth2 = new MxCADUiPrDist();
                   _getWidth2.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u534A\u5BBD"));
-                  _context.next = 388;
+                  _context.next = 390;
                   return _getWidth2.go();
-                case 388:
+                case 390:
                   _dWVal2 = _context.sent;
                   if (!(_dWVal2 === null)) {
-                    _context.next = 391;
+                    _context.next = 393;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 391:
+                case 393:
                   dStartWidth = _getWidth2.value() * 2;
                   _getWidth2.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u534A\u5BBD"));
-                  _context.next = 395;
+                  _context.next = 397;
                   return _getWidth2.go();
-                case 395:
+                case 397:
                   _dWVal2 = _context.sent;
                   if (!(_dWVal2 === null)) {
-                    _context.next = 398;
+                    _context.next = 400;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 398:
+                case 400:
                   dEndWidth = _getWidth2.value() * 2;
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
                   return _context.abrupt("return", 1);
-                case 404:
+                case 406:
                   if (!_getNextPoint.isKeyWordPicked("D")) {
-                    _context.next = 433;
+                    _context.next = 435;
                     break;
                   }
                   _getNextPoint.setMessage("\u6307\u5B9A\u5706\u5F27\u8D77\u70B9\u5207\u5411");
@@ -39673,16 +39310,16 @@ function _drawPolyLine() {
                   _getNextPoint.setUserDraw(function (pt2, pw) {
                     pw.drawLine(pt2.toVector3(), userDrawFristData.pt.toVector3());
                   });
-                  _context.next = 411;
+                  _context.next = 413;
                   return _getNextPoint.go();
-                case 411:
+                case 413:
                   val = _context.sent;
                   if (val) {
-                    _context.next = 414;
+                    _context.next = 416;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 414:
+                case 416:
                   vecArcTangent2 = val.sub(userDrawFristData.pt);
                   _getNextPoint.setLastInputPoint(userDrawFristData.pt);
                   _getNextPoint.setBasePt(userDrawFristData.pt);
@@ -39695,9 +39332,9 @@ function _drawPolyLine() {
                     pl.addVertexAt(pt2);
                     pw.drawMcDbEntity(pl, true);
                   });
-                  _context.next = 422;
+                  _context.next = 424;
                   return _getNextPoint.go();
-                case 422:
+                case 424:
                   _pt7 = _context.sent;
                   _nextData0 = {};
                   _nextData0.dStartWidth = dStartWidth;
@@ -39714,33 +39351,33 @@ function _drawPolyLine() {
                     vecTmpObjectId.push(mxcad.drawEntity(_pPolyline1));
                   }
                   return _context.abrupt("return", 1);
-                case 433:
+                case 435:
                   if (!_getNextPoint.isKeyWordPicked("L")) {
-                    _context.next = 437;
+                    _context.next = 439;
                     break;
                   }
                   isDrawLine = true;
-                  _context.next = 492;
+                  _context.next = 496;
                   break;
-                case 437:
+                case 439:
                   if (!_getNextPoint.isKeyWordPicked("S")) {
-                    _context.next = 463;
+                    _context.next = 465;
                     break;
                   }
                   _pt8 = new McGePoint3d(vecData[vecData.length - 1].pt.x, vecData[vecData.length - 1].pt.y, 0);
                   getSecondPoint = new MxCADUiPrPoint();
                   getSecondPoint.setMessage(_ML_String("NO1_ID_SPECIFY_ARC2", "\u6307\u5B9A\u5706\u5F27\u7684\u7B2C\u4E8C\u4E2A\u70B9"));
                   getSecondPoint.setBasePt(_pt8);
-                  _context.next = 444;
+                  _context.next = 446;
                   return getSecondPoint.go();
-                case 444:
+                case 446:
                   _pt9 = _context.sent;
                   if (!(_pt9 === null)) {
-                    _context.next = 447;
+                    _context.next = 449;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 447:
+                case 449:
                   getThirdPoint = new MxCADUiPrPoint();
                   getThirdPoint.setMessage(_ML_String("ID_CIRCULAR_ENDPOINT", "\u6307\u5B9A\u5706\u5F27\u7684\u7AEF\u70B9(\u6309\u4F4F Ctrl \u952E\u4EE5\u5207\u6362\u65B9\u5411)"));
                   getThirdPoint.setUserDraw(function (currendPoint, pWorldDraw) {
@@ -39753,12 +39390,12 @@ function _drawPolyLine() {
                     }
                     pWorldDraw.drawMcDbEntity(arc, true);
                   });
-                  _context.next = 452;
+                  _context.next = 454;
                   return getThirdPoint.go();
-                case 452:
+                case 454:
                   _nextPoint = _context.sent;
                   if (!(_nextPoint !== null)) {
-                    _context.next = 460;
+                    _context.next = 462;
                     break;
                   }
                   _midPoint4 = _pt9;
@@ -39786,58 +39423,60 @@ function _drawPolyLine() {
                   } else {
                     MxFun.acutPrintf(_ML_String("ID_ENDPOINT_INVALID1", "\n \u7AEF\u70B9 *\u65E0\u6548*"));
                   }
-                  _context.next = 461;
+                  _context.next = 463;
                   break;
-                case 460:
+                case 462:
                   return _context.abrupt("return", 0);
-                case 461:
-                  _context.next = 492;
-                  break;
                 case 463:
+                  _context.next = 496;
+                  break;
+                case 465:
                   if (!_getNextPoint.isKeyWordPicked("W")) {
-                    _context.next = 485;
+                    _context.next = 489;
                     break;
                   }
+                  _lastPointBak = _getNextPoint.getLastInputPoint();
                   _getWidth3 = new MxCADUiPrDist();
                   _getWidth3.setMessage(_ML_String("ID_ARX_PLGETSTARTWIDTH", "\u6307\u5B9A\u8D77\u70B9\u5BBD\u5EA6"));
-                  _context.next = 468;
+                  _context.next = 471;
                   return _getWidth3.go();
-                case 468:
+                case 471:
                   _dWVal3 = _context.sent;
                   if (!(_dWVal3 === null)) {
-                    _context.next = 471;
+                    _context.next = 474;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 471:
+                case 474:
                   dStartWidth = _getWidth3.value();
                   _getWidth3.setMessage(_ML_String("ID_ARX_PLGETVERITXWIDTH", "\u6307\u5B9A\u7AEF\u70B9\u5BBD\u5EA6"));
-                  _context.next = 475;
+                  _context.next = 478;
                   return _getWidth3.go();
-                case 475:
+                case 478:
                   _dWVal3 = _context.sent;
                   if (!(_dWVal3 === null)) {
-                    _context.next = 478;
+                    _context.next = 481;
                     break;
                   }
                   return _context.abrupt("return", 0);
-                case 478:
+                case 481:
                   dEndWidth = _getWidth3.value();
                   s_dWidth = dEndWidth;
                   vecData[vecData.length - 1].dStartWidth = dStartWidth;
                   vecData[vecData.length - 1].dEndWidth = dEndWidth;
                   dStartWidth = dEndWidth;
-                  _context.next = 492;
+                  _getNextPoint.setLastInputPoint(_lastPointBak);
+                  _context.next = 496;
                   break;
-                case 485:
+                case 489:
                   if (!_getNextPoint.isKeyWordPicked("C")) {
-                    _context.next = 491;
+                    _context.next = 495;
                     break;
                   }
                   vecData[vecData.length - 1].dBulge = CMxDrawPolylineDragArcDraw_CalcArcBulge(userDrawFristData.pt, firstPoint, isCtrl ? vecArcTangent.clone().negate() : vecArcTangent);
                   isClose = true;
                   return _context.abrupt("return", 0);
-                case 491:
+                case 495:
                   if (_getNextPoint.isKeyWordPicked("U")) {
                     if (vecData.length > 1) {
                       vecData.pop();
@@ -39848,12 +39487,12 @@ function _drawPolyLine() {
                       }
                     }
                   }
-                case 492:
-                  _context.next = 495;
+                case 496:
+                  _context.next = 499;
                   break;
-                case 494:
+                case 498:
                   return _context.abrupt("return", 0);
-                case 495:
+                case 499:
                 case "end":
                   return _context.stop();
               }
@@ -45328,7 +44967,7 @@ function Mx_Trim() {
 }
 function _Mx_Trim() {
   _Mx_Trim = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee16() {
-    var filterInit, getPoint, ss, aryId, aryIdLong, mxcadTrimAssert, filter, isWindowSelect, _loop8, _ret8;
+    var filterInit, getPoint, ss, aryId, mxcadTrimAssert, filter, isWindowSelect, _loop8, _ret8;
     return regenerator.wrap(function _callee16$(_context24) {
       while (1) switch (_context24.prev = _context24.next) {
         case 0:
@@ -45366,15 +45005,13 @@ function _Mx_Trim() {
           }
           return _context24.abrupt("return");
         case 12:
-          aryIdLong = new McGeLongArray();
-          aryIdLong.copyFormAryId(aryId);
           mxcadTrimAssert = new MxCpp.mxcadassemblyimp.MxDrawTrimAssist();
-          if (mxcadTrimAssert.Init(aryIdLong.imp)) {
-            _context24.next = 17;
+          if (mxcadTrimAssert.Init(createMdGeLongLongArrayFormAryId(aryId))) {
+            _context24.next = 15;
             break;
           }
           return _context24.abrupt("return");
-        case 17:
+        case 15:
           filter = new MxCADResbuf();
           filter.AddMcDbEntityTypes("LINE,LWPOLYLINE,ELLIPSE,ARC,CIRCLE,SPLINE,XLINE");
           isWindowSelect = true;
@@ -45440,35 +45077,34 @@ function _Mx_Trim() {
                   return _context23.abrupt("return", 1);
                 case 26:
                   selPoint = ss2.getSelectPoint();
-                  aryIdLong.copyFormAryId(ids);
-                  mxcadTrimAssert.DoTrim(aryIdLong.imp, selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y);
-                case 29:
+                  mxcadTrimAssert.DoTrim(createMdGeLongLongArrayFormAryId(ids), selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y);
+                case 28:
                 case "end":
                   return _context23.stop();
               }
             }, _loop8);
           });
+        case 19:
+          return _context24.delegateYield(_loop8(), "t0", 21);
         case 21:
-          return _context24.delegateYield(_loop8(), "t0", 23);
-        case 23:
           _ret8 = _context24.t0;
           if (!(_ret8 === 0)) {
-            _context24.next = 26;
+            _context24.next = 24;
             break;
           }
-          return _context24.abrupt("break", 30);
-        case 26:
+          return _context24.abrupt("break", 28);
+        case 24:
           if (!(_ret8 === 1)) {
-            _context24.next = 28;
+            _context24.next = 26;
             break;
           }
-          return _context24.abrupt("continue", 21);
-        case 28:
-          _context24.next = 21;
+          return _context24.abrupt("continue", 19);
+        case 26:
+          _context24.next = 19;
           break;
-        case 30:
+        case 28:
           mxcadTrimAssert.UnInit();
-        case 31:
+        case 29:
         case "end":
           return _context24.stop();
       }
@@ -45481,7 +45117,7 @@ function Mx_Extend() {
 }
 function _Mx_Extend() {
   _Mx_Extend = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee17() {
-    var filter, isByWindow, getPoint, ss, isExtend, aryId, aryIdLong, mxcadExtendAssert, mxcadTrimAssert, cachings, isShiftKey2, onKeydown2, onkeyup, _loop9, _ret9;
+    var filter, isByWindow, getPoint, ss, isExtend, aryId, mxcadExtendAssert, mxcadTrimAssert, cachings, isShiftKey2, onKeydown2, onkeyup, _loop9, _ret9;
     return regenerator.wrap(function _callee17$(_context26) {
       while (1) switch (_context26.prev = _context26.next) {
         case 0:
@@ -45521,22 +45157,20 @@ function _Mx_Extend() {
           }
           return _context26.abrupt("return");
         case 15:
-          aryIdLong = new McGeLongArray();
-          aryIdLong.copyFormAryId(aryId);
           mxcadExtendAssert = new MxCpp.mxcadassemblyimp.MxDrawExtendAssist();
-          if (mxcadExtendAssert.Init(aryIdLong.imp)) {
-            _context26.next = 20;
+          if (mxcadExtendAssert.Init(createMdGeLongLongArrayFormAryId(aryId))) {
+            _context26.next = 18;
             break;
           }
           return _context26.abrupt("return");
-        case 20:
+        case 18:
           mxcadTrimAssert = new MxCpp.mxcadassemblyimp.MxDrawTrimAssist();
-          if (mxcadTrimAssert.Init(aryIdLong.imp)) {
-            _context26.next = 23;
+          if (mxcadTrimAssert.Init(createMdGeLongLongArrayFormAryId(aryId))) {
+            _context26.next = 21;
             break;
           }
           return _context26.abrupt("return");
-        case 23:
+        case 21:
           cachings = [];
           isShiftKey2 = false;
           onKeydown2 = function onKeydown2(e) {
@@ -45594,8 +45228,7 @@ function _Mx_Extend() {
                     var intersectPoints = ent.IntersectWith(pl, McDb.Intersect.kOnBothOperands);
                     if (intersectPoints.isEmpty()) return;
                     intersectPoints.forEach(function (point) {
-                      aryIdLong.copyFormAryId([objId]);
-                      isShiftKey2 ? mxcadTrimAssert.DoTrim(aryIdLong.imp, point.x, point.y, point.x, point.y) : mxcadExtendAssert.DoExtend(aryIdLong.imp, point.x, point.y, point.x, point.y);
+                      isShiftKey2 ? mxcadTrimAssert.DoTrim(createMdGeLongLongArrayFormAryId([objId]), point.x, point.y, point.x, point.y) : mxcadExtendAssert.DoExtend(createMdGeLongLongArrayFormAryId([objId]), point.x, point.y, point.x, point.y);
                     });
                   });
                   return _context25.abrupt("return", 1);
@@ -45693,8 +45326,7 @@ function _Mx_Extend() {
                     var intersectPoints = ent.IntersectWith(_pl, McDb.Intersect.kOnBothOperands);
                     if (intersectPoints.isEmpty()) return;
                     intersectPoints.forEach(function (point) {
-                      aryIdLong.copyFormAryId([objId]);
-                      isShiftKey2 ? mxcadTrimAssert.DoTrim(aryIdLong.imp, point.x, point.y, point.x, point.y) : mxcadExtendAssert.DoExtend(aryIdLong.imp, point.x, point.y, point.x, point.y);
+                      isShiftKey2 ? mxcadTrimAssert.DoTrim(createMdGeLongLongArrayFormAryId([objId]), point.x, point.y, point.x, point.y) : mxcadExtendAssert.DoExtend(createMdGeLongLongArrayFormAryId([objId]), point.x, point.y, point.x, point.y);
                     });
                   });
                   return _context25.abrupt("return", 1);
@@ -45702,44 +45334,43 @@ function _Mx_Extend() {
                   cachings.push([ids, aryId.map(function (id) {
                     return id.clone();
                   })]);
-                  aryIdLong.copyFormAryId(ids);
-                  isShiftKey2 ? mxcadTrimAssert.DoTrim(aryIdLong.imp, selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y) : mxcadExtendAssert.DoExtend(aryIdLong.imp, selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y);
-                case 64:
+                  isShiftKey2 ? mxcadTrimAssert.DoTrim(createMdGeLongLongArrayFormAryId(ids), selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y) : mxcadExtendAssert.DoExtend(createMdGeLongLongArrayFormAryId(ids), selPoint.pt1.x, selPoint.pt1.y, selPoint.pt2.x, selPoint.pt2.y);
+                case 63:
                 case "end":
                   return _context25.stop();
               }
             }, _loop9);
           });
+        case 28:
+          return _context26.delegateYield(_loop9(), "t0", 30);
         case 30:
-          return _context26.delegateYield(_loop9(), "t0", 32);
-        case 32:
           _ret9 = _context26.t0;
           if (!(_ret9 === 0)) {
-            _context26.next = 35;
+            _context26.next = 33;
             break;
           }
-          return _context26.abrupt("break", 41);
-        case 35:
+          return _context26.abrupt("break", 39);
+        case 33:
           if (!(_ret9 === 1)) {
-            _context26.next = 37;
+            _context26.next = 35;
             break;
           }
-          return _context26.abrupt("continue", 30);
-        case 37:
+          return _context26.abrupt("continue", 28);
+        case 35:
           if (!_ret9) {
-            _context26.next = 39;
+            _context26.next = 37;
             break;
           }
           return _context26.abrupt("return", _ret9.v);
-        case 39:
-          _context26.next = 30;
+        case 37:
+          _context26.next = 28;
           break;
-        case 41:
+        case 39:
           window.removeEventListener("keydown", onKeydown2);
           window.removeEventListener("keyup", onkeyup);
           mxcadTrimAssert.UnInit();
           mxcadExtendAssert.UnInit();
-        case 45:
+        case 43:
         case "end":
           return _context26.stop();
       }
@@ -45752,7 +45383,7 @@ function Mx_Explode() {
 }
 function _Mx_Explode() {
   _Mx_Explode = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee18() {
-    var filter, aryId, aryIdLong;
+    var filter, aryId;
     return regenerator.wrap(function _callee18$(_context27) {
       while (1) switch (_context27.prev = _context27.next) {
         case 0:
@@ -45768,10 +45399,8 @@ function _Mx_Explode() {
           }
           return _context27.abrupt("return");
         case 7:
-          aryIdLong = new McGeLongArray();
-          aryIdLong.copyFormAryId(aryId);
-          MxCpp.App.MxCADAssist.MxExplode(aryIdLong.imp);
-        case 10:
+          MxCpp.App.MxCADAssist.MxExplode(createMdGeLongLongArrayFormAryId(aryId));
+        case 8:
         case "end":
           return _context27.stop();
       }
@@ -45784,7 +45413,7 @@ function Mx_Join() {
 }
 function _Mx_Join() {
   _Mx_Join = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee19() {
-    var filter, aryId, aryIdLong;
+    var filter, aryId;
     return regenerator.wrap(function _callee19$(_context28) {
       while (1) switch (_context28.prev = _context28.next) {
         case 0:
@@ -45800,10 +45429,8 @@ function _Mx_Join() {
           }
           return _context28.abrupt("return");
         case 7:
-          aryIdLong = new McGeLongArray();
-          aryIdLong.copyFormAryId(aryId);
-          MxCpp.App.MxCADAssist.MxJoin(aryIdLong.imp);
-        case 10:
+          MxCpp.App.MxCADAssist.MxJoin(createMdGeLongLongArrayFormAryId(aryId));
+        case 8:
         case "end":
           return _context28.stop();
       }
@@ -46848,6 +46475,8 @@ var drawRectang = /*#__PURE__*/function () {
                     pWorldDraw.drawMcDbEntity(pl, true);
                   };
                   getPoint.setUserDraw(userDrawPoint1Rect);
+                  getPoint.setDisableOrthoTrace(true);
+                  getPoint.setDynamicInputType(DynamicInputType.kXYCoordInput);
                   run = /*#__PURE__*/function () {
                     var _ref3 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee2() {
                       var pt2CAD, userDrawPoint2Rect, getInt, _area, getKey, key, is2, rotationPoint, pt1, pt2, _is;
@@ -47058,16 +46687,16 @@ var drawRectang = /*#__PURE__*/function () {
                       return _ref3.apply(this, arguments);
                     };
                   }();
-                  _context3.next = 53;
+                  _context3.next = 55;
                   return run();
-                case 53:
+                case 55:
                   is = _context3.sent;
                   if (!(typeof is === "undefined")) {
-                    _context3.next = 56;
+                    _context3.next = 58;
                     break;
                   }
                   return _context3.abrupt("return", 1);
-                case 56:
+                case 58:
                 case "end":
                   return _context3.stop();
               }
@@ -47111,6 +46740,498 @@ MxFun.on("init", function () {
   MxFun.addCommand("Mx_Rectang", drawRectang);
 });
 
+function b64Encode(str) {
+  return btoa(unescape(encodeURIComponent(str)));
+}
+function b64Decode(str) {
+  return decodeURIComponent(escape(atob(str)));
+}
+function crateHexString(str) {
+  return Array.from(new TextEncoder().encode(str)).map(function (byte) {
+    return byte.toString(16).padStart(2, "0");
+  }).join("");
+}
+function saveAsFileDialog(_x) {
+  return _saveAsFileDialog.apply(this, arguments);
+}
+function _saveAsFileDialog() {
+  _saveAsFileDialog = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee3(_ref) {
+    var blob, _ref$filename, filename, _ref$types, types, _window$navigator, userActivation, handle, writable, blobWithTypeName, objectUrl, link;
+    return regenerator.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          blob = _ref.blob, _ref$filename = _ref.filename, filename = _ref$filename === void 0 ? "" : _ref$filename, _ref$types = _ref.types, types = _ref$types === void 0 ? [{
+            description: "mxweb File",
+            accept: {
+              "application/octet-stream": [".mxweb"]
+            }
+          }] : _ref$types;
+          if (blob) {
+            _context3.next = 4;
+            break;
+          }
+          console.error("Invalid blob provided");
+          return _context3.abrupt("return");
+        case 4:
+          _context3.prev = 4;
+          if (!(typeof window.showSaveFilePicker === "function")) {
+            _context3.next = 31;
+            break;
+          }
+          userActivation = (_window$navigator = window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userActivation;
+          if (!(userActivation !== null && userActivation !== void 0 && userActivation.isActive || userActivation !== null && userActivation !== void 0 && userActivation.hasBeenActive)) {
+            _context3.next = 30;
+            break;
+          }
+          _context3.prev = 8;
+          _context3.next = 11;
+          return window.showSaveFilePicker({
+            suggestedName: filename,
+            types: types
+          });
+        case 11:
+          handle = _context3.sent;
+          _context3.next = 14;
+          return handle.createWritable();
+        case 14:
+          writable = _context3.sent;
+          _context3.next = 17;
+          return writable.write(blob);
+        case 17:
+          _context3.next = 19;
+          return writable.close();
+        case 19:
+          return _context3.abrupt("return", handle);
+        case 22:
+          _context3.prev = 22;
+          _context3.t0 = _context3["catch"](8);
+          if (!(_context3.t0.name === "AbortError")) {
+            _context3.next = 27;
+            break;
+          }
+          console.log("\u7528\u6237\u53D6\u6D88\u6216\u6743\u9650\u88AB\u62D2");
+          return _context3.abrupt("return", false);
+        case 27:
+          if (_context3.t0.name === "AbortError" || _context3.t0.name === "NotAllowedError") {
+            console.warn("Save cancelled or not allowed:", _context3.t0.message);
+          } else {
+            console.error("showSaveFilePicker failed:", _context3.t0);
+          }
+        case 28:
+          _context3.next = 31;
+          break;
+        case 30:
+          console.warn("No user activation, skipping showSaveFilePicker");
+        case 31:
+          if (!(window.navigator.msSaveOrOpenBlob && typeof window.navigator.msSaveOrOpenBlob === "function")) {
+            _context3.next = 35;
+            break;
+          }
+          blobWithTypeName = blob.slice(0, blob.size, blob.type || "application/octet-stream");
+          window.navigator.msSaveOrOpenBlob(blobWithTypeName, filename);
+          return _context3.abrupt("return");
+        case 35:
+          objectUrl = window.URL.createObjectURL(blob);
+          link = document.createElement("a");
+          link.href = objectUrl;
+          link.download = filename;
+          link.style.display = "none";
+          document.body.appendChild(link);
+          link.click();
+          setTimeout(function () {
+            window.URL.revokeObjectURL(objectUrl);
+          }, 100);
+          document.body.removeChild(link);
+          return _context3.abrupt("return");
+        case 47:
+          _context3.prev = 47;
+          _context3.t1 = _context3["catch"](4);
+          console.error("File save failed:", _context3.t1.name, _context3.t1.message);
+        case 50:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[4, 47], [8, 22]]);
+  }));
+  return _saveAsFileDialog.apply(this, arguments);
+}
+function downloadFile(blob, filename) {
+  var link = document.createElement("a");
+  link.href = window.URL.createObjectURL(blob);
+  link.download = filename;
+  link.click();
+}
+function downloadFileFromUrl(url, filename) {
+  fetch(url).then(function (response) {
+    return response.blob();
+  }).then(function (blob) {
+    var link = document.createElement("a");
+    link.href = window.URL.createObjectURL(blob);
+    link.download = filename;
+    link.click();
+  });
+}
+var getJsonFromUrl = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee(url) {
+    return regenerator.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          _context.next = 3;
+          return fetch(url);
+        case 3:
+          _context.next = 5;
+          return _context.sent.json();
+        case 5:
+          return _context.abrupt("return", _context.sent);
+        case 8:
+          _context.prev = 8;
+          _context.t0 = _context["catch"](0);
+          console.error("mx:error getJsonFromurl:" + url);
+        case 11:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 8]]);
+  }));
+  return function getJsonFromUrl(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var getFileFromUrl = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/regenerator.mark(function _callee2(url) {
+    return regenerator.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return fetch(url);
+        case 3:
+          return _context2.abrupt("return", _context2.sent);
+        case 6:
+          _context2.prev = 6;
+          _context2.t0 = _context2["catch"](0);
+          console.error("mx:error getFileFromUrl:" + url);
+        case 9:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 6]]);
+  }));
+  return function getFileFromUrl(_x3) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+function _ML_String(strId, str) {
+  return MxFun.getLanguageString(strId, str);
+}
+function IsZero(val) {
+  return Math.abs(val) < 1e-7;
+}
+function postMemoryFile(memoryData, url, filename, retCall, param) {
+  try {
+    var formData = new FormData();
+    var blob = new Blob([memoryData], {
+      type: "application/octet-stream"
+    });
+    formData.append("file", new File([blob], filename));
+    if (param) formData.append("param", param);
+    var xhr = new XMLHttpRequest();
+    xhr.open("POST", url);
+    xhr.send(formData);
+    xhr.onreadystatechange = function () {
+      if (xhr.readyState === XMLHttpRequest.DONE) {
+        if (xhr.status === 200) {
+          retCall(0, xhr.responseText);
+        } else {
+          console.log(xhr.responseText);
+          retCall(4, "server error");
+        }
+      }
+    };
+  } catch (error) {
+    retCall(-1, "catch error");
+  }
+}
+function postEmscriptenIndexedDBFile(filekey, url, retCall, param) {
+  var request = window.indexedDB.open("emscripten_filesystem", 1);
+  request.onerror = function () {
+    retCall(1, "open emscripten_filesystem failed");
+  };
+  request.onsuccess = function (event) {
+    try {
+      if (event.target != null) {
+        var db = event.target.result;
+        var transaction = db.transaction("FILES", "readonly");
+        var objectStore = transaction.objectStore("FILES");
+        var request2 = objectStore.get(filekey);
+        request2.onerror = function () {
+          retCall(3, "get file error");
+        };
+        request2.onsuccess = function () {
+          var file = request2.result;
+          if (file) {
+            var formData = new FormData();
+            formData.append("file", file);
+            if (param) formData.append("param", param);
+            var xhr = new XMLHttpRequest();
+            xhr.open("POST", url);
+            xhr.send(formData);
+            xhr.onreadystatechange = function () {
+              if (xhr.readyState === XMLHttpRequest.DONE) {
+                if (xhr.status === 200) {
+                  retCall(0, xhr.responseText);
+                } else {
+                  console.log(xhr.responseText);
+                  retCall(4, "server error");
+                }
+              }
+            };
+          } else {
+            retCall(5, "get file data error");
+          }
+        };
+      } else {
+        retCall(2, "event.target == null");
+      }
+    } catch (error) {
+      retCall(-1, "catch error");
+    }
+  };
+}
+function createCursorHelp() {
+  var canvasSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 128;
+  var squareSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+  var isRoss = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var color = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "#ffffff";
+  var canvas = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : document.createElement("canvas");
+  var background = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : "transparent";
+  canvas.width = canvas.height = canvasSize;
+  canvas.style.background = background;
+  var ctx = canvas.getContext("2d");
+  var canvasDevil = canvasSize % 2 === 0 ? -0.5 : 0;
+  var squareDevil = squareSize % 2 === 0 ? -0.5 : 0;
+  ctx.strokeStyle = color;
+  ctx.lineWidth = 0;
+  ctx.imageSmoothingEnabled = false;
+  if (isRoss) {
+    ctx.beginPath();
+    ctx.moveTo(canvas.width / 2 + canvasDevil, canvasDevil);
+    ctx.lineTo(canvas.width / 2 + canvasDevil, canvas.height + canvasDevil);
+    ctx.stroke();
+    ctx.beginPath();
+    ctx.moveTo(canvasDevil, canvas.height / 2 + canvasDevil);
+    ctx.lineTo(canvas.width + canvasDevil, canvas.height / 2 + canvasDevil);
+    ctx.stroke();
+  }
+  ctx.beginPath();
+  ctx.strokeRect(canvasSize / 2 - squareSize / 2 + squareDevil, canvasSize / 2 - squareSize / 2 + squareDevil, squareSize, squareSize);
+  ctx.stroke();
+  return canvas.toDataURL("image/png");
+}
+function createCursor() {
+  var cursorSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 128;
+  var targetFrameSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+  var color = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "#ffffff";
+  return {
+    Rect: "url('".concat(createCursorHelp(cursorSize, targetFrameSize, false, color), "') ").concat(cursorSize / 2, " ").concat(cursorSize / 2, ", auto"),
+    Cross: "url('".concat(createCursorHelp(cursorSize, 0, true, color), "') ").concat(cursorSize / 2, " ").concat(cursorSize / 2, " , auto"),
+    Normal: "url('".concat(createCursorHelp(cursorSize, targetFrameSize, true, color), "') ").concat(cursorSize / 2, " ").concat(cursorSize / 2, ", auto"),
+    Pan: "grabbing"
+  };
+}
+function createMdGeLongLongArrayFormAryId(aryId) {
+  var ids_imp = new MxCpp.mxcadassemblyimp.MdGeLongLongArray();
+  aryId.forEach(function (val) {
+    ids_imp.append(val.id);
+  });
+  return ids_imp;
+}
+var MxTools = {
+  b64Encode: b64Encode,
+  b64Decode: b64Decode,
+  saveAsFileDialog: saveAsFileDialog,
+  downloadFile: downloadFile,
+  downloadFileFromUrl: downloadFileFromUrl,
+  getJsonFromUrl: getJsonFromUrl,
+  getFileFromUrl: getFileFromUrl,
+  _ML_String: _ML_String,
+  IsZero: IsZero,
+  postEmscriptenIndexedDBFile: postEmscriptenIndexedDBFile,
+  postMemoryFile: postMemoryFile,
+  createCursor: createCursor,
+  createMdGeLongLongArrayFormAryId: createMdGeLongLongArrayFormAryId
+};
+
+var MxCanvas2Image = /*#__PURE__*/function () {
+  function MxCanvas2Image() {
+    var in_document = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : void 0;
+    _classCallCheck$1(this, MxCanvas2Image);
+    _defineProperty(this, "$support", void 0);
+    _defineProperty(this, "downloadMime", "image/octet-stream");
+    _defineProperty(this, "mydocument", document);
+    if (in_document) this.mydocument = in_document;
+    this.$support = function () {
+      var canvas = in_document.createElement("canvas"),
+        ctx = canvas.getContext("2d");
+      return {
+        canvas: !!ctx,
+        imageData: !!ctx.getImageData,
+        dataURL: !!canvas.toDataURL,
+        btoa: !!window.btoa
+      };
+    }();
+  }
+  _createClass$1(MxCanvas2Image, [{
+    key: "scaleCanvas",
+    value: function scaleCanvas(canvas, width, height) {
+      var w = canvas.width,
+        h = canvas.height;
+      if (width == void 0) {
+        width = w;
+      }
+      if (height == void 0) {
+        height = h;
+      }
+      var retCanvas = this.mydocument.createElement("canvas");
+      var retCtx = retCanvas.getContext("2d");
+      retCanvas.width = width;
+      retCanvas.height = height;
+      retCtx.drawImage(canvas, 0, 0, w, h, 0, 0, width, height);
+      return retCanvas;
+    }
+  }, {
+    key: "getDataURL",
+    value: function getDataURL(canvas, type, width, height) {
+      canvas = this.scaleCanvas(canvas, width, height);
+      return canvas.toDataURL(type);
+    }
+  }, {
+    key: "saveFile",
+    value: function saveFile(strData) {
+      var link = this.mydocument.createElement("a");
+      link.href = strData;
+      link.download = "save.bmp";
+      link.click();
+    }
+  }, {
+    key: "genImage",
+    value: function genImage(strData) {
+      var img = this.mydocument.createElement("img");
+      img.src = strData;
+      return img;
+    }
+  }, {
+    key: "fixType",
+    value: function fixType(type) {
+      type = type.toLowerCase().replace(/jpg/i, "jpeg");
+      var r = type.match(/png|jpeg|bmp|gif/)[0];
+      return "image/" + r;
+    }
+  }, {
+    key: "encodeData",
+    value: function encodeData(data) {
+      if (!window.btoa) {
+        throw "btoa undefined";
+      }
+      var str = "";
+      if (typeof data == "string") {
+        str = data;
+      } else {
+        for (var i = 0; i < data.length; i++) {
+          str += String.fromCharCode(data[i]);
+        }
+      }
+      return btoa(str);
+    }
+  }, {
+    key: "getImageData",
+    value: function getImageData(canvas) {
+      var w = canvas.width,
+        h = canvas.height;
+      return canvas.getContext("2d").getImageData(0, 0, w, h);
+    }
+  }, {
+    key: "makeURI",
+    value: function makeURI(strData, type) {
+      return "data:" + type + ";base64," + strData;
+    }
+  }, {
+    key: "genBitmapImage",
+    value: function genBitmapImage(oData) {
+      var biWidth = oData.width;
+      var biHeight = oData.height;
+      var biSizeImage = biWidth * biHeight * 3;
+      var bfSize = biSizeImage + 54;
+      var BITMAPFILEHEADER = [66, 77, bfSize & 255, bfSize >> 8 & 255, bfSize >> 16 & 255, bfSize >> 24 & 255, 0, 0, 0, 0, 54, 0, 0, 0];
+      var BITMAPINFOHEADER = [40, 0, 0, 0, biWidth & 255, biWidth >> 8 & 255, biWidth >> 16 & 255, biWidth >> 24 & 255, biHeight & 255, biHeight >> 8 & 255, biHeight >> 16 & 255, biHeight >> 24 & 255, 1, 0, 24, 0, 0, 0, 0, 0, biSizeImage & 255, biSizeImage >> 8 & 255, biSizeImage >> 16 & 255, biSizeImage >> 24 & 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+      var iPadding = (4 - biWidth * 3 % 4) % 4;
+      var aImgData = oData.data;
+      var strPixelData = "";
+      var biWidth4 = biWidth << 2;
+      var y = biHeight;
+      var fromCharCode = String.fromCharCode;
+      do {
+        var iOffsetY = biWidth4 * (y - 1);
+        var strPixelRow = "";
+        for (var x = 0; x < biWidth; x++) {
+          var iOffsetX = x << 2;
+          strPixelRow += fromCharCode(aImgData[iOffsetY + iOffsetX + 2]) + fromCharCode(aImgData[iOffsetY + iOffsetX + 1]) + fromCharCode(aImgData[iOffsetY + iOffsetX]);
+        }
+        for (var c = 0; c < iPadding; c++) {
+          strPixelRow += String.fromCharCode(0);
+        }
+        strPixelData += strPixelRow;
+      } while (--y);
+      var strEncoded = this.encodeData(BITMAPFILEHEADER.concat(BITMAPINFOHEADER)) + this.encodeData(strPixelData);
+      return strEncoded;
+    }
+  }, {
+    key: "saveAsImage",
+    value: function saveAsImage(canvas, width, height, type) {
+      if (this.$support.canvas && this.$support.dataURL) {
+        if (typeof canvas == "string") {
+          canvas = this.mydocument.getElementById(canvas);
+        }
+        if (type == void 0) {
+          type = "png";
+        }
+        type = this.fixType(type);
+        if (/bmp/.test(type)) {
+          var data = this.getImageData(this.scaleCanvas(canvas, width, height));
+          var strData = this.genBitmapImage(data);
+          this.saveFile(this.makeURI(strData, this.downloadMime));
+        } else {
+          var _strData = this.getDataURL(canvas, type, width, height);
+          this.saveFile(_strData.replace(type, this.downloadMime));
+        }
+      }
+    }
+  }, {
+    key: "convertToImage",
+    value: function convertToImage(canvas, width, height, type) {
+      if (this.$support.canvas && this.$support.dataURL) {
+        if (typeof canvas == "string") {
+          canvas = this.mydocument.getElementById(canvas);
+        }
+        if (type == void 0) {
+          type = "png";
+        }
+        type = this.fixType(type);
+        if (/bmp/.test(type)) {
+          var data = this.getImageData(this.scaleCanvas(canvas, width, height));
+          var strData = this.genBitmapImage(data);
+          return this.genImage(this.makeURI(strData, "image/bmp"));
+        } else {
+          var _strData2 = this.getDataURL(canvas, type, width, height);
+          return this.genImage(_strData2);
+        }
+      }
+    }
+  }]);
+  return MxCanvas2Image;
+}();
+
 function _objectDestructuringEmpty(obj) {
   if (obj == null) throw new TypeError("Cannot destructure " + obj);
 }
@@ -104073,6 +104194,7 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 	postMemoryFile,
 	postEmscriptenIndexedDBFile,
 	createCursor,
+	createMdGeLongLongArrayFormAryId,
 	MxTools,
 	MxCanvas2Image,
 	McGePoint3d,
@@ -104212,4 +104334,4 @@ globalThis.Buffer = buffer$1.Buffer;
 globalThis.Buffer.alloc = buffer$1.Buffer.alloc;
 globalThis.Buffer.from = buffer$1.Buffer.from;
 
-export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, MLineJustificationType, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDiametricDimension, McDbDictionary, McDbDimStyleTable, McDbDimStyleTableRecord, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch$1 as McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMLine, McDbMText, McDbMxRegion, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRadialDimension, McDbRasterImage, McDbRasterImageDef, McDbRay, McDbRotatedDimension, McDbSpatialFilter, McDbSpline, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbViewport, McDbWipeout, McDbXline, McDbXlsxTable, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McObjectTempDraw, McRxObject, MxCADBaseCustomElement, MxCADBaseCustomText, MxCADCloneType, MxCADMText, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADTempForbiddenIntelliSelect, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrPointTransform, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCADWorldDrawType, MxCanvas2Image, MxCheckTheBrowser, MxCompare, MxCooperate, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxModifyColor, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTIFFLoader, MxTools, Mx_About, Mx_Erase, TableRenderDirection, _ML_String, b64Decode, b64Encode, crateHexString, createCursor, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };
+export { ColorIndexType, ColorMethod, DxfCode, FetchAttributes, IMcDbDwgFiler, IsZero, MLineJustificationType, McAppType, McCmColor, McDb, McDb2LineAngularDimension, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBackgroundEntity, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbCustomEntity, McDbDatabase, McDbDiametricDimension, McDbDictionary, McDbDimStyleTable, McDbDimStyleTableRecord, McDbDimension, McDbEllipse, McDbEntity, McDbGroup, McDbHatch$1 as McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMLine, McDbMText, McDbMxRegion, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRadialDimension, McDbRasterImage, McDbRasterImageDef, McDbRay, McDbRotatedDimension, McDbSpatialFilter, McDbSpline, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McDbViewport, McDbWipeout, McDbXline, McDbXlsxTable, McDbXrecord, McGeBound, McGeDoubleArray, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McObjectTempDraw, McRxObject, MxCADBaseCustomElement, MxCADBaseCustomText, MxCADCloneType, MxCADMText, MxCADPluginBase, MxCADPluginMapDefaultData, MxCADPluginSampleCode, MxCADResbuf, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADTempForbiddenIntelliSelect, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrPointTransform, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCADWorldDraw, MxCADWorldDrawType, MxCanvas2Image, MxCheckTheBrowser, MxCompare, MxCooperate, MxCoordConvert, MxCoordConvertType, MxCpp, MxCppType, MxMap, MxMapAddGoogleCnLayer, MxMapAddRasterTileLayer, MxModifyColor, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTIFFLoader, MxTools, Mx_About, Mx_Erase, TableRenderDirection, _ML_String, b64Decode, b64Encode, crateHexString, createCursor, createMcCmColor, createMdGeLongLongArrayFormAryId, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getJsonFromUrl, loadMxCADassembly, mx_gcj02_To_gps84, mx_gps84_To_gcj02, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };