vue2-client 1.1.0 → 1.2.2

package/src/utils/request.js

@@ -1,197 +1,197 @@
-import axios from 'axios'
-import Cookie from 'js-cookie'
-import Vue from 'vue'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import notification from 'ant-design-vue/es/notification'
-
-// 跨域认证信息 header 名
-const xsrfHeaderName = 'Authorization'
-
-axios.defaults.timeout = 5000
-axios.defaults.withCredentials = true
-axios.defaults.xsrfHeaderName = xsrfHeaderName
-axios.defaults.xsrfCookieName = xsrfHeaderName
-
-// 认证类型
-const AUTH_TYPE = {
-  BEARER: 'Bearer',
-  BASIC: 'basic',
-  AUTH1: 'auth1',
-  AUTH2: 'auth2'
-}
-
-// http method
-const METHOD = {
-  GET: 'get',
-  POST: 'post'
-}
-
-/**
- * axios请求
- * @param url 请求地址
- * @param method {METHOD} http method
- * @param params 请求参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-async function request (url, method, params, config) {
-  switch (method) {
-    case METHOD.GET:
-      return axios.get(url, { params, ...config })
-    case METHOD.POST:
-      return axios.post(url, params, config)
-    default:
-      return axios.get(url, { params, ...config })
-  }
-}
-
-/**
- * 设置认证信息
- * @param auth {Object}
- * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
- */
-function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      Cookie.set(xsrfHeaderName, 'Bearer ' + auth.token, { expires: auth.expireAt })
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 移出认证信息
- * @param authType {AUTH_TYPE} 认证类型
- */
-function removeAuthorization (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      Cookie.remove(xsrfHeaderName)
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-
-/**
- * 检查认证信息
- * @param authType
- * @returns {boolean}
- */
-function checkAuthorization (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      if (Cookie.get(xsrfHeaderName)) {
-        return true
-      }
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-  return false
-}
-
-/**
- * 加载 axios 拦截器
- * @param interceptors
- * @param options
- */
-function loadInterceptors () {
-  // 加载请求拦截器
-  axios.interceptors.request.use(config => {
-    const token = localStorage.getItem(ACCESS_TOKEN)
-    // 如果 token 存在
-    // 让每个请求携带自定义 token 请根据实际情况自行修改
-    if (token) {
-      config.headers['Access-Token'] = token
-    }
-    if (!config.headers['Content-Type']) {
-      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
-    }
-    return config
-  }, errorHandler)
-  // 加载响应拦截器
-  axios.interceptors.response.use((response) => {
-    return response.data
-  }, errorHandler)
-}
-
-// 异常拦截处理器
-const errorHandler = (error) => {
-  if (error.response) {
-    const data = error.response.data
-    // 从 localstorage 获取 token
-    const token = localStorage.getItem(ACCESS_TOKEN)
-    if (error.response.status === 403) {
-      notification.error({
-        message: '禁止访问',
-        description: data
-      })
-    } else if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
-      notification.error({
-        message: '鉴权失败',
-        description: data
-      })
-      if (token) {
-        Vue.$store.dispatch('Logout').then(() => {
-          setTimeout(() => {
-            window.location.reload()
-          }, 1500)
-        })
-      }
-    } else if (error.response.status === 500) {
-      notification.error({
-        message: '系统异常',
-        description: data
-      })
-    } else {
-      notification.error({
-        message: '数据异常',
-        description: data
-      })
-    }
-  }
-  return Promise.reject(error)
-}
-
-/**
- * 解析 url 中的参数
- * @param url
- * @returns {Object}
- */
-function parseUrlParams (url) {
-  const params = {}
-  if (!url || url === '' || typeof url !== 'string') {
-    return params
-  }
-  const paramsStr = url.split('?')[1]
-  if (!paramsStr) {
-    return params
-  }
-  const paramsArr = paramsStr.replace(/&|=/g, ' ').split(' ')
-  for (let i = 0; i < paramsArr.length / 2; i++) {
-    const value = paramsArr[i * 2 + 1]
-    params[paramsArr[i * 2]] = value === 'true' ? true : (value === 'false' ? false : value)
-  }
-  return params
-}
-
-export {
-  METHOD,
-  AUTH_TYPE,
-  request,
-  setAuthorization,
-  removeAuthorization,
-  checkAuthorization,
-  loadInterceptors,
-  parseUrlParams
-}
+import axios from 'axios'
+import Cookie from 'js-cookie'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import notification from 'ant-design-vue/es/notification'
+
+// 跨域认证信息 header 名
+const xsrfHeaderName = 'Authorization'
+
+axios.defaults.timeout = 5000
+axios.defaults.withCredentials = true
+axios.defaults.xsrfHeaderName = xsrfHeaderName
+axios.defaults.xsrfCookieName = xsrfHeaderName
+
+// 认证类型
+const AUTH_TYPE = {
+  BEARER: 'Bearer',
+  BASIC: 'basic',
+  AUTH1: 'auth1',
+  AUTH2: 'auth2'
+}
+
+// http method
+const METHOD = {
+  GET: 'get',
+  POST: 'post'
+}
+
+/**
+ * axios请求
+ * @param url 请求地址
+ * @param method {METHOD} http method
+ * @param params 请求参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+async function request (url, method, params, config) {
+  switch (method) {
+    case METHOD.GET:
+      return axios.get(url, { params, ...config })
+    case METHOD.POST:
+      return axios.post(url, params, config)
+    default:
+      return axios.get(url, { params, ...config })
+  }
+}
+
+/**
+ * 设置认证信息
+ * @param auth {Object}
+ * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
+ */
+function setAuthorization (auth, authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.set(xsrfHeaderName, 'Bearer ' + auth.token, { expires: auth.expireAt })
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
+/**
+ * 移出认证信息
+ * @param authType {AUTH_TYPE} 认证类型
+ */
+function removeAuthorization (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.remove(xsrfHeaderName)
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
+/**
+ * 检查认证信息
+ * @param authType
+ * @returns {boolean}
+ */
+function checkAuthorization (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      if (Cookie.get(xsrfHeaderName)) {
+        return true
+      }
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+  return false
+}
+
+/**
+ * 加载 axios 拦截器
+ * @param interceptors
+ * @param options
+ */
+function loadInterceptors () {
+  // 加载请求拦截器
+  axios.interceptors.request.use(config => {
+    const token = localStorage.getItem(ACCESS_TOKEN)
+    // 如果 token 存在
+    // 让每个请求携带自定义 token 请根据实际情况自行修改
+    if (token) {
+      config.headers['Access-Token'] = token
+    }
+    if (!config.headers['Content-Type']) {
+      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+    }
+    return config
+  }, errorHandler)
+  // 加载响应拦截器
+  axios.interceptors.response.use((response) => {
+    return response.data
+  }, errorHandler)
+}
+
+// 异常拦截处理器
+const errorHandler = (error) => {
+  if (error.response) {
+    const data = error.response.data
+    // 从 localstorage 获取 token
+    const token = localStorage.getItem(ACCESS_TOKEN)
+    if (error.response.status === 403) {
+      notification.error({
+        message: '禁止访问',
+        description: data
+      })
+    } else if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
+      notification.error({
+        message: '鉴权失败',
+        description: data
+      })
+      if (token) {
+        Vue.$store.dispatch('Logout').then(() => {
+          setTimeout(() => {
+            window.location.reload()
+          }, 1500)
+        })
+      }
+    } else if (error.response.status === 500) {
+      notification.error({
+        message: '系统异常',
+        description: data
+      })
+    } else {
+      notification.error({
+        message: '数据异常',
+        description: data
+      })
+    }
+  }
+  return Promise.reject(error)
+}
+
+/**
+ * 解析 url 中的参数
+ * @param url
+ * @returns {Object}
+ */
+function parseUrlParams (url) {
+  const params = {}
+  if (!url || url === '' || typeof url !== 'string') {
+    return params
+  }
+  const paramsStr = url.split('?')[1]
+  if (!paramsStr) {
+    return params
+  }
+  const paramsArr = paramsStr.replace(/&|=/g, ' ').split(' ')
+  for (let i = 0; i < paramsArr.length / 2; i++) {
+    const value = paramsArr[i * 2 + 1]
+    params[paramsArr[i * 2]] = value === 'true' ? true : (value === 'false' ? false : value)
+  }
+  return params
+}
+
+export {
+  METHOD,
+  AUTH_TYPE,
+  request,
+  setAuthorization,
+  removeAuthorization,
+  checkAuthorization,
+  loadInterceptors,
+  parseUrlParams
+}

package/src/utils/routerUtil.js

@@ -1,8 +1,8 @@
-import routerMap from '@/router/async/router.map'
-import { mergeI18nFromRoutes } from '@/utils/i18n'
+import routerMap from '@vue2-client/router/async/router.map'
+import { mergeI18nFromRoutes } from '@vue2-client/utils/i18n'
 import Router from 'vue-router'
 import deepMerge from 'deepmerge'
-import basicOptions from '@/router/async/config.async'
+import basicOptions from '@vue2-client/router/async/config.async'
 
 // 应用配置
 const appOptions = {
@@ -22,6 +22,19 @@ function setAppOptions (options) {
   appOptions.i18n = i18n
 }
 
+// 应用路由资源
+const appRouterMap = {
+  routerMap: routerMap
+}
+
+/**
+ * 设置应用路由资源
+ * @param options
+ */
+function setAppRouterMap (router) {
+  appRouterMap.routerMap = Object.assign(appRouterMap.routerMap, router)
+}
+
 /**
  * 根据 路由配置 和 路由组件注册 解析路由
  * @param routesConfig 路由配置
@@ -132,7 +145,7 @@ function loadRoutes (routesConfig) {
   const asyncRoutes = store.state.setting.asyncRoutes
   if (asyncRoutes) {
     if (routesConfig && routesConfig.length > 0) {
-      const routes = parseRoutes(routesConfig, routerMap)
+      const routes = parseRoutes(routesConfig, appRouterMap.routerMap)
       const finalRoutes = mergeRoutes(basicOptions.routes, routes)
       formatRoutes(finalRoutes)
       router.options = { ...router.options, routes: finalRoutes }
@@ -350,4 +363,4 @@ function arrRemoveEmpty (arr) {
   return arr
 }
 
-export { parseRoutes, loadRoutes, formatAuthority, getI18nKey, loadGuards, deepMergeRoutes, formatRoutes, setAppOptions, funcToRouter }
+export { parseRoutes, loadRoutes, formatAuthority, getI18nKey, loadGuards, deepMergeRoutes, formatRoutes, setAppOptions, funcToRouter, setAppRouterMap }

package/tests/unit/ReportTable.spec.js

@@ -1,15 +1,15 @@
-import { mount } from '@vue/test-utils'
-import ReportTable from '@/pages/report/ReportTable'
-import { reportData } from '@/mock/common/reportData'
-
-// 报表组件测试域
-describe('ReportTable', () => {
-  it('render', () => {
-    const wrapper = mount(ReportTable, {
-      propsData: {
-        tableData: reportData
-      }
-    })
-    expect(wrapper.find('#ReportTableHome')).not.toBeNull()
-  })
-})
+import { mount } from '@vue/test-utils'
+import ReportTable from '@vue2-client/pages/report/ReportTable'
+import { reportData } from '@vue2-client/mock/common/reportData'
+
+// 报表组件测试域
+describe('ReportTable', () => {
+  it('render', () => {
+    const wrapper = mount(ReportTable, {
+      propsData: {
+        tableData: reportData
+      }
+    })
+    expect(wrapper.find('#ReportTableHome')).not.toBeNull()
+  })
+})