@hzab/data-model 0.1.0 → 0.1.2

package/package.json

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

package/src/axios.js

@@ -2,7 +2,7 @@ import axios from "axios";
 import Cookies from "js-cookie";
 import _ from "lodash";
 
-export const TOKEN = "TOKEN";
+export const TOKEN = "token";
 
 /**
  * 设置 token

package/src/data-model.js

@@ -1,7 +1,10 @@
 import _ from "lodash";
 import axios from "axios";
 
-const _$Temp = {};
+const DEFAULT_MSG = "未知错误";
+const _$Temp = {
+  defaultMsg: DEFAULT_MSG,
+};
 
 class DataModel {
   constructor(params) {
@@ -281,16 +284,17 @@ class DataModel {
       let _data = data ?? {};
       if (_.isObject(_data) && _data.message === undefined) {
         // 前缀 _ 避免与 data 里已有的 message 冲突
-        _data._message = message || msg;
         _data._msg = message || msg;
+        _data._message = _data._msg;
       }
       resolve(_data);
     } else {
-      const error = new Error(message || msg);
+      const _msg = message || msg || _$Temp.defaultMsg;
+      const error = new Error(_msg);
       error.code = code;
       error.response = response;
-      error._message = message || msg;
-      error._msg = message || msg;
+      error._msg = _msg;
+      error._message = _msg;
       reject(error);
     }
   }
@@ -298,8 +302,12 @@ class DataModel {
   errorHandler(err, reject) {
     const response = err.response || err;
     if (response) {
-      const message = (response.data && (response.data.message || response.data.msg)) || response.msg;
-      const error = new Error(message || response.statusText || "未知错误");
+      const message =
+        (response.data && (response.data.message || response.data.msg)) ||
+        response.msg ||
+        response.statusText ||
+        _$Temp.defaultMsg;
+      const error = new Error(message);
       error.code = response.status;
       error.response = response;
       if (message) {
@@ -309,7 +317,7 @@ class DataModel {
       }
       return reject(error);
     }
-    return reject(err);
+    return reject(err || { _msg: _$Temp.defaultMsg });
   }
 }
 
@@ -319,6 +327,12 @@ function setDefaultAxios(ax) {
   }
 }
 
+export function setDefaultErrMsg(msg) {
+  if (msg) {
+    _$Temp.defaultMsg = msg;
+  }
+}
+
 export { axios, DataModel, setDefaultAxios };
 
 export default DataModel;