byt-ui 0.1.9 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byt-ui",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "private": false,
   "description": "byt组件库",
   "author": {

package/packages/common/modules/request.js

@@ -3,9 +3,9 @@ import { Message } from 'element-ui'
 import { getCookie } from './cookie'
 
 class Request {
-  constructor(config = {}) {
+  constructor(config = {}, Vue = null) {
     const { options = {}, handler = {}} = config;
-    this.request = null;
+    this._Vue = Vue || null;
     this._errorCode = {
       '000': '操作太频繁，请勿重复请求',
       '401': '当前操作没有权限',
@@ -13,8 +13,9 @@ class Request {
       '404': '接口不存在',
       '417': '未绑定登录账号，请使用密码登录后绑定',
       '423': '演示环境不能操作，如需了解联系我们',
+      '424': 'token过期，请重新登录',
       '426': '用户名不存在或密码错误',
-      '428': '验证码错误,请重新输入',
+      '428': 'token过期，请重新登录',
       '429': '请求过频繁',
       '479': '演示环境，没有权限操作',
       'default': '系统未知错误,请反馈给管理员'
@@ -27,6 +28,8 @@ class Request {
       timeout: 60000,
       withCredentials: false
     }, options)
+
+    this.request = axios.create(this.options)
     // 注册fetch;
     this.register()
   }
@@ -40,9 +43,8 @@ class 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)
@@ -56,19 +58,22 @@ class Request {
         case 200:
           if (res.data.code === 1) {
             Message.error(message)
-            this.handler.error && this.handler.error(res.data);
             return Promise.reject(res.data)
           }
-          this.handler.success && this.handler.success(res.data)
+          this.handler.success && this.handler.success(res.data);
           return res.data
         case 424:
         case 428:
           // 后台定义 424||428 针对令牌过期的特殊响应码
           this.handler.expire && this.handler.expire(res.data);
+          Message.error(message);
+          if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
+            const { outLogin } = this._Vue.prototype.$appCommon;
+            outLogin && outLogin();
+          }
           break;
         default:
           Message.error(message);
-          this.handler.error && this.handler.error(res.data);
           return Promise.reject(message)
       }
     }, error => {
@@ -82,12 +87,20 @@ class Request {
             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] = ({
@@ -138,8 +151,6 @@ class Request {
   }
 
   register() {
-    this.request = axios.create(this.options)
-
     // 添加拦截器
     this.interceptors();
 
@@ -148,12 +159,14 @@ class Request {
   }
 }
 
-export const { request } = new Request()
+export const fetch = (config = {}, Vue) => {
+  const { request } = new Request(Object.assign({}, config), Vue)
+  return request
+}
 
 export default {
-  install(Vue, options = {}) {
-    const { request } = new Request(Object.assign({}, options))
-    Vue.prototype.$http = request
+  install(Vue, config = {}) {
+    Vue.prototype.$http = fetch(config, Vue)
   }
 }