feat(*): permissions

Author: vanoneang

src/components/layout/User.vue

@@ -270,14 +270,14 @@ export default {
         // }
         return this.$axios({
           method: 'put',
-          url: '/cms/user/avatar',
+          url: '/cms/user',
           data: {
             avatar: res[0].path,
           },
         })
           .then(putRes => {
             // eslint-disable-line
-            if (putRes.error_code === 0) {
+            if (putRes.error_code < 100) {
               this.$message({
                 type: 'success',
                 message: '更新头像成功',
@@ -325,11 +325,11 @@ export default {
                 // 触发重新获取用户信息
                 return User.getInformation()
               }
-              this.nickname = user.nickname
             })
             .then(res => {
               // eslint-disable-line
               this.setUserAndState(res)
+              this.nickname = res.nickname
             })
         }
       }

src/lin/directives/authorize.js

@@ -1,15 +1,15 @@
 import Vue from 'vue'
 import store from '@/store'
 
-function isAllowed(_auth, user, auths) {
+function isAllowed(permission, user, permissions) {
   if (user.isSuper) {
     return true
   }
-  if (typeof _auth === 'string') {
-    return auths.includes(_auth)
+  if (typeof permission === 'string') {
+    return permissions.includes(permission)
   }
-  if (_auth instanceof Array) {
-    return _auth.some(auth => auths.indexOf(auth) >= 0)
+  if (permission instanceof Array) {
+    return permission.some(auth => permissions.indexOf(auth) >= 0)
   }
   return false
 }
@@ -26,7 +26,7 @@ Vue.directive('auth', {
     } else {
       auth = binding.value
     }
-    const isAllow = isAllowed(auth, store.state.user || {}, store.state.auths)
+    const isAllow = isAllowed(auth, store.state.user || {}, store.state.permissions)
     const element = el
     if (!isAllow && auth) {
       if (type) {

src/lin/mixin/index.js

@@ -13,12 +13,12 @@ const globalMixin = {
         isAllowed(_auth) {
           /* eslint-disable no-restricted-syntax */
           /* eslint-disable guard-for-in */
-          const { auths } = this.user
-          for (const mod of auths) {
+          const { permissions } = this.user
+          for (const mod of permissions) {
             for (const item in mod) {
               for (const a of mod[item]) {
                 // console.log(a.auth)
-                if (a.auth === _auth) {
+                if (a.permission === _auth) {
                   return true
                 }
                 // console.log(a.module)

src/lin/models/user.js

@@ -1,18 +1,17 @@
 import { post, get, put } from '@/lin/plugins/axios'
 import { saveTokens } from '../utils/token'
 
-// const SUPER_VALUE = 2
-const ACTIVE_VALUE = 1
-
 export default class User {
-  // 当前用户是否在激活状态
-  isActive = null
+  // 昵称
+  nickname = null
 
   // 邮箱
   email = null
 
-  // 权限分组id
-  groupId = null
+  avatar = null // 头像
+
+  // 所属分组信息
+  groups = []
 
   // 用户名
   username = null
@@ -21,24 +20,16 @@ export default class User {
   isSuper = null
 
   // 拥有的权限
-  auths = []
-
-  // 昵称
-  nickname = null
-
-  // 分组名称
-  groupName = null
+  permissions = []
 
-  constructor(active, email, groupId, username, admin, avatar, permissions, nickname, groupName) {
-    this.isActive = active === ACTIVE_VALUE
+  constructor(nickname, username, admin, groups, permissions, email, avatar) {
     this.email = email
-    this.groupId = groupId
+    this.groups = groups
     this.username = username
     this.avatar = avatar
     this.isSuper = admin
-    this.auths = permissions || []
+    this.permissions = permissions || []
     this.nickname = nickname
-    this.groupName = groupName
   }
 
   /**
@@ -68,35 +59,15 @@ export default class User {
    */
   static async getInformation() {
     const info = await get('cms/user/information')
-    return new User(
-      info.active,
-      info.email,
-      info.group_id,
-      info.username,
-      info.admin,
-      info.avatar,
-      info.auths,
-      info.nickname,
-      info.group_name,
-    )
+    return new User(info.nickname, info.username, info.admin, info.groups, info.permissions, info.email, info.avatar)
   }
 
   /**
    * 获取当前用户信息和所拥有的权限
    */
-  static async getAuths() {
+  static async getPermissions() {
     const info = await get('cms/user/permissions')
-    return new User(
-      info.active,
-      info.email,
-      info.group_id,
-      info.username,
-      info.admin,
-      info.avatar,
-      info.auths,
-      info.nickname,
-      info.group_name,
-    )
+    return new User(info.nickname, info.username, info.admin, info.groups, info.permissions, info.email, info.avatar)
   }
 
   /**

src/store/getters.js

@@ -40,12 +40,12 @@ function IterationDelateMenuChildren(arr) {
   return arr
 }
 
-function permissionShaking(stageConfig, auths, currentUser) {
+function permissionShaking(stageConfig, permissions, currentUser) {
   // eslint-disable-line
   const shookConfig = stageConfig.filter(route => {
-    if (Util.hasPermission(auths, route, currentUser)) {
+    if (Util.hasPermission(permissions, route, currentUser)) {
       if (route.children && route.children.length) {
-        route.children = permissionShaking(route.children, auths, currentUser) // eslint-disable-line
+        route.children = permissionShaking(route.children, permissions, currentUser) // eslint-disable-line
       }
       return true
     }
@@ -56,9 +56,9 @@ function permissionShaking(stageConfig, auths, currentUser) {
 
 // 获取有权限的舞台配置
 export const authStageConfig = state => {
-  const { stageConfig, auths, user } = state // eslint-disable-line
+  const { stageConfig, permissions, user } = state // eslint-disable-line
   const tempStageConfig = Util.deepClone(stageConfig)
-  const shookConfig = permissionShaking(tempStageConfig, auths, user)
+  const shookConfig = permissionShaking(tempStageConfig, permissions, user)
 
   // 设置舞台缓存
   const list = {}
@@ -159,7 +159,7 @@ export const getStageByRoute = () => {
 
 export const stageList = () => stageMap
 
-export const auths = state => state.auths
+export const permissions = state => state.permissions
 
 export const getStageInfo = state => {
   const { stageConfig } = state

src/store/index.js

@@ -14,7 +14,7 @@ const vuexLocal = new VuexPersistence({
     // eslint-disable-line
     logined: stateData.logined,
     user: stateData.user,
-    auths: stateData.auths,
+    permissions: stateData.permissions,
   }),
 })
 

src/store/mutation-types.js

@@ -10,6 +10,6 @@ export const REMOVE_UNREAD_MESSAGE = 'REMOVE_UNREAD_MESSAGE'
 
 export const ADD_UNREAD_MESSAGE = 'ADD_UNREAD_MESSAGE'
 
-export const SET_USER_AUTHS = 'SET_USER_AUTHS'
+export const SET_USER_PERMISSIONS = 'SET_USER_PERMISSIONS'
 
 export const SET_REFERSH_OPTION = 'SET_REFERSH_OPTION'

src/store/mutations.js

@@ -13,6 +13,13 @@ export default {
 
   [types.SET_USER](state, payload) {
     state.user = payload
+    // state.user.avatar = payload.avatar ? payload.avatar : ''
+    // state.user.email = payload.email ? payload.email : ''
+    // state.user.isSuper = payload.isSuper ? payload.isSuper : false
+    // state.user.nickname = payload.nickname ? payload.nickname : '佚名'
+    // state.user.groups = payload.groups ? payload.groups : []
+    // state.user.permissions = payload.permissions ? payload.permissions : []
+    // state.user.username = payload.username ? payload.username : ''
   },
 
   [types.ADD_READED_MESSAGE](state, payload) {
@@ -31,17 +38,17 @@ export default {
     unreadMessages.splice(index, 1)
   },
 
-  [types.SET_USER_AUTHS](state, auths) {
-    const _auths = []
-    for (let i = 0; i < auths.length; i++) {
-      for (const key in auths[i]) {
-        // console.log(i, state.user.auths[i][key])
-        for (let j = 0; j < auths[i][key].length; j++) {
-          _auths.push(auths[i][key][j].auth)
+  [types.SET_USER_PERMISSIONS](state, permissions) {
+    const _permissions = []
+    for (let i = 0; i < permissions.length; i++) {
+      for (const key in permissions[i]) {
+        // console.log(i, state.user.permissions[i][key])
+        for (let j = 0; j < permissions[i][key].length; j++) {
+          _permissions.push(permissions[i][key][j].permission)
         }
       }
     }
-    state.auths = _auths
+    state.permissions = _permissions
   },
 
   [types.SET_REFERSH_OPTION](state, option) {

src/store/state.js

@@ -10,7 +10,7 @@ export default {
   // 推送消息
   readedMessages: [],
   unreadMessages: [],
-  auths: [], // 每个用户的所有权限
+  permissions: [], // 每个用户的所有权限
 
   // 舞台配置
   stageConfig,

src/views/admin/user/UserList.vue

@@ -107,7 +107,7 @@ export default {
         this.loading = true
         res = await Admin.getAdminUsers({ group_id: this.group_id, count: this.pageCount, page: currentPage }) // eslint-disable-line
         this.loading = false
-        this.tableData = [...res.items]
+        this.tableData = this.shuffleList(res.items)
         this.total_nums = res.total
       } catch (e) {
         this.loading = false
@@ -244,11 +244,23 @@ export default {
         })
       }
     },
+    shuffleList(users) {
+      const list = []
+      users.forEach(element => {
+        const groups = []
+        element.groups.forEach(item => {
+          groups.push(item.name)
+        })
+        element.groupNames = groups.join(',')
+        list.push(element)
+      })
+      return list
+    },
   },
   async created() {
     await this.getAdminUsers()
     this.getAllGroups()
-    this.tableColumn = [{ prop: 'username', label: '名称' }, { prop: 'group_name', label: '所属分组' }] // 设置表头信息
+    this.tableColumn = [{ prop: 'username', label: '名称' }, { prop: 'groupNames', label: '所属分组' }] // 设置表头信息
     this.operate = [
       { name: '编辑', func: 'handleEdit', type: 'primary' },
       { name: '删除', func: 'handleDelete', type: 'danger' },