Browse Source

generateRoutes

e 5 năm trước cách đây
mục cha
commit
177ff108cb
3 tập tin đã thay đổi với 8 bổ sung8 xóa
  1. 2 2
      src/permission.js
  2. 4 4
      src/store/modules/permission.js
  3. 2 2
      src/store/modules/user.js

+ 2 - 2
src/permission.js

@@ -34,10 +34,10 @@ router.beforeEach(async(to, from, next) => {
         try {
           // get user info
           // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
-          const { roles } = await store.dispatch('user/getInfo')
+          const userInfo = await store.dispatch('user/getInfo')
 
           // generate accessible routes map based on roles
-          const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
+          const accessRoutes = await store.dispatch('permission/generateRoutes', userInfo)
 
           // dynamically add accessible routes
           router.addRoutes(accessRoutes)

+ 4 - 4
src/store/modules/permission.js

@@ -48,15 +48,15 @@ const mutations = {
 }
 
 const actions = {
-  generateRoutes({ commit }, roles) {
+  generateRoutes({ commit }, userInfo) {
     return new Promise(resolve => {
       let accessedRoutes
-      if (roles.includes('admin')) {
+      if (userInfo.roles.includes('admin')) {
         accessedRoutes = asyncRoutes || []
       } else {
-        accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)
+        accessedRoutes = filterAsyncRoutes(asyncRoutes, userInfo.roles)
       }
-      getModule({ organizeID: 1 }).then(response => {
+      getModule({ organizeID: userInfo.organizeID }).then(response => {
         const modules = response.data[0]
         accessedRoutes.forEach(routeItem => {
           if (routeItem.name === 'Goods') {

+ 2 - 2
src/store/modules/user.js

@@ -144,12 +144,12 @@ const actions = {
       commit('SET_TOKEN', token)
       setToken(token)
 
-      const { roles } = await dispatch('getInfo')
+      const userInfo = await dispatch('getInfo')
 
       resetRouter()
 
       // generate accessible routes map based on roles
-      const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
+      const accessRoutes = await dispatch('permission/generateRoutes', userInfo, { root: true })
 
       // dynamically add accessible routes
       router.addRoutes(accessRoutes)