byt-ui 0.1.13 → 0.1.15

package/package.json

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

package/packages/common/modules/request.js

@@ -1,7 +1,6 @@
 import axios from 'axios'
 import { Message } from 'element-ui'
 import { getCookie } from './cookie'
-
 class Request {
   constructor(config = {}, Vue = null) {
     const { options = {}, handler = {}} = config;
@@ -18,6 +17,7 @@ class Request {
       '428': 'token过期，请重新登录',
       '429': '请求过频繁',
       '479': '演示环境，没有权限操作',
+      '503': '服务未启动，请联系管理员处理',
       'default': '系统未知错误,请反馈给管理员'
     }
     this._methods = ['get', 'post', 'delete', 'put']
@@ -26,17 +26,22 @@ class Request {
       baseURL: '/bytserver',
       responseType: 'json',
       timeout: 60000,
-      withCredentials: false
+      showError: true,
+      withCredentials: false,
+      validateStatus(status) {
+        // >=200或者<=500的统一由成功拦截处理
+        return status >= 200 && status <= 500 // 默认的
+      }
     }, options)
 
-    this.request = axios.create(this.options)
+    this._request = axios.create(this.options)
     // 注册fetch;
     this.register()
   }
 
   interceptors() {
     // HTTPrequest拦截
-    this.request.interceptors.request.use(config => {
+    this._request.interceptors.request.use(config => {
       const TENANT_ID = getCookie('tenantId')
       const isToken = (config.headers || {}).isToken === false
       const token = getCookie('access_token')
@@ -51,50 +56,30 @@ class Request {
     })
 
     // HTTPresponse拦截
-    this.request.interceptors.response.use(res => {
+    this._request.interceptors.response.use(res => {
       const status = Number(res.status) || 200
       const message = res.data.msg || this._errorCode[status] || this._errorCode['default']
-      switch (status * 1) {
-        case 200:
-          if (res.data.code === 1) {
-            Message.error(message)
-            return Promise.reject(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);
-          return Promise.reject(message)
+      if (status == 424 || status == 428) {
+        // 后台定义 424||428 针对令牌过期的特殊响应码
+        this.handler.expire && this.handler.expire(res.data);
+        if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
+          const { outLogin } = this._Vue.prototype.$appCommon;
+          outLogin && outLogin();
+        }
+        return Promise.reject(res.data)
       }
-    }, error => {
+      if (status !== 200 || res.data.code === 1) {
+        if (res.config.showError) Message.error(message)
+        return Promise.reject(res.data)
+      }
+
+      this.handler.success && this.handler.success(res.data);
+      return res.data
+    }, (error) => {
       if (error.response) {
-        const status = error.response.status
+        // const status = error.response.status
         const message = error.response.data.msg;
-        switch (status) {
-          case 424:
-          case 428:
-            // 后台定义 424||428 针对令牌过期的特殊响应码
-            this.handler.expire && this.handler.expire(error.response);
-            Message.error(message);
-            if (window.__POWERED_BY_QIANKUN__ && this._Vue) {
-              const { outLogin } = this._Vue.prototype.$appCommon;
-              outLogin && outLogin();
-            }
-            break;
-          default:
-            if (error.config.showError)Message.error(message)
-            break;
-        }
+        if (error.config.showError)Message.error(message)
         this.handler.error && this.handler.error(error.response);
       }
       return Promise.reject(new Error(error))
@@ -111,7 +96,7 @@ class Request {
   }
   setMethods() {
     this._methods.forEach(v => {
-      this.request[v] = ({
+      this._request[v] = ({
         url,
         data = {},
         params = {},
@@ -121,7 +106,7 @@ class Request {
         showError
       }) => {
         return new Promise((resolve, reject) => {
-          this.request({
+          this._request({
             url,
             method: v.toUpperCase(),
             data,
@@ -144,7 +129,7 @@ class Request {
             // 重试请求
             reject(err)
             if (retry > 0) {
-              this.request[v]({
+              this._request[v]({
                 url,
                 data,
                 params,
@@ -170,8 +155,8 @@ class Request {
 }
 
 export const fetch = (config = {}, Vue) => {
-  const { request } = new Request(Object.assign({}, config), Vue)
-  return request
+  const { _request } = new Request(Object.assign({}, config), Vue)
+  return _request
 }
 
 export default {