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

角色添加、角色编辑关联菜单功能

Browse Source
This commit is contained in:
chenchun
2022-09-11 15:39:55 +08:00
parent 004cb20132
commit 1d535b5d61
11 changed files with 187 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -230,6 +230,13 @@
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.GetListByRoleId(System.Int64)">
<summary>
根据角色id获取该角色下全部菜单
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="T:Yi.Framework.ApiMicroservice.Controllers.RoleController">
<summary>
角色管理
@@ -261,6 +268,12 @@
<param name="roleDto"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.UpdateInfo(Yi.Framework.DTOModel.RoleInfoDto)">
<summary>
更新角色信息
</summary>
<returns></returns>
</member>
<member name="T:Yi.Framework.ApiMicroservice.Controllers.TestController">
<summary>
测试控制器

12
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs
View File

@@ -61,5 +61,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers
{
return Result.Success().SetData(await _iMenuService.GetMenuTreeAsync());
}
/// <summary>
/// 根据角色id获取该角色下全部菜单
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
public async Task<Result> GetListByRoleId(long id)
{
return Result.Success().SetData(await _iMenuService.GetListByRoleId(id));
}
}
}

11
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
View File

@@ -10,6 +10,7 @@ using Yi.Framework.DTOModel;
using Yi.Framework.Interface;
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
using Yi.Framework.Service;
using Yi.Framework.WebCore;
using Yi.Framework.WebCore.AttributeExtend;
using Yi.Framework.WebCore.AuthorizationPolicy;
@@ -72,5 +73,15 @@ namespace Yi.Framework.ApiMicroservice.Controllers
{
return Result.Success().SetData(await _iRoleService.AddInfo(roleDto));
}
/// <summary>
/// 更新角色信息
/// </summary>
/// <returns></returns>
[HttpPut]
public async Task<Result> UpdateInfo(RoleInfoDto roleDto)
{
return Result.Success().SetStatus(await _iRoleService.UpdateInfo(roleDto));
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

7
Yi.Framework.Net6/Yi.Framework.Interface/IMenuService.cs
View File

@@ -10,5 +10,12 @@ namespace Yi.Framework.Interface
{
Task<List<MenuEntity>> GetMenuTreeAsync();
Task<List<MenuEntity>> SelctGetList(MenuEntity menu);
/// <summary>
/// 获取该角色id下的所有菜单
/// </summary>
/// <param name="roleId"></param>
/// <returns></returns>
Task<List<MenuEntity>> GetListByRoleId(long roleId);
}
}

8
Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs
View File

@@ -44,5 +44,13 @@ namespace Yi.Framework.Interface
/// <param name="roleDto"></param>
/// <returns></returns>
Task<bool> AddInfo(RoleInfoDto roleDto);
/// <summary>
/// 更新角色关联菜单
/// </summary>
/// <param name="roleDto"></param>
/// <returns></returns>
Task<bool> UpdateInfo(RoleInfoDto roleDto);
}
}

6
Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs
View File

@@ -25,5 +25,11 @@ namespace Yi.Framework.Service
//复杂查询直接使用db代理
return await _repository._Db.Queryable<MenuEntity>().Where(u => u.IsDeleted == false).ToTreeAsync(it => it.Children, it => it.ParentId, 0);
}
public async Task<List<MenuEntity>> GetListByRoleId(long roleId)
{
return (await _repository._Db.Queryable<RoleEntity>().Includes(r => r.Menus).SingleAsync(r=>r.Id==roleId)).Menus;
}
}
}

8
Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs
View File

@@ -75,5 +75,13 @@ namespace Yi.Framework.Service
var res2 = await GiveRoleSetMenu(new List<long> { res1 }, roleDto.MenuIds);
return !0.Equals(res1) && res2;
}
public async Task<bool> UpdateInfo(RoleInfoDto roleDto)
{
var res1 = await _repository.UpdateIgnoreNullAsync(roleDto.Role);
var res2 = await GiveRoleSetMenu(new List<long> { roleDto.Role.Id }, roleDto.MenuIds);
return res1 && res2;
}
}
}

2
Yi.Vue3.X.RuoYi/src/api/system/menu.js
View File

@@ -28,7 +28,7 @@ export function treeselect() {
// 根据角色ID查询菜单下拉树结构
export function roleMenuTreeselect(roleId) {
return request({
url: '/system/menu/roleMenuTreeselect/' + roleId,
url: '/menu/getListByRoleId/' + roleId,
method: 'get'
})
}

3
Yi.Vue3.X.RuoYi/src/api/system/role.js
View File

@@ -31,7 +31,7 @@ export function addRole(data) {
// 修改角色
export function updateRole(data) {
return request({
url: '/system/role',
url: '/role/updateInfo',
method: 'put',
data: data
})
@@ -130,4 +130,5 @@ export function roleOptionselect() {
url: '/role/getList',
method: 'get'
})
}

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

@@ -188,7 +188,7 @@ const total = ref(0);
const title = ref("");
const dateRange = ref([]);
const menuOptions = ref([]);
const menuExpand = ref(false);
const menuExpand = ref(true);
const menuNodeAll = ref(false);
const deptExpand = ref(true);
const deptNodeAll = ref(false);
@@ -302,7 +302,6 @@ function getMenuTreeselect() {
options.push({ id: m.id, label: m.menuName, parentId: m.parentId, children: m.children })
})
menuOptions.value = proxy.handleTree(options);
})
}
/** 所有部门节点数据 */
@@ -352,145 +351,152 @@ function handleAdd() {
function handleUpdate(row) {
reset();
const roleId = row.id || ids.value;
const roleMenu = getRoleMenuTreeselect(roleId);
getRoleMenuTreeselect(roleId);
getRole(roleId).then(response => {
form.value = response.data;
form.value.orderNum = Number(form.value.orderNum);
form.value.role = response.data;
form.value.role.orderNum = Number(form.value.role.orderNum);
open.value = true;
nextTick(() => {
roleMenu.then((res) => {
let checkedKeys = res.checkedKeys;
checkedKeys.forEach((v) => {
nextTick(() => {
menuRef.value.setChecked(v, true, false);
});
});
});
});
title.value = "修改角色";
});
}
/** 根据角色ID查询菜单树结构 */
function getRoleMenuTreeselect(roleId) {
return roleMenuTreeselect(roleId).then(response => {
menuOptions.value = response.menus;
return response;
//1：获取该角色下的全部菜单id
//2：获取全量菜单
getMenuTreeselect();
roleMenuTreeselect(roleId).then(response => {
const menuIds = [];
response.data.forEach(m => {
menuIds.push(m.id)
})
menuIds.forEach((v) => {
nextTick(() => {
menuRef.value.setChecked(v, true, false);
});
//这里是要一个当前用户已拥有的菜单的id
})
});
}
}
/** 根据角色ID查询部门树结构 */
function getDeptTree(roleId) {
return deptTreeSelect(roleId).then(response => {
deptOptions.value = response.depts;
return response;
});
}
return deptTreeSelect(roleId).then(response => {
deptOptions.value = response.depts;
return response;
});
}
/** 树权限（展开/折叠）*/
function handleCheckedTreeExpand(value, type) {
if (type == "menu") {
let treeList = menuOptions.value;
for (let i = 0; i < treeList.length; i++) {
menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
if (type == "menu") {
let treeList = menuOptions.value;
for (let i = 0; i < treeList.length; i++) {
menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
}
} else if (type == "dept") {
let treeList = deptOptions.value;
for (let i = 0; i < treeList.length; i++) {
deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
}
}
}
} else if (type == "dept") {
let treeList = deptOptions.value;
for (let i = 0; i < treeList.length; i++) {
deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
}
}
}
/** 树权限（全选/全不选） */
function handleCheckedTreeNodeAll(value, type) {
if (type == "menu") {
menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
} else if (type == "dept") {
deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
}
}
if (type == "menu") {
menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
} else if (type == "dept") {
deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
}
}
/** 树权限（父子联动） */
function handleCheckedTreeConnect(value, type) {
if (type == "menu") {
form.value.menuCheckStrictly = value ? true : false;
} else if (type == "dept") {
form.value.deptCheckStrictly = value ? true : false;
}
}
if (type == "menu") {
form.value.menuCheckStrictly = value ? true : false;
} else if (type == "dept") {
form.value.deptCheckStrictly = value ? true : false;
}
}
/** 所有菜单节点数据 */
function getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
let checkedKeys = menuRef.value.getCheckedKeys();
// 半选中的菜单节点
let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
}
// 目前被选中的菜单节点
let checkedKeys = menuRef.value.getCheckedKeys();
// 半选中的菜单节点
let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["roleRef"].validate(valid => {
if (valid) {
if (form.value.role.id != undefined) {
form.value.menuIds = getMenuAllCheckedKeys();
updateRole(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
proxy.$refs["roleRef"].validate(valid => {
if (valid) {
if (form.value.role.id != undefined) {
form.value.menuIds = getMenuAllCheckedKeys();
updateRole(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
form.value.menuIds = getMenuAllCheckedKeys();
addRole(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
/** 选择角色权限范围触发 */
function dataScopeSelectChange(value) {
if (value !== "2") {
deptRef.value.setCheckedKeys([]);
}
}
/** 分配数据权限操作 */
function handleDataScope(row) {
reset();
const deptTreeSelect = getDeptTree(row.id);
getRole(row.id).then(response => {
form.value = response.data;
openDataScope.value = true;
nextTick(() => {
deptTreeSelect.then(res => {
nextTick(() => {
if (deptRef.value) {
deptRef.value.setCheckedKeys(res.checkedKeys);
}
});
});
});
} else {
form.value.menuIds = getMenuAllCheckedKeys();
addRole(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
title.value = "分配数据权限";
});
}
/** 提交按钮（数据权限） */
function submitDataScope() {
if (form.value.id != undefined) {
form.value.deptIds = getDeptAllCheckedKeys();
dataScope(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
openDataScope.value = false;
getList();
});
}
}
});
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
/** 选择角色权限范围触发 */
function dataScopeSelectChange(value) {
if (value !== "2") {
deptRef.value.setCheckedKeys([]);
}
}
/** 分配数据权限操作 */
function handleDataScope(row) {
reset();
const deptTreeSelect = getDeptTree(row.id);
getRole(row.id).then(response => {
form.value = response.data;
openDataScope.value = true;
nextTick(() => {
deptTreeSelect.then(res => {
nextTick(() => {
if (deptRef.value) {
deptRef.value.setCheckedKeys(res.checkedKeys);
}
});
});
});
title.value = "分配数据权限";
});
}
/** 提交按钮（数据权限） */
function submitDataScope() {
if (form.value.id != undefined) {
form.value.deptIds = getDeptAllCheckedKeys();
dataScope(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
openDataScope.value = false;
getList();
});
}
}
/** 取消按钮（数据权限）*/
function cancelDataScope() {
openDataScope.value = false;
reset();
}
openDataScope.value = false;
reset();
}
getList();
</script>