zmdms-utils 0.0.86 → 0.0.88

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/dist/es/request.d.ts

@@ -82,6 +82,11 @@ interface IOtherOptions {
     interceptorsRequestConfig?: (config: InternalAxiosRequestConfig<any>) => InternalAxiosRequestConfig<any>;
     /** 响应器自定义 */
     interceptorsResponseHandle?: () => void;
+    /**
+     * 是否对于接口返回200状态码的 但是 data.code非200或201的情况 也提示异常
+     * 这个要配合（独立接口的） isErrorMessage 一起使用
+     */
+    isStatusSuccessCodeError?: boolean;
 }
 
 export { AxiosRequest, IOptions, IOtherOptions };

package/dist/es/request.js

@@ -92,10 +92,21 @@ var AxiosRequest = /** @class */ (function () {
     };
     // 响应成功处理
     AxiosRequest.prototype.responseSuccess = function (response) {
-        var _a;
+        var _a, _b;
         var config = response.config, status = response.status, data = response.data;
         // 对返回数据进行解密后 返回给客户端
         if ((_a = response.config) === null || _a === void 0 ? void 0 : _a.isCrypto) ;
+        // 提示业务错误
+        if (this.otherOptions.isStatusSuccessCodeError &&
+            (config === null || config === void 0 ? void 0 : config.isErrorMessage) &&
+            status === 200 &&
+            data &&
+            typeof data === "object" &&
+            ((data === null || data === void 0 ? void 0 : data.code) !== 200 || (data === null || data === void 0 ? void 0 : data.code) !== 201)) {
+            // 详细信息 再开发模式开启 之后上到别的环境会去掉
+            (_b = this.modalConfirm) === null || _b === void 0 ? void 0 : _b.call(this, "".concat((data === null || data === void 0 ? void 0 : data.msg) || "请求异常"));
+            return;
+        }
         if (!config.isEasyMessage) {
             return response;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.86",
+  "version": "0.0.88",
   "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;

package/src/request.ts

@@ -131,6 +131,19 @@ export class AxiosRequest {
     // 对返回数据进行解密后 返回给客户端
     if ((response.config as any)?.isCrypto) {
     }
+    // 提示业务错误
+    if (
+      this.otherOptions.isStatusSuccessCodeError &&
+      (config as any)?.isErrorMessage &&
+      status === 200 &&
+      data &&
+      typeof data === "object" &&
+      (data?.code !== 200 || data?.code !== 201)
+    ) {
+      // 详细信息 再开发模式开启 之后上到别的环境会去掉
+      this.modalConfirm?.(`${data?.msg || "请求异常"}`);
+      return;
+    }
     if (!(config as any).isEasyMessage) {
       return response;
     }
@@ -432,4 +445,9 @@ export interface IOtherOptions {
   ) => InternalAxiosRequestConfig<any>;
   /** 响应器自定义 */
   interceptorsResponseHandle?: () => void;
+  /**
+   * 是否对于接口返回200状态码的 但是 data.code非200或201的情况 也提示异常
+   * 这个要配合（独立接口的） isErrorMessage 一起使用
+   */
+  isStatusSuccessCodeError?: boolean;
 }