feat(permission): dispatch

Author: vanoneang

.eslintrc.js

@@ -25,6 +25,7 @@ module.exports = {
     'class-methods-use-this': 'off',
     'consistent-return': 'off',
     'arrow-parens': ['error', 'as-needed'],
+    'no-prototype-builtins': 'off',
     'object-curly-newline': [
       'error',
       {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lin-cms",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "private": true,
   "scripts": {
     "serve": "node script/plugin-get-config.js && vue-cli-service serve",

src/components/layout/User.vue

@@ -25,11 +25,6 @@
             ></el-input>
           </div>
           <img src="../../assets/img/user/corner.png" class="corner" />
-          <div class="info">
-            <div class="username">{{ username }}</div>
-            <div class="mid">|</div>
-            <div class="desc">{{ groupName }}</div>
-          </div>
         </div>
         <ul class="dropdown-box">
           <li class="password" @click="goToCenter">
@@ -499,6 +494,8 @@ export default {
       .username {
         margin-bottom: 10px;
         font-size: 16px;
+        height: 32px;
+        line-height: 32px;
         cursor: pointer;
       }
 

src/lin/models/admin.js

@@ -125,10 +125,10 @@ export default class Admin {
     return res
   }
 
-  static async dispatchAuths(group_id, auths) {
-    const res = await post('cms/admin/dispatch/patch', {
+  static async dispatchAuths(group_id, permission_ids) {
+    const res = await post('cms/admin/permission/dispatch/batch', {
       group_id,
-      auths,
+      permission_ids,
     })
     return res
   }
@@ -141,10 +141,10 @@ export default class Admin {
     return res
   }
 
-  static async removeAuths(group_id, auths) {
-    const res = await post('cms/admin/remove', {
+  static async removeAuths(group_id, permission_ids) {
+    const res = await post('cms/admin/permission/remove', {
       group_id,
-      auths,
+      permission_ids,
     })
     return res
   }

src/views/admin/group/GroupAuths.vue

@@ -39,6 +39,7 @@ export default {
   data() {
     return {
       allAuths: {}, // 所有分组权限
+      allAuthIds: [],
       // auths: [], // 拥有的分组权限
       auth_module_name: [], // 权限组 module name
       auth_module_ids: [], // 权限组 集合 id
@@ -47,14 +48,19 @@ export default {
       loading: false,
     }
   },
+  async created() {
+    try {
+      this.loading = true
+      await this.getGroupAuths()
+      this.loading = false
+    } catch (e) {
+      this.loading = false
+      console.log(e)
+    }
+  },
   methods: {
-    // 获取全部权限
-    async getAllAuths() {
-      this.allAuths = await Admin.getAllAuths()
-    },
     // 获取分组权限
     async getGroupAuths() {
-      // this.auths = [] // 父组件 重置
       this.allAuths = await Admin.getAllAuths()
       // 通过判断有没有传入id，来判断当前页面是添加分组还是编辑分组
       if (this.id) {
@@ -64,23 +70,24 @@ export default {
         res.permissions.forEach(v => {
           this.auth_module_ids.push(v.id)
           temp.push(v.module)
+          // 每个module拥有权限个数
           if (!cache[v.module]) {
             cache[v.module] = 1
           } else {
             cache[v.module]++
           }
         })
         temp = Array.from(new Set(temp))
+        // 半选
         temp.forEach(item => {
-          if (this.allAuths[item].length === cache[item]) {
-            this.auth_module_ids.push(item)
-          } else {
+          if (this.allAuths[item].length !== cache[item]) {
             this.halfAuths.push(item)
           }
         })
         this.auth_module_name = Array.from(new Set(temp))
       }
-      this.$emit('updateAuths', this.auths)
+      this.$emit('getCacheAuthIds', this.auth_module_ids.slice())
+      this.$emit('updateAuths', this.auth_module_ids)
       this.$emit('updateAllAuths', this.allAuths)
     },
 
@@ -95,7 +102,7 @@ export default {
         this.auth_module_ids = this.auth_module_ids.filter(v => !_ids.includes(v))
         this.auth_module_name = this.auth_module_name.filter(v => v !== moduleName)
       }
-      // this.$emit('updateAuths', this.auths)
+      this.$emit('updateAuths', this.auth_module_ids)
     },
 
     // 单选
@@ -129,16 +136,6 @@ export default {
       this.$emit('updateAuths', this.auth_module_ids)
     },
   },
-  async created() {
-    try {
-      this.loading = true
-      await this.getGroupAuths()
-      this.loading = false
-    } catch (e) {
-      this.loading = false
-      console.log(e)
-    }
-  },
 }
 </script>
 

src/views/admin/group/GroupList.vue

@@ -44,7 +44,7 @@
               :id="id"
               ref="groupAuths"
               @updateAuths="updateAuths"
-              @updateCacheAuths="updateCacheAuths"
+              @getCacheAuthIds="getCacheAuthIds"
               @updateAllAuths="updateAllAuths"
               style="margin-right:-30px;margin-left:-25px;margin-bottom:-10px;"
             >
@@ -130,36 +130,16 @@ export default {
           }
         }
       } else {
-        // 修改权限
-        // 权限取子集(module)
-        this.auths = this.auths.filter(item => Object.keys(this.allAuths).indexOf(item) < 0)
-        this.cacheAuths = this.cacheAuths.filter(item => Object.keys(this.allAuths).indexOf(item) < 0) // eslint-disable-line
+        let addRes = 0
+        let delRes = 0
         // 判断是否更改了分组权限
         if (this.auths.sort().toString() !== this.cacheAuths.sort().toString()) {
-          const addAuths = [...this.auths] // 增加的权限
-          const deleteAuths = this.cacheAuths // 删除的权限
-          let addRes = {}
-          let delRes = {}
-          // 判断增加的权限
-          for (let i = 0; i < addAuths.length; i++) {
-            // eslint-disable-line
-            for (let j = 0; j < this.cacheAuths.length; j++) {
-              // eslint-disable-line
-              if (addAuths[i] === this.cacheAuths[j]) {
-                addAuths.splice(i, 1)
-              }
-            }
-          }
-          // 判断删除的权限
-          for (let i = 0; i < deleteAuths.length; i++) {
-            // eslint-disable-line
-            for (let j = 0; j < this.auths.length; j++) {
-              // eslint-disable-line
-              if (deleteAuths[i] === this.auths[j]) {
-                deleteAuths.splice(i, 1)
-              }
-            }
-          }
+          const deleteAuths = this.cacheAuths.concat(this.auths).filter(v => !this.auths.includes(v))
+          const addAuths = this.cacheAuths.concat(this.auths).filter(v => !this.cacheAuths.includes(v))
+
+          console.log(deleteAuths)
+          console.log(addAuths)
+
           if (addAuths.length > 0) {
             addRes = await Admin.dispatchAuths(this.id, addAuths)
           }
@@ -235,13 +215,17 @@ export default {
       }
     },
     // 弹窗打开时，记录缓存所拥有的全部权限
-    updateCacheAuths(cacheAuths) {
-      this.cacheAuths = cacheAuths
+    getCacheAuthIds(ids) {
+      this.cacheAuths = ids
     },
     // 获取拥有的权限
     updateAuths(auths) {
       this.auths = auths
     },
+    // 权限id集合
+    getAllAuthIds(allAuthIds) {
+      this.allAuthIds = allAuthIds
+    },
     // 获取所有权限
     updateAllAuths(allAuths) {
       this.allAuths = allAuths