From 7a6fbd137352db004ee93159e4472613dea18be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com>
Date: Wed, 22 Dec 2021 23:57:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=92=E8=89=B2=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.ts                    |   5 +-
 src/views/system/role/components/Menu.vue |  22 +-
 src/views/system/role/components/Perm.vue | 289 ++++++++++------------
 src/views/system/role/index.vue           |  18 +-
 4 files changed, 157 insertions(+), 177 deletions(-)

diff --git a/src/api/system/role.ts b/src/api/system/role.ts
index 1fcff589..3021cc57 100644
--- a/src/api/system/role.ts
+++ b/src/api/system/role.ts
@@ -110,10 +110,11 @@ export function updateRoleMenu(roleId: number, menuIds: Array<Number>) {
  *
  * @param roleId
  */
-export function listRolePerms(roleId: number) {
+export function listRolePerms(roleId: number, menuId: number) {
     return request({
         url: '/youlai-admin/api/v1/roles/' + roleId + '/permissions',
         method: 'get',
+        data: {menuId: menuId}
     })
 }
 
@@ -124,7 +125,7 @@ export function listRolePerms(roleId: number) {
  * @param roleId
  * @param permIds
  */
-export function saveRolePerms(menuId: number, roleId: number, permIds: Array<number>) {
+export function saveRolePerms(roleId: number, menuId: number, permIds: Array<number>) {
     return request({
         url: '/youlai-admin/api/v1/roles/' + roleId + '/permissions',
         method: 'put',
diff --git a/src/views/system/role/components/Menu.vue b/src/views/system/role/components/Menu.vue
index 913cef4c..2ac0692e 100644
--- a/src/views/system/role/components/Menu.vue
+++ b/src/views/system/role/components/Menu.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%;">
+  <div class="menu-container">
     <el-form size="mini">
       <el-form-item>
         <el-row>
@@ -13,17 +13,16 @@
       </el-form-item>
     </el-form>
 
-
     <el-tree
         ref="menuRef"
-        v-if="state.refreshTree"
-        :default-expanded-keys="state.expandedKeys"
-        :default-expand-all="state.isExpandAll"
-        :data="state.menuOptions"
+        v-if="refreshTree"
+        :default-expanded-keys="expandedKeys"
+        :default-expand-all="isExpandAll"
+        :data="menuOptions"
         show-checkbox
         node-key="id"
         empty-text="加载菜单中..."
-        :check-strictly="state.checkStrictly"
+        :check-strictly="checkStrictly"
         highlight-current
         @node-click="handleNodeClick"
     />
@@ -33,9 +32,8 @@
 <script setup lang="ts">
 import {listTreeSelectMenus} from "@/api/system/menu";
 import {listRoleMenuIds, updateRoleMenu} from "@/api/system/role"
-import {defineEmits, defineProps, nextTick, onMounted, reactive, ref, watch} from "vue"
+import {defineEmits, defineProps, nextTick, onMounted, reactive, ref, toRefs, watch} from "vue"
 import {ElTree, ElMessage, ElMessageBox} from "element-plus"
-
 import {Switch, Check} from '@element-plus/icons'
 
 const emit = defineEmits(['menuClick'])
@@ -68,6 +66,8 @@ const state = reactive({
   refreshTree: true
 })
 
+const {expandedKeys, menuOptions, checkStrictly, isExpandAll, refreshTree} = toRefs(state)
+
 /**
  * 加载菜单树
  */
@@ -109,5 +109,7 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-
+.menu-container {
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/role/components/Perm.vue b/src/views/system/role/components/Perm.vue
index 54154e49..cbea62de 100644
--- a/src/views/system/role/components/Perm.vue
+++ b/src/views/system/role/components/Perm.vue
@@ -1,187 +1,154 @@
 <template>
   <div class="perm-container">
-    <el-card class="box-card" shadow="always">
-      <div class="clearfix" slot="header">
-        <b>
-          <svg-icon icon-class="menu"/>
-          {{ menu && menu.label ? "【" + menu.label + "】" : "" }}权限分配
-        </b>
-      </div>
-      <el-row style="margin-bottom: 10px">
-        <el-col :span="18">
-          <el-tag v-if="role" type="primary">{{ role.name }}</el-tag>
-          <el-tag v-if="menu" type="success" style="margin-left: 5px">{{
-              menu.label
-            }}
-          </el-tag>
-          <el-tag v-if="!role" type="info" style="margin-left: 5px"
-          ><i class="el-icon-info"> </i> 请选择角色
-          </el-tag>
-          <el-tag v-if="!menu" type="info" style="margin-left: 5px"
-          ><i class="el-icon-info"> </i> 请选择菜单
-          </el-tag>
-        </el-col>
-        <el-col :span="6" style="text-align: right">
-          <el-button
-            type="primary"
-            :disabled="isRoot"
-            icon="el-icon-check"
-            size="mini"
-            @click="handleSubmit"
-          >提交
-          </el-button>
-        </el-col>
-      </el-row>
+    <el-form size="mini">
+      <el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-button type="success" plain :icon="Switch" @click="toggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <el-col :span="12" style="text-align: right">
+            <el-button type="primary" :icon="Check" @click="handleSubmit">提交</el-button>
+          </el-col>
+        </el-row>
+      </el-form-item>
+    </el-form>
 
-      <div v-if="permissionList.length > 0">
-        <el-checkbox
+
+    <div v-if="permissionOptions.length > 0">
+      <el-checkbox
           :indeterminate="isIndeterminate"
           v-model="checkAll"
           @change="handleCheckAllChange"
           style="margin-top: 20px"
-        >全选
-        </el-checkbox>
-        <el-row>
-          <el-col
+      >全选
+      </el-checkbox>
+      <el-row>
+        <el-col
             :span="8"
-            v-for="permission in permissionList"
+            v-for="item in permissionOptions"
             style="margin-top: 20px"
-          >
-            <el-checkbox
+        >
+          <el-checkbox
               border
-              v-model="permission.checked"
-              :label="permission.id"
-              :key="permission.id"
-              @change="handleCheckChange"
+              v-model="item.checked"
+              :label="item.id"
+              :key="item.id"
+              @change="handleCheckedPermChange"
               size="mini"
-            >
-              {{ permission.name }}
-            </el-checkbox>
-          </el-col>
-        </el-row>
-      </div>
-      <div style="text-align: center" v-else>
-        <el-empty :description=" !role? '请选择角色': !menu? '请选择菜单': '暂无数据，您可在【菜单管理】配置权限数据'"></el-empty>
-      </div>
-    </el-card>
+          >
+            {{ permission.name }}
+          </el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <div style="text-align: center" v-else>
+      <el-empty :description=" !role? '请选择角色': !menu? '请选择菜单': '暂无数据，您可在【菜单管理】配置权限数据'"></el-empty>
+    </div>
   </div>
 </template>
 
-<script>
-import {getPermissionList} from "@/api/system/permission";
-import {listRolePermission, updateRolePermission} from "@/api/system/role";
+<script setup lang="ts">
+import {listPerms} from "@/api/system/perm";
+import { listRolePerms, saveRolePerms} from "@/api/system/role";
+import {defineProps, onMounted, reactive, toRefs, watch} from "vue";
+import {ElMessage} from "element-plus";
 
-export default {
-  name: "Permission",
-  props: ["type"],
-  data() {
-    return {
-      loading: false,
-      ids: [],
-      initialCheckedPermissionIds: [],
-      menu: undefined,
-      role: undefined,
-      isIndeterminate: true,
-      checkAll: false,
-      permissionList: [],
-      isRoot: false,
-    };
+
+const props = defineProps({
+  role: {
+    type: Object,
+    default: {}
   },
-  methods: {
-    handleQuery() {
-      this.loading = true;
-      const menuId = this.menu.value;
-      getPermissionList({
-        menuId: menuId
-      }).then((response) => {
-        const {data} = response;
-        if (this.role.code == this.ROOT_ROLE_CODE) {
-          // 如果是超级管理员默认勾选全部且不可编辑
-          this.isRoot = true
-          this.checkAll = true
-          this.isIndeterminate = false
-          data.map((item) => this.$set(item, "checked", true))
-          this.permissionList = data
-          this.loading = false
+  menu: {
+    type: Object,
+    default: {}
+  }
+})
+
+watch(() => props.role.id as any, (newVal, oldVal) => {
+  const roleId = props.role.id
+  if (roleId) {
+  }
+})
+
+watch(() => props.menu.id as any, (newVal, oldVal) => {
+  const menuId = props.menu.id
+  if (menuId) {
+  }
+})
+
+const state = reactive({
+  loading: false,
+  permissionOptions: [] as Array<any>,
+  isIndeterminate: true,
+  checkAll: false,
+  checkedPerms: []
+})
+
+const {permissionOptions, isIndeterminate, checkAll, checkedPerms} = toRefs(state)
+
+function handleCheckAllChange(checked: Boolean) {
+  state.isIndeterminate = false;
+  if (checked) {
+    state.permissionOptions.map((item) => (item.checked = true));
+  } else {
+    // 全不选
+    state.permissionOptions.map((item) => (item.checked = false));
+  }
+}
+
+function handleCheckedPermChange(value: any) {
+  const checkedCount = value.length;
+  state.checkAll = checkedCount === state.permissionOptions.length;
+  state.isIndeterminate = checkedCount > 0 && checkedCount < state.permissionOptions.length;
+}
+
+function loadData() {
+  if(! props.menu.id){
+    return false
+  }
+
+  state.loading = true;
+  listPerms({menuId: props.menu.id}).then(response => {
+    state.permissionOptions =  response.data
+    listRolePerms(props.role.id, props.menu.id).then(res => {
+      const checkedPermIds = res.data
+      state.permissionOptions.map((item:any)=> {
+        if (checkedPermIds.includes(item.id)) {
+          item.checked = true;
         } else {
-          this.isRoot = false;
-          listRolePermission(this.role.id, {menuId: menuId}).then((res) => {
-            this.initialCheckedPermissionIds = res.data;
-            let checkAll = true
-            data.map((item) => {
-              if (this.initialCheckedPermissionIds.includes(item.id)) {
-                item.checked = true;
-              } else {
-                checkAll = false
-              }
-            });
-            this.checkAll = checkAll
-            if (checkAll) {
-              this.isIndeterminate = false
-            }
-            this.permissionList = data;
-            this.loading = false;
-          });
+          state.checkAll = false
         }
       });
-    },
-    menuClick(menu, role) {
-      this.role = role;
-      this.menu = menu;
 
-      if (role && menu) {
-        this.handleQuery();
-      } else {
-        this.permissionList = [];
-        this.initialCheckedPermissionIds = [];
-      }
-    },
-    handleSubmit: function () {
-      const checkedPermissionIds = this.permissionList
-        .filter((item) => item.checked)
-        .map((item) => item.id);
-      // 判断选中权限是否变动
-      if (
-        this.initialCheckedPermissionIds.length ==
-        checkedPermissionIds.length &&
-        this.initialCheckedPermissionIds.sort().every(function (v, i) {
-          return v == checkedPermissionIds[i];
-        })
-      ) {
-        this.$message.warning("数据未变动");
-        return;
-      }
-      updateRolePermission(
-        this.menu.value,
-        this.role.id,
-        checkedPermissionIds
-      ).then((response) => {
-        this.$message.success("提交成功");
-      });
-    },
-    handleCheckAllChange(checked) {
-      if (checked) {
-        this.permissionList.map((item) => (item.checked = true));
-      } else {
-        // 全不选
-        this.permissionList.map((item) => (item.checked = false));
-      }
-      this.isIndeterminate = false;
-    },
-    handleCheckChange(item, val) {
-      const checkedCount = this.permissionList.filter(
-        (item) => item.checked
-      ).length;
-      this.checkAll = checkedCount === this.permissionList.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.permissionList.length;
-    },
-  },
-};
+      state.loading=false
+
+    })
+  })
+}
+
+function handleSubmit(){
+  const checkedPermIds = state.permissionOptions
+      .filter((item) => item.checked)
+      .map((item) => item.id);
+
+
+saveRolePerms(  props.menu.id,
+    props.role.id,
+    checkedPermIds
+).then(() => {
+  ElMessage.success("提交成功");
+});
+
+}
+
+onMounted(() => {
+  loadData()
+})
 </script>
 
 <style scoped>
 .perm-container {
-  margin-bottom: 20px;
+  width: 100%;
 }
 </style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ffb25806..2e7d3c6b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -17,7 +17,10 @@
           <template #header>
             <svg-icon color="#333" icon-class="menu"/>
             <span style="margin:0 5px;">菜单分配</span>
-            <el-tag type="success" v-if="state.role.id" size="small"> <svg-icon color="green  " icon-class="role"/>  {{ state.role.name }}</el-tag>
+            <el-tag type="success" v-if="state.role.id" size="small">
+              <svg-icon color="green  " icon-class="role"/>
+              {{ state.role.name }}
+            </el-tag>
             <el-tag type="warning" v-else size="small">请选择角色</el-tag>
           </template>
           <menus ref="menu" @menuClick="handleMenuClick" :role="state.role"/>
@@ -30,13 +33,19 @@
             <svg-icon color="#333" icon-class="perm"/>
             <span style="margin:0 5px;">权限分配</span>
 
-            <el-tag type="success" style="margin:0 5px 0 0;" v-if="state.role.id" size="small"> <svg-icon color="green" icon-class="role"/>  {{ state.role.name }}</el-tag>
+            <el-tag type="success" style="margin:0 5px 0 0;" v-if="state.role.id" size="small">
+              <svg-icon color="green" icon-class="role"/>
+              {{ state.role.name }}
+            </el-tag>
             <el-tag type="warning" style="margin:0 5px  0 0;" v-else size="small"> 请选择角色</el-tag>
 
-            <el-tag type="primary" v-if="state.role.id" size="small"><svg-icon color="red" icon-class="menu"/>  {{ state.role.name }}</el-tag>
+            <el-tag type="primary" v-if="state.role.id" size="small">
+              <svg-icon color="red" icon-class="menu"/>
+              {{ state.role.name }}
+            </el-tag>
             <el-tag type="warning" v-else size="small"> 请选择菜单</el-tag>
           </template>
-          <!--<perm ref="perm" :menu="state.menu" :role="state.role"/>-->
+          <perm ref="perm" :menu="state.menu" :role="state.role"/>
         </el-card>
       </el-col>
 
@@ -47,6 +56,7 @@
 <script setup lang="ts">
 import Role from './components/Role.vue'
 import Menus from './components/Menu.vue'
+import Perm from './components/Perm.vue'
 import {reactive} from "vue";
 import {ElMessage} from "element-plus";
 import SvgIcon from '@/components/SvgIcon/index.vue';