前后端全面升级

cmdb-ui/src/store/global/app.js

@@ -10,11 +10,10 @@ import {
   DEFAULT_FIXED_HEADER_HIDDEN,
   DEFAULT_CONTENT_WIDTH_TYPE,
   DEFAULT_MULTI_TAB
-} from '@/store/mutation-types'
+} from '@/store/global/mutation-types'
 
 const app = {
   state: {
-    name: 'cmdb',
     sidebar: true,
     device: 'desktop',
     theme: '',
@@ -25,7 +24,8 @@ const app = {
     autoHideHeader: true,
     color: null,
     weak: false,
-    multiTab: false
+    multiTab: false,
+
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -75,48 +75,49 @@ const app = {
     TOGGLE_MULTI_TAB: (state, bool) => {
       Vue.ls.set(DEFAULT_MULTI_TAB, bool)
       state.multiTab = bool
-    }
+    },
+
   },
   actions: {
-    setSidebar ({ commit }, type) {
+    setSidebar({ commit }, type) {
       commit('SET_SIDEBAR_TYPE', type)
     },
-    CloseSidebar ({ commit }) {
+    CloseSidebar({ commit }) {
       commit('CLOSE_SIDEBAR')
     },
-    ToggleDevice ({ commit }, device) {
+    ToggleDevice({ commit }, device) {
       commit('TOGGLE_DEVICE', device)
     },
-    ToggleTheme ({ commit }, theme) {
+    ToggleTheme({ commit }, theme) {
       commit('TOGGLE_THEME', theme)
     },
-    ToggleLayoutMode ({ commit }, mode) {
+    ToggleLayoutMode({ commit }, mode) {
       commit('TOGGLE_LAYOUT_MODE', mode)
     },
-    ToggleFixedHeader ({ commit }, fixedHeader) {
+    ToggleFixedHeader({ commit }, fixedHeader) {
       if (!fixedHeader) {
         commit('TOGGLE_FIXED_HEADER_HIDDEN', false)
       }
       commit('TOGGLE_FIXED_HEADER', fixedHeader)
     },
-    ToggleFixSiderbar ({ commit }, fixSiderbar) {
+    ToggleFixSiderbar({ commit }, fixSiderbar) {
       commit('TOGGLE_FIXED_SIDERBAR', fixSiderbar)
     },
-    ToggleFixedHeaderHidden ({ commit }, show) {
+    ToggleFixedHeaderHidden({ commit }, show) {
       commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
     },
-    ToggleContentWidth ({ commit }, type) {
+    ToggleContentWidth({ commit }, type) {
       commit('TOGGLE_CONTENT_WIDTH', type)
     },
-    ToggleColor ({ commit }, color) {
+    ToggleColor({ commit }, color) {
       commit('TOGGLE_COLOR', color)
     },
-    ToggleWeak ({ commit }, weakFlag) {
+    ToggleWeak({ commit }, weakFlag) {
       commit('TOGGLE_WEAK', weakFlag)
     },
-    ToggleMultiTab ({ commit }, bool) {
+    ToggleMultiTab({ commit }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
-    }
+    },
   }
 }
 

cmdb-ui/src/store/global/getters.js

@@ -5,11 +5,14 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   nickname: state => state.user.name,
+  username: state => state.user.username,
+  uid: state => state.user.uid,
+  rid: state => state.user.rid,
   welcome: state => state.user.welcome,
   roles: state => state.user.roles,
   userInfo: state => state.user.info,
-  addRouters: state => state.permission.addRouters,
-  multiTab: state => state.app.multiTab
+  appRoutes: state => state.routes.appRoutes,
+  multiTab: state => state.app.multiTab,
 }
 
 export default getters

cmdb-ui/src/store/global/logo.js

@@ -0,0 +1,31 @@
+import { getCompanyInfo } from '@/api/company'
+
+const logo = {
+    state: {
+        file_name: '',
+        small_file_name: ''
+    },
+    mutations: {
+        SET_FILENAME: (state, name) => {
+            state.file_name = name
+        },
+        SET_SMALL_FILENAME: (state, name) => {
+            state.small_file_name = name
+        }
+    },
+    actions: {
+        getCompanyInfo({ commit }) {
+            return new Promise((resolve, reject) => {
+                getCompanyInfo().then(res => {
+                    commit('SET_FILENAME', res.info.logoName)
+                    commit('SET_SMALL_FILENAME', res.info.smallLogoName)
+                    resolve(res.info)
+                }).catch(err => {
+                    console.log('获取失败', err)
+                    reject(err)
+                })
+            })
+        }
+    }
+}
+export default logo

cmdb-ui/src/store/global/notice.js

@@ -0,0 +1,17 @@
+const notice = {
+    state: {
+        totalUnreadNum: 0,
+        appUnreadNum: []
+    },
+    mutations: {
+        SET_TOTAL_UNREAD_NUM: (state, totalUnreadNum) => {
+            state.totalUnreadNum = totalUnreadNum
+        },
+        SET_APP_UNREAD_NUM: (state, appUnreadNum) => {
+            state.appUnreadNum = appUnreadNum
+        },
+    },
+    actions: {
+    }
+}
+export default notice

cmdb-ui/src/store/global/routes.js

@@ -0,0 +1,67 @@
+import { generatorDynamicRouter, constantRouterMap } from '@/router/config'
+import user from './user'
+/**
+ * 过滤账户是否拥有某一个权限，并将菜单从加载列表移除
+ *
+ * @param permission
+ * @param route
+ * @returns {boolean}
+ */
+function hasPermission(permission, route) {
+  const { detailPermissions } = user.state
+  if (route.meta && route.meta.permission) {
+    // let flag = false
+    // for (let i = 0, len = permission.length; i < len; i++) {
+    //   flag = (route.meta.permission || []).includes(permission[i])
+    //   if (flag) {
+    //     return true
+    //   }
+    // }
+    // return false
+    const totalPer = [...route.meta.appName && detailPermissions[`${route.meta.appName}`] ? detailPermissions[`${route.meta.appName}`].map(item => item.name) : [], ...permission]
+    return route.meta.permission.some(item => totalPer.includes(item))
+  }
+  return true
+}
+
+function filterAsyncRouter(routerMap, roles) {
+  return routerMap.filter(route => {
+    const default_route = ['company_info', 'company_structure', 'company_group']
+    if (default_route.includes(route.name)) {
+      return true
+    }
+    if (hasPermission(roles.permissions, route)) {
+      if (route.children && route.children.length) {
+        route.children = filterAsyncRouter(route.children, roles)
+      }
+      return true
+    }
+    return false
+  })
+}
+
+const routes = {
+  state: {
+    routers: constantRouterMap,
+    appRoutes: []
+  },
+  mutations: {
+    SET_ROUTERS: (state, routers) => {
+      state.appRoutes = routers
+      state.routers = constantRouterMap.concat(routers)
+    }
+  },
+  actions: {
+    GenerateRoutes({ commit }, data) {
+      return new Promise(resolve => {
+        const { roles } = data
+        generatorDynamicRouter().then(routers => {
+          const accessedRouters = filterAsyncRouter(routers, roles)
+          commit('SET_ROUTERS', accessedRouters)
+          resolve(accessedRouters)
+        })
+      })
+    }
+  }
+}
+export default routes

cmdb-ui/src/store/global/user.js

@@ -0,0 +1,203 @@
+import Vue from 'vue'
+import { login, getInfo, logout } from '@/api/login'
+import { ACCESS_TOKEN } from '@/store/global/mutation-types'
+import { welcome } from '@/utils/util'
+import { getAllUsers } from '../../api/login'
+import { searchPermResourceByRoleId } from '@/modules/acl/api/permission'
+import { getEmployeeByUid, getEmployeeList } from '@/api/employee'
+import { getAllDepartmentList } from '@/api/company'
+
+const user = {
+  state: {
+    token: '',
+    name: '',
+    welcome: '',
+    avatar: '',
+    uid: 0,
+    roles: [],
+    info: {},
+    authed: false,
+    allUsers: [],
+    allEmployees: [],
+    allDepartments: [],
+    detailPermissions: {
+      'backend': [
+        {
+          'name': '公司信息',
+          'permissions': ['read']
+        },
+        {
+          'name': '公司架构',
+          'permissions': ['read']
+        },
+        {
+          'name': '用户分组',
+          'permissions': ['read']
+        }
+      ]
+    },
+    username: '',
+    mobile: '',
+    department_id: undefined,
+    employee_id: undefined,
+    email: '',
+    nickname: '',
+    sex: '',
+    position_name: '',
+    direct_supervisor_id: null
+  },
+
+  mutations: {
+    SET_TOKEN: (state, token) => {
+      state.token = token
+    },
+
+    SET_USER_INFO: (state, { name, welcome, avatar, roles, info, uid, username, mobile, department_id, employee_id, email, nickname, sex, position_name, direct_supervisor_id, annual_leave }) => {
+      state.name = name
+      state.welcome = welcome
+      state.avatar = avatar
+      state.roles = roles
+      state.info = info
+      state.uid = uid
+      state.authed = true
+      state.username = username
+      state.mobile = mobile
+      state.department_id = department_id
+      state.employee_id = employee_id
+      state.email = email
+      state.nickname = nickname
+      state.sex = sex
+      state.position_name = position_name
+      state.direct_supervisor_id = direct_supervisor_id
+      state.annual_leave = annual_leave
+    },
+
+    LOAD_ALL_USERS: (state, users) => {
+      state.allUsers = users
+    },
+    LOAD_ALL_EMPLOYEES: (state, allEmployees) => {
+      state.allEmployees = allEmployees
+    },
+    LOAD_ALL_DEPARMTMENTS: (state, allDepartments) => {
+      state.allDepartments = allDepartments
+    },
+    SET_DETAIL_PERMISSIONS: (state, data) => {
+      state.detailPermissions = data.backend.length ? {
+        ...state.detailPermissions,
+        ...data
+      } : state.detailPermissions
+    },
+  },
+
+  actions: {
+    // 登录
+    Login({ commit }, userInfo) {
+      return new Promise((resolve, reject) => {
+        login(userInfo).then(response => {
+          Vue.ls.set(ACCESS_TOKEN, response.token, 7 * 24 * 60 * 60 * 1000)
+          commit('SET_TOKEN', response.token)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 获取用户信息
+    GetInfo({ commit }) {
+      return new Promise((resolve, reject) => {
+        getInfo().then(response => {
+          const result = response.result
+
+          const role = result.role
+          role.permissions = result.role.permissions
+          role.permissions.map(per => {
+            if (per.actionEntitySet != null && per.actionEntitySet.length > 0) {
+              const action = per.actionEntitySet.map(action => { return action.action })
+              per.actionList = action
+            }
+          })
+          role.permissionList = role.permissions.map(permission => { return permission })
+          searchPermResourceByRoleId(result.rid, {
+            resource_type_id: '操作权限',
+            app_id: 'backend',
+          }).then(res => {
+            commit('SET_DETAIL_PERMISSIONS', { backend: res.resources })
+            resolve(response)
+          })
+          getEmployeeByUid(result.uid).then(res => {
+            commit('SET_USER_INFO', {
+              roles: result.role,
+              info: result,
+              name: result.name,
+              welcome: welcome(),
+              avatar: result.avatar,
+              uid: result.uid,
+              username: result.username,
+              mobile: res.mobile,
+              department_id: res.department_id,
+              employee_id: res.employee_id,
+              email: res.email,
+              nickname: res.nickname,
+              sex: res.sex,
+              position_name: res.position_name,
+              direct_supervisor_id: res.direct_supervisor_id,
+              annual_leave: res.annual_leave
+            })
+          })
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 登出
+    Logout({ commit, state }) {
+      return new Promise((resolve) => {
+        commit('SET_TOKEN', '')
+        commit('SET_ROLES', [])
+        Vue.ls.remove(ACCESS_TOKEN)
+
+        logout(state.token).then(() => {
+          window.location.reload()
+          resolve()
+        }).catch(() => {
+          resolve()
+        })
+      })
+    },
+
+    loadAllUsers({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        getAllUsers({ page_size: 9999 }).then(res => {
+          commit('LOAD_ALL_USERS', res.users)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    loadAllEmployees({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        getEmployeeList({ page_size: 99999 }).then(res => {
+          commit('LOAD_ALL_EMPLOYEES', res.data_list)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    loadAllDepartments({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        getAllDepartmentList({ is_tree: 0 }).then(res => {
+          commit('LOAD_ALL_DEPARMTMENTS', res)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default user

cmdb-ui/src/store/i18n-mixin.js

@@ -1,16 +0,0 @@
-import { mapState } from 'vuex'
-
-const mixin = {
-  computed: {
-    ...mapState({
-      currentLang: state => state.i18n.lang
-    })
-  },
-  methods: {
-    setLang (lang) {
-      this.$store.dispatch('SetLang', lang)
-    }
-  }
-}
-
-export { mixin }

cmdb-ui/src/store/index.js

@@ -1,29 +1,61 @@
+/* eslint-disable */
+
 import Vue from 'vue'
 import Vuex from 'vuex'
-
-import app from './modules/app'
-import user from './modules/user'
-import i18n from './modules/i18n'
-import permission from './modules/permission'
-import getters from './getters'
+import app from './global/app'
+import user from './global/user'
+import routes from './global/routes'
+import logo from './global/logo'
+import notice from './global/notice'
+import getters from './global/getters'
+import appConfig from '@/config/app'
+console.log(appConfig)
 
 Vue.use(Vuex)
 
-export default new Vuex.Store({
+const store = new Vuex.Store({
   modules: {
     app,
     user,
-    permission,
-    i18n
+    routes,
+    logo,
+    notice
   },
   state: {
-
+    windowWidth: 800,
+    windowHeight: 600,
+    currentTime: 0,
   },
   mutations: {
-
+    SET_WINDOW_SIZE(state, { width, height }) {
+      state.windowWidth = width
+      state.windowHeight = height
+    },
+    SET_TIME: (state, time) => {
+      state.currentTime = time
+    },
   },
   actions: {
-
+    setWindowSize({ commit }) {
+      const width = window.innerWidth
+      const height = window.innerHeight
+      commit('SET_WINDOW_SIZE', { width, height })
+    },
+    setTime: ({ commit }, time) => {
+      commit('SET_TIME', time)
+    }
   },
   getters
 })
+
+appConfig.buildModules.forEach(appName => {
+  if (appName !== 'fullscreen') {
+    import(`@/modules/${appName}/index.js`).then(m => {
+      if (m.default.store) {
+        store.registerModule(m.default.store.name || m.deault.name, m.default.store)
+      }
+    })
+  }
+})
+
+export default store

cmdb-ui/src/store/modules/i18n.js

@@ -1,24 +0,0 @@
-import { loadLanguageAsync } from '@/locales'
-
-const i18n = {
-  state: {
-    lang: 'en-US'
-  },
-  mutations: {
-    SET_LANG: (state, lang) => {
-      state.lang = lang
-    }
-  },
-  actions: {
-    // Setting language
-    SetLang ({ commit }, lang) {
-      return new Promise(resolve => {
-        commit('SET_LANG', lang)
-        loadLanguageAsync(lang)
-        resolve()
-      })
-    }
-  }
-}
-
-export default i18n

cmdb-ui/src/store/modules/permission.js

@@ -1,62 +0,0 @@
-import { generatorDynamicRouter, constantRouterMap } from '@/config/router.config'
-
-/**
- * Filters if the account has a permission and removes the menu from the load list
- *
- * @param permission
- * @param route
- * @returns {boolean}
- */
-function hasPermission (permission, route) {
-  if (route.meta && route.meta.permission) {
-    let flag = false
-    for (let i = 0, len = permission.length; i < len; i++) {
-      flag = route.meta.permission.includes(permission[i])
-      if (flag) {
-        return true
-      }
-    }
-    return false
-  }
-  return true
-}
-
-function filterAsyncRouter (routerMap, roles) {
-  const accessedRouters = routerMap.filter(route => {
-    if (hasPermission(roles.permissions, route)) {
-      if (route.children && route.children.length) {
-        route.children = filterAsyncRouter(route.children, roles)
-      }
-      return true
-    }
-    return false
-  })
-  return accessedRouters
-}
-
-const permission = {
-  state: {
-    routers: constantRouterMap,
-    addRouters: []
-  },
-  mutations: {
-    SET_ROUTERS: (state, routers) => {
-      state.addRouters = routers
-      state.routers = constantRouterMap.concat(routers)
-    }
-  },
-  actions: {
-    GenerateRoutes ({ commit }, data) {
-      return new Promise(resolve => {
-        const { roles } = data
-        generatorDynamicRouter(roles).then(routers => {
-          const accessedRouters = filterAsyncRouter(routers, roles)
-          commit('SET_ROUTERS', accessedRouters)
-          resolve()
-        })
-      })
-    }
-  }
-}
-
-export default permission

cmdb-ui/src/store/modules/user.js

@@ -1,87 +0,0 @@
-import Vue from 'vue'
-import { login, getInfo, logout } from '@/api/login'
-import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { welcome } from '@/utils/util'
-
-const user = {
-  state: {
-    token: '',
-    name: '',
-    welcome: '',
-    avatar: '',
-    roles: [],
-    info: {}
-  },
-
-  mutations: {
-    SET_TOKEN: (state, token) => {
-      state.token = token
-    },
-    SET_NAME: (state, { name, welcome }) => {
-      state.name = name
-      state.welcome = welcome
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
-    },
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-    },
-    SET_INFO: (state, info) => {
-      state.info = info
-    }
-  },
-
-  actions: {
-    // login
-    Login ({ commit }, userInfo) {
-      return new Promise((resolve, reject) => {
-        login(userInfo).then(response => {
-          Vue.ls.set(ACCESS_TOKEN, response.token, 7 * 24 * 60 * 60 * 1000)
-          commit('SET_TOKEN', response.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // get user info
-    GetInfo ({ commit }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(response => {
-          const result = response.result
-
-          const role = result.role
-          role.permissions = result.role.permissions
-          role.permissions.map(per => {
-            if (per.actionEntitySet != null && per.actionEntitySet.length > 0) {
-              const action = per.actionEntitySet.map(action => { return action.action })
-              per.actionList = action
-            }
-          })
-          role.permissionList = role.permissions.map(permission => { return permission })
-          commit('SET_ROLES', result.role)
-          commit('SET_INFO', result)
-          commit('SET_NAME', { name: result.name, welcome: welcome() })
-          commit('SET_AVATAR', result.avatar)
-
-          resolve(response)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // logout
-    Logout ({ commit, state }) {
-      commit('SET_TOKEN', '')
-      commit('SET_ROLES', [])
-      Vue.ls.remove(ACCESS_TOKEN)
-      return logout(state.token)
-    }
-
-  }
-}
-
-export default user