byt-ui 0.1.9 → 0.1.11

package/lib/byt-ui.common.js

@@ -176225,8 +176225,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": function() { return /* binding */ modules_request; },
-  request: function() { return /* binding */ request; }
+  "default": function() { return /* binding */ request; },
+  fetch: function() { return /* binding */ request_fetch; }
 });
 
 // NAMESPACE OBJECT: ./node_modules/axios/lib/platform/common/utils.js
@@ -180165,12 +180165,12 @@ var cookie = __webpack_require__(71099);
 
 
 class request_Request {
-  constructor(config = {}) {
+  constructor(config = {}, Vue = null) {
     const {
       options = {},
       handler = {}
     } = config;
-    this.request = null;
+    this._Vue = Vue || null;
     this._errorCode = {
       '000': '操作太频繁，请勿重复请求',
       '401': '当前操作没有权限',
@@ -180178,8 +180178,9 @@ class request_Request {
       '404': '接口不存在',
       '417': '未绑定登录账号，请使用密码登录后绑定',
       '423': '演示环境不能操作，如需了解联系我们',
+      '424': 'token过期，请重新登录',
       '426': '用户名不存在或密码错误',
-      '428': '验证码错误,请重新输入',
+      '428': 'token过期，请重新登录',
       '429': '请求过频繁',
       '479': '演示环境，没有权限操作',
       'default': '系统未知错误,请反馈给管理员'
@@ -180192,6 +180193,7 @@ class request_Request {
       timeout: 60000,
       withCredentials: false
     }, options);
+    this.request = lib_axios.create(this.options);
     // 注册fetch;
     this.register();
   }
@@ -180204,9 +180206,8 @@ class request_Request {
       if (token && !isToken) {
         config.headers['Authorization'] = `Bearer ${token}`; // token
       }
-      if (TENANT_ID) {
-        config.headers['TENANT-ID'] = TENANT_ID; // 租户ID
-      }
+      config.headers['TENANT-ID'] = TENANT_ID || this.getQueryString('TENANT-ID') || ''; // 租户ID
+
       return config;
     }, error => {
       return Promise.reject(error);
@@ -180220,7 +180221,6 @@ class request_Request {
         case 200:
           if (res.data.code === 1) {
             element_ui_common.Message.error(message);
-            this.handler.error && this.handler.error(res.data);
             return Promise.reject(res.data);
           }
           this.handler.success && this.handler.success(res.data);
@@ -180229,10 +180229,16 @@ class request_Request {
         case 428:
           // 后台定义 424||428 针对令牌过期的特殊响应码
           this.handler.expire && this.handler.expire(res.data);
+          element_ui_common.Message.error(message);
+          if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
+            const {
+              outLogin
+            } = this._Vue.prototype.$appCommon;
+            outLogin && outLogin();
+          }
           break;
         default:
           element_ui_common.Message.error(message);
-          this.handler.error && this.handler.error(res.data);
           return Promise.reject(message);
       }
     }, error => {
@@ -180246,11 +180252,19 @@ class request_Request {
             element_ui_common.Message.error(error.response.data.msg);
             break;
         }
-        this.error && this.error(error.response);
+        this.handler.error && this.handler.error(error.response);
       }
       return Promise.reject(new Error(error));
     });
   }
+  getQueryString(name) {
+    const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`, 'i');
+    const r = window.location.search.substr(1).match(reg);
+    if (r != null) {
+      return decodeURIComponent(r[2]);
+    }
+    return null;
+  }
   setMethods() {
     this._methods.forEach(v => {
       this.request[v] = ({
@@ -180295,8 +180309,6 @@ class request_Request {
     });
   }
   register() {
-    this.request = lib_axios.create(this.options);
-
     // 添加拦截器
     this.interceptors();
 
@@ -180304,15 +180316,15 @@ class request_Request {
     this.setMethods();
   }
 }
-const {
-  request
-} = new request_Request();
-/* harmony default export */ var modules_request = ({
-  install(Vue, options = {}) {
-    const {
-      request
-    } = new request_Request(Object.assign({}, options));
-    Vue.prototype.$http = request;
+const request_fetch = (config = {}, Vue) => {
+  const {
+    request
+  } = new request_Request(Object.assign({}, config), Vue);
+  return request;
+};
+/* harmony default export */ var request = ({
+  install(Vue, config = {}) {
+    Vue.prototype.$http = request_fetch(config, Vue);
   }
 });
 

package/lib/byt-ui.umd.js

@@ -176235,8 +176235,8 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": function() { return /* binding */ modules_request; },
-  request: function() { return /* binding */ request; }
+  "default": function() { return /* binding */ request; },
+  fetch: function() { return /* binding */ request_fetch; }
 });
 
 // NAMESPACE OBJECT: ./node_modules/axios/lib/platform/common/utils.js
@@ -180175,12 +180175,12 @@ var cookie = __webpack_require__(41591);
 
 
 class request_Request {
-  constructor(config = {}) {
+  constructor(config = {}, Vue = null) {
     const {
       options = {},
       handler = {}
     } = config;
-    this.request = null;
+    this._Vue = Vue || null;
     this._errorCode = {
       '000': '操作太频繁，请勿重复请求',
       '401': '当前操作没有权限',
@@ -180188,8 +180188,9 @@ class request_Request {
       '404': '接口不存在',
       '417': '未绑定登录账号，请使用密码登录后绑定',
       '423': '演示环境不能操作，如需了解联系我们',
+      '424': 'token过期，请重新登录',
       '426': '用户名不存在或密码错误',
-      '428': '验证码错误,请重新输入',
+      '428': 'token过期，请重新登录',
       '429': '请求过频繁',
       '479': '演示环境，没有权限操作',
       'default': '系统未知错误,请反馈给管理员'
@@ -180202,6 +180203,7 @@ class request_Request {
       timeout: 60000,
       withCredentials: false
     }, options);
+    this.request = lib_axios.create(this.options);
     // 注册fetch;
     this.register();
   }
@@ -180214,9 +180216,8 @@ class request_Request {
       if (token && !isToken) {
         config.headers['Authorization'] = `Bearer ${token}`; // token
       }
-      if (TENANT_ID) {
-        config.headers['TENANT-ID'] = TENANT_ID; // 租户ID
-      }
+      config.headers['TENANT-ID'] = TENANT_ID || this.getQueryString('TENANT-ID') || ''; // 租户ID
+
       return config;
     }, error => {
       return Promise.reject(error);
@@ -180230,7 +180231,6 @@ class request_Request {
         case 200:
           if (res.data.code === 1) {
             element_ui_common.Message.error(message);
-            this.handler.error && this.handler.error(res.data);
             return Promise.reject(res.data);
           }
           this.handler.success && this.handler.success(res.data);
@@ -180239,10 +180239,16 @@ class request_Request {
         case 428:
           // 后台定义 424||428 针对令牌过期的特殊响应码
           this.handler.expire && this.handler.expire(res.data);
+          element_ui_common.Message.error(message);
+          if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
+            const {
+              outLogin
+            } = this._Vue.prototype.$appCommon;
+            outLogin && outLogin();
+          }
           break;
         default:
           element_ui_common.Message.error(message);
-          this.handler.error && this.handler.error(res.data);
           return Promise.reject(message);
       }
     }, error => {
@@ -180256,11 +180262,19 @@ class request_Request {
             element_ui_common.Message.error(error.response.data.msg);
             break;
         }
-        this.error && this.error(error.response);
+        this.handler.error && this.handler.error(error.response);
       }
       return Promise.reject(new Error(error));
     });
   }
+  getQueryString(name) {
+    const reg = new RegExp(`(^|&)${name}=([^&]*)(&|$)`, 'i');
+    const r = window.location.search.substr(1).match(reg);
+    if (r != null) {
+      return decodeURIComponent(r[2]);
+    }
+    return null;
+  }
   setMethods() {
     this._methods.forEach(v => {
       this.request[v] = ({
@@ -180305,8 +180319,6 @@ class request_Request {
     });
   }
   register() {
-    this.request = lib_axios.create(this.options);
-
     // 添加拦截器
     this.interceptors();
 
@@ -180314,15 +180326,15 @@ class request_Request {
     this.setMethods();
   }
 }
-const {
-  request
-} = new request_Request();
-/* harmony default export */ var modules_request = ({
-  install(Vue, options = {}) {
-    const {
-      request
-    } = new request_Request(Object.assign({}, options));
-    Vue.prototype.$http = request;
+const request_fetch = (config = {}, Vue) => {
+  const {
+    request
+  } = new request_Request(Object.assign({}, config), Vue);
+  return request;
+};
+/* harmony default export */ var request = ({
+  install(Vue, config = {}) {
+    Vue.prototype.$http = request_fetch(config, Vue);
   }
 });