@hzab/data-model 1.7.2 → 1.7.3

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @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.3",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/axios.js

@@ -129,4 +129,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)) {
+      reject(response);
+      return;
+    }
     if (this.isResponse) {
       resolve(response);
       return;