@hzab/data-model 1.7.2 → 1.7.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/data-model@1.7.4
+
+fix: axios 拦截优化，解决请求取消异常问题
+
+# @hzab/data-model@1.7.3
+
+fix: axios 统一
+
 # @hzab/data-model@1.7.2
 
 feat: axios.js getCancelTokenSource 获取 axios.CancelToken.source， 用于取消请求

package/package.json

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

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
@@ -129,4 +151,6 @@ export function getCancelTokenSource() {
   return axios.CancelToken.source();
 }
 
+export { axios };
+
 export default axios;

package/src/data-model.js

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import axios from "axios";
+import axios from "./axios";
 
 import { objToFormData, formDataToObj, _$Temp, setDefaultAxios, setDefaultErrMsg, setNetworkErrMsg } from "./utils";
 
@@ -458,6 +458,10 @@ class DataModel {
   }
 
   handleRes(response, resolve, reject) {
+    if (axios.isCancel(response)) {
+      console.info("errorHandler axios.isCancel", response);
+      return;
+    }
     if (this.isResponse) {
       resolve(response);
       return;
@@ -500,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;