mxcad 1.0.157 → 1.0.158

package/dist/mxcad.d.ts

@@ -25,6 +25,8 @@ export declare const getJsonFromUrl: (url: string) => Promise<any>;
 export declare const getFileFromUrl: (url: string) => Promise<Response | undefined>;
 export declare function _ML_String(strId: string, str: string): string;
 export declare function IsZero(val: number): boolean;
+export declare function postMemoryFile(memoryData: any, url: string, filename: string, retCall: (code: number, message: string) => void, param?: any): void;
+export declare function postEmscriptenIndexedDBFile(filekey: string, url: string, retCall: (code: number, message: string) => void, param?: any): void;
 export declare const MxTools: {
 	b64Encode: typeof b64Encode;
 	b64Decode: typeof b64Decode;
@@ -35,6 +37,8 @@ export declare const MxTools: {
 	getFileFromUrl: (url: string) => Promise<Response | undefined>;
 	_ML_String: typeof _ML_String;
 	IsZero: typeof IsZero;
+	postEmscriptenIndexedDBFile: typeof postEmscriptenIndexedDBFile;
+	postMemoryFile: typeof postMemoryFile;
 };
 /**
  * 表示一个 Rx 对象的基类。
@@ -2970,7 +2974,7 @@ export declare class McObject {
 	 * })
 	 * ```
 	 */
-	saveFileToUrl(sSaveProgramUrl: string, call: (iResult: number, sServerResult: string) => void): boolean;
+	saveFileToUrl(sSaveProgramUrl: string, call: (iResult: number, sServerResult: string) => void, filename?: string, param?: any): boolean;
 	/**
 	 * 保存文件
 	 * @param filename 另存为的新文件名称

package/dist/mxcad.es.js

@@ -582,6 +582,77 @@ function _ML_String(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");
+    }
+  };
+}
 var MxTools = {
   b64Encode: b64Encode,
   b64Decode: b64Decode,
@@ -591,7 +662,9 @@ var MxTools = {
   getJsonFromUrl: getJsonFromUrl,
   getFileFromUrl: getFileFromUrl,
   _ML_String: _ML_String,
-  IsZero: IsZero
+  IsZero: IsZero,
+  postEmscriptenIndexedDBFile: postEmscriptenIndexedDBFile,
+  postMemoryFile: postMemoryFile
 };
 
 function _classCallCheck(instance, Constructor) {
@@ -14065,7 +14138,7 @@ var MxG2312 = /*#__PURE__*/function () {
 }();
 var MxG2312Obj = new MxG2312();
 
-const version$1 = "1.0.157";
+const version$1 = "1.0.158";
 
 var isSharedArrayBuffer = ("SharedArrayBuffer" in window);
 var isCdn = document.currentScript && /unpkg\.com\/mxcad/.test(document.currentScript.src);
@@ -18640,12 +18713,22 @@ var McObject = /*#__PURE__*/function () {
     }
   }, {
     key: "saveFileToUrl",
-    value: function saveFileToUrl(sSaveProgramUrl, call) {
-      var win = window;
-      win.McDrawObjectEvent_saveFileComplete = function (sServerResult, iResult) {
-        call(iResult, sServerResult);
-      };
-      return this.imp.saveFileToUrl(sSaveProgramUrl);
+    value: function saveFileToUrl(sSaveProgramUrl, call, filename, param) {
+      var mxmemory = this.imp.saveFileToMemory();
+      if (mxmemory.getSize() == 0) {
+        call(-1, "save failed");
+        return false;
+      }
+      var dataptr = mxmemory.getData();
+      var size = mxmemory.getSize();
+      var wasmMemoryHEAPU8 = MxCpp.mxcadassemblyimp.HEAPU8;
+      var binaryData = wasmMemoryHEAPU8.subarray(dataptr, dataptr + size);
+      var arrayBuffer = new ArrayBuffer(mxmemory.getSize());
+      var arrayBufferView = new Uint8Array(arrayBuffer);
+      arrayBufferView.set(binaryData);
+      mxmemory.clear();
+      MxTools.postMemoryFile(arrayBufferView, sSaveProgramUrl, filename || "temp.mxweb", call, param);
+      return true;
     }
   }, {
     key: "saveFile",
@@ -38899,6 +38982,8 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   getFileFromUrl,
   _ML_String,
   IsZero,
+  postMemoryFile,
+  postEmscriptenIndexedDBFile,
   MxTools,
   McGePoint3d,
   McGeVector3d,
@@ -39080,4 +39165,4 @@ const mxcad = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   loadMxCADassembly3d
 }, Symbol.toStringTag, { value: 'Module' }));
 
-export { Color, ColorIndexType, ColorMethod, FetchAttributes, IsZero, McAppType, McCmColor, McDb, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbDatabase, McDbDimension, McDbEllipse, McDbEntity, McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMText, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRasterImage, McDbRasterImageDef, McDbRotatedDimension, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McRxObject, MdGe, MdGeAngleDim, MdGeApplication, MdGeArray1OfInteger, MdGeArray1OfPnt, MdGeArray1OfReal, MdGeArray2OfPnt, MdGeArray2OfReal, MdGeArrowAspect, MdGeAxis, MdGeBRep, MdGeBSplineCurve, MdGeBSplineSurface, MdGeBezierCurve, MdGeBezierSurface, MdGeBox, MdGeCSYS, MdGeCSYSR, MdGeChamfer, MdGeCircle, MdGeColor, MdGeCompSolid, MdGeCompound, MdGeCone, MdGeCylinder, MdGeDiameterDim, MdGeDimAspect, MdGeDir, MdGeDocColorTool, MdGeDocReader, MdGeDocShapeTool, MdGeDocWriter, MdGeDocument, MdGeDoubleArray, MdGeEdge, MdGeEllipse, MdGeExplorer, MdGeFace, MdGeFillet, MdGeHGeomPlane, MdGeHGeomSurface, MdGeHypr, MdGeInterpolateBSpl, MdGeLabel, MdGeLabelSequence, MdGeLabelTree, MdGeLengthDim, MdGeLight, MdGeLine, MdGeLineAspect, MdGeListIteratorOfListOfShape, MdGeListOfShape, MdGeLocation, MdGeLoft, MdGeMakeArcOfCircle, MdGeMakeFace, MdGeMakeThickSolid, MdGeMakeWires, MdGeMat, MdGeMaterialAspect, MdGeObject, MdGeParab, MdGePipe, MdGePlane, MdGePoint, MdGePointsToBSpl, MdGePointsToBSplSurface, MdGePrism, MdGeRadiusDim, MdGeRect, MdGeRevol, MdGeSequenceIteratorOfSequenceOfShape, MdGeSequenceOfShape, MdGeShape, MdGeShell, MdGeSolid, MdGeSphere, MdGeText, MdGeTextAspect, MdGeTextLabel, MdGeTopo, MdGeTorus, MdGeTransform, MdGeTrsf, MdGeVec, MdGeVertex, MdGeWedge, MdGeWire, MdGeXYZ, MxCADResbuf, MxCADResbufDataType, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCheckTheBrowser, MxCpp, MxCppType, MxDraw3d, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTools, Mx_Erase, ObjectInheritance, _ML_String, b64Decode, b64Encode, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getIndexColors, getJsonFromUrl, getStyle, loadMxCADassembly, loadMxCADassembly3d, saveAsFileDialog, setMcCmColor };
+export { Color, ColorIndexType, ColorMethod, FetchAttributes, IsZero, McAppType, McCmColor, McDb, McDbAlignedDimension, McDbArc, McDbAttribute, McDbAttributeDefinition, McDbBlockReference, McDbBlockTable, McDbBlockTableRecord, McDbCircle, McDbCurve, McDbDatabase, McDbDimension, McDbEllipse, McDbEntity, McDbHatch, McDbLayerTable, McDbLayerTableRecord, McDbLine, McDbLinetypeTable, McDbLinetypeTableRecord, McDbMText, McDbObject, McDbObjectArray, McDbPoint, McDbPolyline, McDbProxyEntity, McDbRasterImage, McDbRasterImageDef, McDbRotatedDimension, McDbText, McDbTextStyleTable, McDbTextStyleTableRecord, McGeLongArray, McGeMatrix3d, McGePoint3d, McGePoint3dArray, McGeStringArray, McGeVector3d, McObject, McObjectId, McObjectIdType, McRxObject, MdGe, MdGeAngleDim, MdGeApplication, MdGeArray1OfInteger, MdGeArray1OfPnt, MdGeArray1OfReal, MdGeArray2OfPnt, MdGeArray2OfReal, MdGeArrowAspect, MdGeAxis, MdGeBRep, MdGeBSplineCurve, MdGeBSplineSurface, MdGeBezierCurve, MdGeBezierSurface, MdGeBox, MdGeCSYS, MdGeCSYSR, MdGeChamfer, MdGeCircle, MdGeColor, MdGeCompSolid, MdGeCompound, MdGeCone, MdGeCylinder, MdGeDiameterDim, MdGeDimAspect, MdGeDir, MdGeDocColorTool, MdGeDocReader, MdGeDocShapeTool, MdGeDocWriter, MdGeDocument, MdGeDoubleArray, MdGeEdge, MdGeEllipse, MdGeExplorer, MdGeFace, MdGeFillet, MdGeHGeomPlane, MdGeHGeomSurface, MdGeHypr, MdGeInterpolateBSpl, MdGeLabel, MdGeLabelSequence, MdGeLabelTree, MdGeLengthDim, MdGeLight, MdGeLine, MdGeLineAspect, MdGeListIteratorOfListOfShape, MdGeListOfShape, MdGeLocation, MdGeLoft, MdGeMakeArcOfCircle, MdGeMakeFace, MdGeMakeThickSolid, MdGeMakeWires, MdGeMat, MdGeMaterialAspect, MdGeObject, MdGeParab, MdGePipe, MdGePlane, MdGePoint, MdGePointsToBSpl, MdGePointsToBSplSurface, MdGePrism, MdGeRadiusDim, MdGeRect, MdGeRevol, MdGeSequenceIteratorOfSequenceOfShape, MdGeSequenceOfShape, MdGeShape, MdGeShell, MdGeSolid, MdGeSphere, MdGeText, MdGeTextAspect, MdGeTextLabel, MdGeTopo, MdGeTorus, MdGeTransform, MdGeTrsf, MdGeVec, MdGeVertex, MdGeWedge, MdGeWire, MdGeXYZ, MxCADResbuf, MxCADResbufDataType, MxCADSelectionSet, MxCADSelectionSetStatus, MxCADUiPrAngle, MxCADUiPrBase, MxCADUiPrDist, MxCADUiPrEntity, MxCADUiPrInt, MxCADUiPrKeyWord, MxCADUiPrPoint, MxCADUiPrString, MxCADUtility, MxCADUtilityClass, MxCheckTheBrowser, MxCpp, MxCppType, MxDraw3d, MxPropertiesWindowCustom, MxPropertiesWindowCustomValue, MxPropertiesWindowCustomValueType, MxTools, Mx_Erase, ObjectInheritance, _ML_String, b64Decode, b64Encode, createMcCmColor, createMxCad, mxcad as default, downloadFile, downloadFileFromUrl, drawArc, drawCircle, drawEllipticalArc, drawLine, drawMText, drawPolyLine, drawPolygon, drawRectang, drawText, getColorUtils, getFileFromUrl, getFilterImp, getIndexColors, getJsonFromUrl, getStyle, loadMxCADassembly, loadMxCADassembly3d, postEmscriptenIndexedDBFile, postMemoryFile, saveAsFileDialog, setMcCmColor };