xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复角色选择菜单问题

Browse Source
This commit is contained in:
陈淳
2023-02-20 19:55:52 +08:00
parent f34c33b0d8
commit 9645decf59
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Yi.RuoYi.Vue3/src/views/system/role/index.vue
View File

@@ -45,9 +45,9 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="角色编号" prop="roleCode" /> <el-table-column label="角色编号" prop="roleCode" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" /> <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true" /> <el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true" />
<el-table-column label="显示顺序" prop="orderNum" /> <el-table-column label="显示顺序" prop="orderNum" />
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template #default="scope"> <template #default="scope">
@@ -63,7 +63,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope"> <template #default="scope">
<el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1"> <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"> <el-button type="text" icon="Edit" @click=" handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1"> <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
@@ -328,7 +328,7 @@ function handleAuthUser(row) {
} }
/** 查询菜单树结构 */ /** 查询菜单树结构 */
function getMenuTreeselect() { function getMenuTreeselect() {
listMenu().then((response) => { return listMenu().then((response) => {
const options = []; const options = [];
response.data.items.forEach((m) => { response.data.items.forEach((m) => {
options.push({ options.push({
@@ -339,8 +339,11 @@ function getMenuTreeselect() {
}); });
}); });
menuOptions.value = proxy.handleTree(options); menuOptions.value = proxy.handleTree(options);
return response;
}); });
} }
/** 所有部门节点数据 */ /** 所有部门节点数据 */
function getDeptAllCheckedKeys() { function getDeptAllCheckedKeys() {
// 目前被选中的部门节点 // 目前被选中的部门节点
@@ -383,7 +386,7 @@ function handleAdd() {
title.value = "添加角色"; title.value = "添加角色";
} }
/** 修改角色 */ /** 修改角色 */
function handleUpdate(row) { function handleUpdate(row) {
reset(); reset();
const roleId = row.id || ids.value; const roleId = row.id || ids.value;
getRoleMenuTreeselect(roleId); getRoleMenuTreeselect(roleId);
@@ -395,17 +398,18 @@ function handleUpdate(row) {
}); });
} }
/** 根据角色ID查询菜单树结构 */ /** 根据角色ID查询菜单树结构 */
function getRoleMenuTreeselect(roleId) { function getRoleMenuTreeselect(roleId) {
//1：获取该角色下的全部菜单id //1：获取该角色下的全部菜单id
//2：获取全量菜单 //2：获取全量菜单
getMenuTreeselect(); const menuTreeselect=getMenuTreeselect();
menuTreeselect.then(()=>{
roleMenuTreeselect(roleId).then((response) => { nextTick(() => {
roleMenuTreeselect(roleId).then((response) => {
const menuIds = []; const menuIds = [];
response.data.forEach((m) => { response.data.forEach((m) => {
menuIds.push(m.id); menuIds.push(m.id);
}); });
nextTick(() => {
menuIds.forEach((v) => { menuIds.forEach((v) => {
menuRef.value.setChecked(v, true, false); menuRef.value.setChecked(v, true, false);
}); });
@@ -413,6 +417,9 @@ function getRoleMenuTreeselect(roleId) {
}); });
}); });
})
} }
/** 根据角色ID查询部门树结构 */ /** 根据角色ID查询部门树结构 */
function getDeptTree(roleId) { function getDeptTree(roleId) {