@hzab/data-model 1.7.3 → 1.7.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/data-model@1.7.5
+
+fix: array-data-model 数据报错异常处理
+
+# @hzab/data-model@1.7.4
+
+fix: axios 拦截优化，解决请求取消异常问题
+
 # @hzab/data-model@1.7.3
 
 fix: axios 统一

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/data-model",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/array-data-model.js

@@ -2,7 +2,10 @@ import _ from "lodash";
 
 import { objToFormData, formDataToObj, _$Temp } from "./utils";
 import ArrayUtils, { STATE_CODE } from "./ArrayUtils";
-
+const errMsg = {
+  404: "未找到对应子项",
+  501: "未传入表单id",
+};
 /**
  * ArrayDataModel 本地数据 DataModel
  */
@@ -172,11 +175,14 @@ class ArrayDataModel extends ArrayUtils {
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.createResMap) {
-          _res = this.createResMap();
+          _res = this.createResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -193,11 +199,14 @@ class ArrayDataModel extends ArrayUtils {
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.updateResMap) {
-          _res = this.updateResMap();
+          _res = this.updateResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -214,11 +223,14 @@ class ArrayDataModel extends ArrayUtils {
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.patchResMap) {
-          _res = this.patchResMap();
+          _res = this.patchResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -240,16 +252,17 @@ class ArrayDataModel extends ArrayUtils {
       const { _idKey } = this;
       const id = config[_idKey] || config.params?.[_idKey] || config.data?.[_idKey] || ctx[_idKey];
       const res = this.delItem(id);
-      console.log("res", res);
-
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.deleteResMap) {
-          _res = this.deleteResMap();
+          _res = this.deleteResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -293,7 +306,7 @@ class ArrayDataModel extends ArrayUtils {
         if (sucList.length > 0) {
           let _res = { sucList, failList };
           if (this.multipleDeleteResMap) {
-            _res = this.multipleDeleteResMap();
+            _res = this.multipleDeleteResMap(_res);
           }
           resolve(_res);
         } else {

package/src/axios.js

@@ -50,10 +50,12 @@ export function setAxios(axiosList) {
  * axios 守卫
  * @param {Function} cb
  * @param {Function} errCb
+ * @param {Object} opt
+ * @param {Object} opt.replaceErrCb 直接替换回调函数
  */
-export function setAxRequest(cb, errCb) {
+export function setAxRequest(cb, errCb, opt = {}) {
   temp.axiosList?.forEach((_ax) => {
-    _ax.interceptors.request.use(cb, errCb);
+    _ax.interceptors.request.use(cb, handleErrCb(errCb, { logPrefix: "Error axios response: ", ...opt }));
   });
 }
 
@@ -61,20 +63,40 @@ export function setAxRequest(cb, errCb) {
  * 请求到结果的拦截处理
  * @param {Function} cb
  * @param {Function} errCb
+ * @param {Object} opt
+ * @param {Object} opt.replaceErrCb 直接替换回调函数
  */
-export function setAxResponse(cb, errCb) {
+export function setAxResponse(cb, errCb, opt = {}) {
   temp.axiosList?.forEach((_ax) => {
-    _ax.interceptors.response.use(
-      cb,
-      errCb ||
-        ((error) => {
-          console.error("Error axios response: ", error);
-          return Promise.reject(error);
-        }),
-    );
+    _ax.interceptors.response.use(cb, handleErrCb(errCb, { logPrefix: "Error axios response: ", ...opt }));
   });
 }
 
+/**
+ * 处理错误回调函数
+ * @param {Function} errCb
+ * @param {Object} opt
+ * @param {Object} opt.replaceErrCb 直接替换回调函数
+ * @returns
+ */
+export function handleErrCb(errCb, opt) {
+  const { replaceErrCb, logPrefix } = opt || {};
+  const isFn = typeof errCb === "function";
+
+  if (replaceErrCb && isFn) {
+    return errCb;
+  }
+
+  return (error) => {
+    if (axios.isCancel(error)) {
+      console.info("axios 请求已取消:", error);
+      return Promise.reject(error);
+    }
+    console.error(logPrefix, error);
+    return isFn ? errCb() : Promise.reject(error);
+  };
+}
+
 /**
  * 设置 axios.defaults
  * @param {string} key

package/src/data-model.js

@@ -459,7 +459,7 @@ class DataModel {
 
   handleRes(response, resolve, reject) {
     if (axios.isCancel(response)) {
-      reject(response);
+      console.info("errorHandler axios.isCancel", response);
       return;
     }
     if (this.isResponse) {
@@ -504,6 +504,10 @@ class DataModel {
   }
 
   errorHandler(err, reject) {
+    if (axios.isCancel(err)) {
+      console.info("errorHandler axios.isCancel", err);
+      return;
+    }
     if (this.isResponse) {
       reject(err);
       return;