vue2-client 1.0.0 → 1.1.0

package/README.md

@@ -7,9 +7,17 @@
 ```javascript
 import Vue from 'vue'
 import App from './App.vue'
-import { router, store, i18n, message, bootstrap } from './index'
+import Router from 'vue-router'
+import Vuex from 'vuex'
+import '@/mock'
+import { routerOptions, modules, i18n, message, bootstrap } from 'vue2-client/index'
+
+Vue.use(Router)
+Vue.use(Vuex)
+// 创建router store
+const store = new Vuex.Store({ modules })
+const router = new Router(routerOptions)
 
-// router, store 可在执行bootstrap函数前自行合并
 bootstrap({ router, store, i18n, message })
 new Vue({
   router,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/plugins/GetLoginInfoService.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import { SEARCH } from '@/services/api'
 import { post } from '@/services/api/restTools'
-import store from '@/store'
 
 const loginGen = async function (response) {
   Vue.$login.f = response
@@ -11,7 +10,7 @@ const loginGen = async function (response) {
     jwt: Vue.$login.f.id,
     r: Vue.$login.r
   }
-  store.commit('account/setLogin', login)
+  Vue.$store.commit('account/setLogin', login)
 }
 
 /**

package/src/bootstrap.js

@@ -1,25 +1,27 @@
-import { loadRoutes, loadGuards, setAppOptions } from '@/utils/routerUtil'
-import { loadInterceptors } from '@/utils/request'
-import guards from '@/router/guards'
-import interceptors from '@/utils/axios-interceptors'
-
-/**
- * 启动引导方法
- * 应用启动时需要执行的操作放在这里
- * @param router 应用的路由实例
- * @param store 应用的 vuex.store 实例
- * @param i18n 应用的 vue-i18n 实例
- * @param i18n 应用的 message 实例
- */
-function bootstrap ({ router, store, i18n, message }) {
-  // 设置应用配置
-  setAppOptions({ router, store, i18n })
-  // 加载 axios 拦截器
-  loadInterceptors(interceptors, { router, store, i18n, message })
-  // 加载路由
-  loadRoutes()
-  // 加载路由守卫
-  loadGuards(guards, { router, store, i18n, message })
-}
-
-export default bootstrap
+import Vue from 'vue'
+import { loadRoutes, loadGuards, setAppOptions } from '@/utils/routerUtil'
+import { loadInterceptors } from '@/utils/request'
+import guards from '@/router/guards'
+import interceptors from '@/utils/axios-interceptors'
+
+/**
+ * 启动引导方法
+ * 应用启动时需要执行的操作放在这里
+ * @param router 应用的路由实例
+ * @param store 应用的 vuex.store 实例
+ * @param i18n 应用的 vue-i18n 实例
+ * @param i18n 应用的 message 实例
+ */
+function bootstrap ({ router, store, i18n, message }) {
+  Vue.$store = store
+  // 设置应用配置
+  setAppOptions({ router, store, i18n })
+  // 加载 axios 拦截器
+  loadInterceptors(interceptors, { router, store, i18n, message })
+  // 加载路由
+  loadRoutes()
+  // 加载路由守卫
+  loadGuards(guards, { router, store, i18n, message })
+}
+
+export default bootstrap

package/src/index.js

@@ -1,18 +1,17 @@
 import Vue from 'vue'
 import { initRouter } from './router'
 import { initI18n } from './utils/i18n'
-import store from './store'
-import Antd from 'ant-design-vue'
-import Viser from 'viser-vue'
-
+import bootstrap from './bootstrap'
+import { modules } from './store'
 import './theme/index.less'
 import './base-client/all'
 import './utils/filter'
-import bootstrap from './bootstrap'
 import 'animate.css/source/animate.css'
 import 'moment/locale/zh-cn'
+import Antd from 'ant-design-vue'
+import Viser from 'viser-vue'
 
-const router = initRouter(store.state.setting.asyncRoutes)
+const routerOptions = initRouter(modules.setting.state.asyncRoutes)
 const i18n = initI18n('CN', 'US')
 
 Vue.use(Antd)
@@ -21,8 +20,8 @@ Vue.config.productionTip = false
 const message = Vue.prototype.$message
 
 export {
-  router,
-  store,
+  routerOptions,
+  modules,
   i18n,
   message,
   bootstrap

package/src/main.js

@@ -1,7 +1,15 @@
 import Vue from 'vue'
 import App from './App.vue'
+import Router from 'vue-router'
+import Vuex from 'vuex'
 import '@/mock'
-import { router, store, i18n, message, bootstrap } from './index'
+import { routerOptions, modules, i18n, message, bootstrap } from './index'
+
+Vue.use(Router)
+Vue.use(Vuex)
+// 创建router store
+const store = new Vuex.Store({ modules })
+const router = new Router(routerOptions)
 
 bootstrap({ router, store, i18n, message })
 new Vue({

package/src/router/index.js

@@ -1,31 +1,27 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import { formatRoutes } from '@/utils/routerUtil'
-
-Vue.use(Router)
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {VueRouter}
- */
-function initRouter (isAsync) {
-  const options = isAsync ? require('./async/config.async').default : require('./config').default
-  formatRoutes(options.routes)
-  return new Router(options)
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = isAsync ? require('./async/config.async').default : require('./config').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/store/index.js

@@ -1,8 +1,5 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import modules from './modules'
-
-Vue.use(Vuex)
-const store = new Vuex.Store({ modules })
-
-export default store
+import modules from './modules'
+
+export {
+  modules
+}

package/src/utils/request.js

@@ -1,197 +1,197 @@
-import axios from 'axios'
-import Cookie from 'js-cookie'
-import store from '@/store'
-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) {
-        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 '@/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/webpack.config.js

@@ -0,0 +1,12 @@
+'use strict'
+const path = require('path')
+
+module.exports = {
+  context: path.resolve(__dirname, './'),
+  resolve: {
+    extensions: ['.js', '.vue', '.json'],
+    alias: {
+      '@': path.resolve('src')
+    }
+  }
+}