mxcad 1.0.34 → 1.0.35

package/dist/mxcad.d.ts

@@ -9,9 +9,24 @@ import { McGePoint3d } from 'mxdraw';
 export declare function fetchAndInstantiate(url: string, importObject: WebAssembly.Imports): Promise<WebAssembly.WebAssemblyInstantiatedSource>;
 export declare function b64Encode(str: string): string;
 export declare function b64Decode(str: string): string;
+export type FileTypes = {
+	description?: string;
+	accept: {
+		[type: string]: string[];
+	};
+}[];
+/**  文件下载保存（另存为只支持 Chrome86 或 Edge 86 以及 Opera 72）兼容 iE10等较低版本的浏览器  */
+export declare function saveAsFileDialog({ blob, filename, types }: {
+	blob: Blob;
+	filename?: string;
+	types?: FileTypes;
+}): Promise<void>;
+export declare function downloadFile(blob: any, filename: string): void;
 export declare const MxTools: {
 	b64Encode: typeof b64Encode;
 	b64Decode: typeof b64Decode;
+	saveAsFileDialog: typeof saveAsFileDialog;
+	downloadFile: typeof downloadFile;
 };
 /** 绘制文字 */
 export declare function drawText(): Promise<void>;
@@ -111,18 +126,16 @@ export declare class MdDbDatabase extends MdRxObject {
 }
 export declare class McObject {
 	private imp;
-	static _currentOpenWebFileName: string;
+	static currentFileName: string;
 	constructor(imp: any);
 	getImp(): any;
 	getMxCppImp(): any;
 	updateDisplay(modelViewMatrix: number[], projectionMatrix: number[]): void;
 	test(): void;
 	openWebFile(sFileUrl: string): boolean;
-	getCurrentOpenWebFileUrl(): string;
+	getCurrentFileName(): string;
 	saveFileToUrl(sSaveProgramUrl: string): boolean;
-	/**  文件下载保存（另存为只支持 Chrome86 或 Edge 86 以及 Opera 72）兼容 iE10等较低版本的浏览器  */
-	private downloadFile;
-	saveFile(pszFilePath?: string, call?: (data: any) => void, isDownland?: boolean): boolean;
+	saveFile(pszFilePath?: string, call?: (data: any) => void, isDownland?: boolean, isShowSaveFileDialog?: boolean): boolean;
 	GetDatabase(): MdDbDatabase;
 	GetSysVarString(varName: string): string;
 	SetSysVarString(varName: string, val: string): any;

package/dist/mxcad.es.js

@@ -9,9 +9,56 @@ function b64Encode(e) {
 function b64Decode(e) {
   return decodeURIComponent(escape(atob(e)));
 }
+async function saveAsFileDialog({
+  blob: e,
+  filename: t = "",
+  types: n = [
+    {
+      description: "mxweb File",
+      accept: {
+        "application/octet-stream": [".mxweb"]
+      }
+    }
+  ]
+}) {
+  try {
+    if (window.showSaveFilePicker)
+      if (window.navigator?.userActivation?.isActive)
+        try {
+          if (!window.showSaveFilePicker)
+            return;
+          const _ = await (await window.showSaveFilePicker({
+            suggestedName: t,
+            types: n
+          })).createWritable();
+          await _.write(e), await _.close();
+          return;
+        } catch (o) {
+          if (o?.name === "AbortError")
+            return;
+          console.error(o);
+        }
+      else
+        console.warn("\u975E\u7528\u6237\u4EA4\u4E92 \u65E0\u6CD5\u8C03\u7528showSaveFilePicker \u5DF2\u9009\u62E9\u517C\u5BB9\u65B9\u6848");
+    if (window.navigator?.msSaveOrOpenBlob) {
+      window.navigator.msSaveOrOpenBlob(e, t);
+      return;
+    }
+    const i = document.createElement("a");
+    i.href = window.URL.createObjectURL(e), i.download = t, i.style.display = "none", document.body.appendChild(i), i.click(), document.body.removeChild(i), typeof window.URL.revokeObjectURL == "function" ? window.URL.revokeObjectURL(i.href) : typeof window.webkitURL < "u" && typeof window.webkitURL.revokeObjectURL == "function" ? window.webkitURL.revokeObjectURL(i.href) : window.URL.revokeObjectURL(i.href);
+  } catch (i) {
+    console.error(i.name, i.message);
+  }
+}
+function downloadFile(e, t) {
+  const n = document.createElement("a");
+  n.href = window.URL.createObjectURL(e), n.download = t, n.click();
+}
 const MxTools = {
   b64Encode,
-  b64Decode
+  b64Decode,
+  saveAsFileDialog,
+  downloadFile
 };
 async function drawText() {
   const e = new MrxDbgUiPrPoint();
@@ -337,7 +384,7 @@ class MdDbDatabase extends MdRxObject {
 }
 class McObject {
   imp;
-  static _currentOpenWebFileName;
+  static currentFileName;
   constructor(t) {
     this.imp = t;
   }
@@ -354,63 +401,34 @@ class McObject {
     this.imp.test();
   }
   openWebFile(t) {
-    return McObject._currentOpenWebFileName = t, this.imp.openWebFile(t);
+    return McObject.currentFileName = t, this.imp.openWebFile(t);
   }
-  getCurrentOpenWebFileUrl() {
-    return McObject._currentOpenWebFileName;
+  getCurrentFileName() {
+    return McObject.currentFileName;
   }
   saveFileToUrl(t) {
     return this.imp.saveFileToUrl(t);
   }
-  async downloadFile({
-    blob: t,
-    filename: n = "",
-    types: i = [
-      {
-        description: "mxweb File",
-        accept: {
-          "application/octet-stream": [".mxweb"]
+  saveFile(t, n, i = !0, o = !0) {
+    t || (t = this.getCurrentFileName());
+    const _ = window;
+    return _.mx_saveFile_call = (s) => {
+      if (n && n(s), !!s) {
+        if (i) {
+          let u;
+          /^((?!chrome|android).)*safari/i.test(navigator.userAgent) ? u = new Blob([s.buffer], { type: "application/octet-stream" }) : u = new Blob([s.buffer], { type: "application/octet-binary" }), o ? MxTools.saveAsFileDialog({
+            blob: u,
+            filename: t,
+            types: [{
+              description: "mxweb File",
+              accept: {
+                "application/octet-stream": [".mxweb"]
+              }
+            }]
+          }) : MxTools.downloadFile(u, t);
         }
+        _.mx_saveFile_call = null;
       }
-    ]
-  }) {
-    try {
-      if (window.showSaveFilePicker)
-        if (window.navigator?.userActivation?.isActive)
-          try {
-            if (!window.showSaveFilePicker)
-              return;
-            const s = await (await window.showSaveFilePicker({
-              suggestedName: n,
-              types: i
-            })).createWritable();
-            await s.write(t), await s.close();
-            return;
-          } catch (_) {
-            if (_?.name === "AbortError")
-              return;
-            console.error(_);
-          }
-        else
-          console.warn("\u975E\u7528\u6237\u4EA4\u4E92 \u65E0\u6CD5\u8C03\u7528showSaveFilePicker \u5DF2\u9009\u62E9\u517C\u5BB9\u65B9\u6848");
-      if (window.navigator?.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(t, n);
-        return;
-      }
-      const o = document.createElement("a");
-      o.href = window.URL.createObjectURL(t), o.download = n, o.style.display = "none", document.body.appendChild(o), o.click(), document.body.removeChild(o), typeof window.URL.revokeObjectURL == "function" ? window.URL.revokeObjectURL(o.href) : typeof window.webkitURL < "u" && typeof window.webkitURL.revokeObjectURL == "function" ? window.webkitURL.revokeObjectURL(o.href) : window.URL.revokeObjectURL(o.href);
-    } catch (o) {
-      console.error(o.name, o.message);
-    }
-  }
-  saveFile(t = this.getCurrentOpenWebFileUrl(), n, i = !0) {
-    const o = window;
-    return o.mx_saveFile_call = (_) => {
-      if (n && n(_), i && _) {
-        let s;
-        /^((?!chrome|android).)*safari/i.test(navigator.userAgent) ? s = new Blob([_.buffer], { type: "application/octet-stream" }) : s = new Blob([_.buffer], { type: "application/octet-binary" }), this.downloadFile({ blob: s, filename: t });
-      }
-      o.mx_saveFile_call = null;
     }, this.imp.saveFile(t);
   }
   GetDatabase() {
@@ -5749,6 +5767,8 @@ const _export = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   fetchAndInstantiate,
   b64Encode,
   b64Decode,
+  saveAsFileDialog,
+  downloadFile,
   MxTools,
   drawText,
   drawCircle,
@@ -5796,6 +5816,7 @@ export {
   b64Decode,
   b64Encode,
   _export as default,
+  downloadFile,
   drawArc,
   drawCircle,
   drawEllipticalArc,
@@ -5806,5 +5827,6 @@ export {
   drawText,
   fetchAndInstantiate,
   loadMxCADassembly,
-  mxErase
+  mxErase,
+  saveAsFileDialog
 };