vue2-client 1.7.0 → 1.7.2

package/src/router/async/router.map.js

@@ -1,66 +1,66 @@
-const { homePage } = require('../../config')
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: homePage,
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+const { homePage } = require('../../config')
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 系统设置
+routerResource.settings = () => import('@vue2-client/pages/system/settings')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: homePage,
+    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/router/guards.js

@@ -3,6 +3,11 @@ import { loginIgnore } from '@vue2-client/router/index'
 import { checkAuthorization } from '@vue2-client/utils/request'
 import NProgress from 'nprogress'
 import { logout } from '@vue2-client/services/user'
+import {
+  startLogin,
+  checkSingleAuthorization,
+} from '@vue2-client/utils/login'
+import AES from '@vue2-client/utils/EncryptUtil'
 
 NProgress.configure({ showSpinner: false })
 
@@ -28,19 +33,54 @@ const progressStart = (to, from, next) => {
  * @param options
  */
 const loginGuard = (to, from, next, options) => {
-  const { store, message } = options
-  if ((!loginIgnore.includes(to) || to.name === '404') && !checkAuthorization()) {
-    message.warning('登录已失效，请重新登录')
-    next({ path: '/login' })
+  const urlParams = new URLSearchParams(window.location.search)
+  const token = urlParams.get('token')
+  if (token) {
+    const { AESDecrypt } = AES
+    const info = AESDecrypt(token, '3KMKqvgwR8ULbR8Z')
+    const { store, message, router } = options
+    if (
+      (!loginIgnore.includes(to) || to.name === '404') &&
+      !checkSingleAuthorization()
+    ) {
+      startLogin({
+        ...info,
+        pathname: window.location.pathname,
+        store,
+        router,
+      })
+    } else {
+      const roles = store.getters['account/roles']
+      const user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
+      const setUser = store._mutations['account/setUser'][0]
+      setUser(user)
+      if (roles.length === 0 && !loginIgnore.includes(to)) {
+        message.warning('登录已失效，请重新登录')
+        logout().finally((res) => {
+          next({ path: '/login' })
+        })
+      } else {
+        next()
+      }
+    }
   } else {
-    const roles = store.getters['account/roles']
-    if (roles.length === 0 && !loginIgnore.includes(to)) {
+    const { store, message } = options
+    if (
+      (!loginIgnore.includes(to) || to.name === '404') &&
+      !checkAuthorization()
+    ) {
       message.warning('登录已失效，请重新登录')
-      logout().finally(res => {
-        next({ path: '/login' })
-      })
+      next({ path: '/login' })
     } else {
-      next()
+      const roles = store.getters['account/roles']
+      if (roles.length === 0 && !loginIgnore.includes(to)) {
+        message.warning('登录已失效，请重新登录')
+        logout().finally((res) => {
+          next({ path: '/login' })
+        })
+      } else {
+        next()
+      }
     }
   }
 }
@@ -84,7 +124,7 @@ const redirectGuard = (to, from, next, options) => {
   }
   if (store.state.setting.layout === 'mix') {
     const firstMenu = store.getters['setting/firstMenu']
-    if (firstMenu.find(item => item.fullPath === to.fullPath)) {
+    if (firstMenu.find((item) => item.fullPath === to.fullPath)) {
       store.commit('setting/setActivatedFirst', to.fullPath)
       const subMenu = store.getters['setting/subMenu']
       if (subMenu.length > 0) {
@@ -109,5 +149,5 @@ const progressDone = () => {
 
 export default {
   beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
-  afterEach: [progressDone]
+  afterEach: [progressDone],
 }

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/submitTicket'], // 根据路由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 = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/submitTicket'], // 根据路由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 = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/services/api/DictionaryDetailsViewApi.js

@@ -1,6 +1,6 @@
-const DictionaryDetailsViewApi = {
-  // 查询：获取字典详情
-  getDictionaryDetails: '/api/system/logic/getDictionaryDetails'
-}
-
-export { DictionaryDetailsViewApi }
+const DictionaryDetailsViewApi = {
+  // 查询：获取字典详情
+  getDictionaryDetails: '/api/system/logic/getDictionaryDetails'
+}
+
+export { DictionaryDetailsViewApi }

package/src/services/api/LogDetailsViewApi.js

@@ -1,10 +1,10 @@
-const LogDetailsViewApi = {
-  // 查询：获取日志详情
-  getLogDetails: '/api/system/logic/foreignaidGetLogDetails',
-  // 查询：获取日志维护记录
-  getLogRecordList: '/api/system/logic/foreignaidGetRecordList',
-  // 操作：更新日志状态
-  updateLogStatusData: '/api/system/logic/foreignaidUpdateLogStatus'
-}
-
-export { LogDetailsViewApi }
+const LogDetailsViewApi = {
+  // 查询：获取日志详情
+  getLogDetails: '/api/system/logic/foreignaidGetLogDetails',
+  // 查询：获取日志维护记录
+  getLogRecordList: '/api/system/logic/foreignaidGetRecordList',
+  // 操作：更新日志状态
+  updateLogStatusData: '/api/system/logic/foreignaidUpdateLogStatus'
+}
+
+export { LogDetailsViewApi }

package/src/services/api/QueryParamsDetailsViewApi.js

@@ -1,6 +1,6 @@
-const QueryParamsDetailsViewApi = {
-  // 查询：获取查询配置详情
-  getQueryParamsDetails: '/api/system/logic/getQueryParamsDetails'
-}
-
-export { QueryParamsDetailsViewApi }
+const QueryParamsDetailsViewApi = {
+  // 查询：获取查询配置详情
+  getQueryParamsDetails: '/api/system/logic/getQueryParamsDetails'
+}
+
+export { QueryParamsDetailsViewApi }

package/src/services/api/TicketDetailsViewApi.js

@@ -1,34 +1,34 @@
-const TicketDetailsViewApi = {
-  // 查询：获取工单流转详情
-  getTicketWorkFlowDetails: '/api/system/logic/getTicketWorkFlowDetails',
-  // 查询：获取工单详情
-  getTicketDetails: '/api/system/logic/getTicketDetails',
-  // 手动关闭工单
-  manualCloseTicket: '/api/system/logic/manualCloseTicket',
-  // 转交工单给其他人
-  transferTicketToOthers: '/api/system/logic/transferTicketToOthers',
-  // 确认工单，开始处理
-  confirmTicket: '/api/system/logic/confirmTicket',
-  // 查询：获取订单详情用于订单追踪
-  getTicketDetailsForUploader: '/api/system/logic/getTicketDetailsForUploader',
-  // 更新：将工单优先级增加
-  rushTicket: '/api/system/logic/rushTicket',
-  // 客户手动关闭工单
-  manualCloseTicketByCustomer: '/api/system/logic/manualCloseTicketByCustomer',
-  // 在工单提交页面删除照片
-  revocationImage: '/api/system/logic/revocationImage',
-  // 在工单提交页面删除照片
-  getTicketImages: '/api/system/logic/getTicketImages',
-  // 用户填写附加信息时取消了操作，将已上传的照片清空
-  removeAllImages: '/api/system/logic/removeAllImages',
-  // 提交用户填写附加信息
-  AddonDescriptionToTicket: '/api/system/logic/AddonDescriptionToTicket',
-  // 获取用户填写附加信息
-  getAddonDescription: '/api/system/logic/getAddonDescription',
-  // 发起售后工单流程
-  createTicket: '/api/system/logic/createTicket',
-  // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/api/system/logic/getAllEmployeeName'
-}
-
-export { TicketDetailsViewApi }
+const TicketDetailsViewApi = {
+  // 查询：获取工单流转详情
+  getTicketWorkFlowDetails: '/api/system/logic/getTicketWorkFlowDetails',
+  // 查询：获取工单详情
+  getTicketDetails: '/api/system/logic/getTicketDetails',
+  // 手动关闭工单
+  manualCloseTicket: '/api/system/logic/manualCloseTicket',
+  // 转交工单给其他人
+  transferTicketToOthers: '/api/system/logic/transferTicketToOthers',
+  // 确认工单，开始处理
+  confirmTicket: '/api/system/logic/confirmTicket',
+  // 查询：获取订单详情用于订单追踪
+  getTicketDetailsForUploader: '/api/system/logic/getTicketDetailsForUploader',
+  // 更新：将工单优先级增加
+  rushTicket: '/api/system/logic/rushTicket',
+  // 客户手动关闭工单
+  manualCloseTicketByCustomer: '/api/system/logic/manualCloseTicketByCustomer',
+  // 在工单提交页面删除照片
+  revocationImage: '/api/system/logic/revocationImage',
+  // 在工单提交页面删除照片
+  getTicketImages: '/api/system/logic/getTicketImages',
+  // 用户填写附加信息时取消了操作，将已上传的照片清空
+  removeAllImages: '/api/system/logic/removeAllImages',
+  // 提交用户填写附加信息
+  AddonDescriptionToTicket: '/api/system/logic/AddonDescriptionToTicket',
+  // 获取用户填写附加信息
+  getAddonDescription: '/api/system/logic/getAddonDescription',
+  // 发起售后工单流程
+  createTicket: '/api/system/logic/createTicket',
+  // 查询：获取所有员工名，供前端展示备选项
+  getAllEmployeeName: '/api/system/logic/getAllEmployeeName'
+}
+
+export { TicketDetailsViewApi }

package/src/services/api/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi