zmdms-utils 0.0.86 → 0.0.87

package/dist/es/file.d.ts

@@ -99,6 +99,8 @@ interface IDownloadOptions extends IOptions {
     waterMark?: boolean | string;
     /** 是否开发不需要登录信息 */
     open?: boolean;
+    /** 是否解析异常blob结果 */
+    parseErrorBlob?: boolean;
 }
 interface IBatchDownloadOptions extends IOptions {
     zipName: string;

package/dist/es/file.js

@@ -19,7 +19,7 @@ var isZmdmsFileService = FILE_SERVICE === "zmdms";
  * @param options.open boolean 是否不需要登录信息
  */
 function downloadFile(fileId, fileName, options) {
-    var API_BASEURL = options.API_BASEURL, authToken = options.authToken, _a = options.waterMark, waterMark = _a === void 0 ? true : _a, open = options.open;
+    var API_BASEURL = options.API_BASEURL, authToken = options.authToken, _a = options.waterMark, waterMark = _a === void 0 ? true : _a, open = options.open, _b = options.parseErrorBlob, parseErrorBlob = _b === void 0 ? false : _b;
     if (isZmdmsFileService) {
         fileId = encodeFileId(fileId, 2);
     }
@@ -49,7 +49,32 @@ function downloadFile(fileId, fileName, options) {
                 resolve({ msg: "文件下载成功!" });
             }
             else {
-                reject(xhr.response);
+                if (!parseErrorBlob) {
+                    reject(xhr.response);
+                    return;
+                }
+                try {
+                    if (Object.prototype.toString.call(xhr.response) === "[object Blob]") {
+                        var blob = xhr.response;
+                        blob
+                            .text()
+                            .then(function (text) {
+                            var json = JSON.parse(text);
+                            reject(json);
+                        })
+                            .catch(function (err) {
+                            reject({
+                                msg: (err === null || err === void 0 ? void 0 : err.message) || (err === null || err === void 0 ? void 0 : err.msg) || "下载失败!",
+                                code: xhr.status,
+                            });
+                        });
+                    }
+                }
+                catch (err) {
+                    reject({
+                        msg: "下载失败!",
+                    });
+                }
             }
         };
         xhr.onerror = function (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/file.ts

@@ -35,7 +35,13 @@ export function downloadFile(
   fileName: string,
   options: IDownloadOptions
 ) {
-  const { API_BASEURL, authToken, waterMark = true, open } = options;
+  const {
+    API_BASEURL,
+    authToken,
+    waterMark = true,
+    open,
+    parseErrorBlob = false,
+  } = options;
   if (isZmdmsFileService) {
     fileId = encodeFileId(fileId, 2);
   }
@@ -76,7 +82,33 @@ export function downloadFile(
 
         resolve({ msg: "文件下载成功!" });
       } else {
-        reject(xhr.response);
+        if (!parseErrorBlob) {
+          reject(xhr.response);
+          return;
+        }
+        try {
+          if (
+            Object.prototype.toString.call(xhr.response) === "[object Blob]"
+          ) {
+            const blob = xhr.response;
+            blob
+              .text()
+              .then((text: any) => {
+                const json = JSON.parse(text);
+                reject(json);
+              })
+              .catch((err: any) => {
+                reject({
+                  msg: err?.message || err?.msg || "下载失败!",
+                  code: xhr.status,
+                });
+              });
+          }
+        } catch (err) {
+          reject({
+            msg: "下载失败!",
+          });
+        }
       }
     };
     xhr.onerror = function (err) {
@@ -470,6 +502,8 @@ interface IDownloadOptions extends IOptions {
   waterMark?: boolean | string;
   /** 是否开发不需要登录信息 */
   open?: boolean;
+  /** 是否解析异常blob结果 */
+  parseErrorBlob?: boolean;
 }
 interface IBatchDownloadOptions extends IOptions {
   zipName: string;