feat: 新增角色管理模块&菜单管理模块

packages/toolkits/pro/template/server/nestJs/src/menu/dto/update-menu.dto.ts

@@ -1,6 +1,8 @@
 import { PartialType } from '@nestjs/mapped-types';
 import { CreateMenuDto } from './create-menu.dto';
+import {IsNotEmpty} from "class-validator";
 
 export class UpdateMenuDto extends PartialType(CreateMenuDto) {
+  @IsNotEmpty()
   id: number;
 }

packages/toolkits/pro/template/server/nestJs/src/menu/menu.controller.ts

@@ -4,22 +4,27 @@ import {
   Post,
   Body,
   Patch,
-  Req,
-  Delete,
+  Query,
+  Delete, Param,
 } from '@nestjs/common';
 import { MenuService } from './menu.service';
 import { CreateMenuDto } from './dto/create-menu.dto';
 import { Permission } from '../public/permission.decorator';
 import { UpdateMenuDto } from './dto/update-menu.dto';
-import { DeleteMenuDto } from './dto/delete-menu.dto';
 
 @Controller('menu')
 export class MenuController {
   constructor(private readonly menuService: MenuService) {}
 
+  @Get('/role/:email')
+  async getMenus(@Param('email') email: string) {
+    return this.menuService.findRoleMenu(email);
+  }
+
   @Get()
-  async getMenus(@Req() req) {
-    return this.menuService.findAll(req.user);
+  @Permission('menu::query')
+  async getAllMenus() {
+    return this.menuService.findAllMenu();
   }
 
   @Post()
@@ -36,7 +41,7 @@ export class MenuController {
 
   @Delete()
   @Permission('menu::remove')
-  async deleteMenu(@Body() dto: DeleteMenuDto) {
-    return this.menuService.deleteMenu(dto);
+  async deleteMenu(@Query('id') id: number, @Query('parentId') parentId: number) {
+    return this.menuService.deleteMenu(id, parentId);
   }
 }

packages/toolkits/pro/template/server/nestJs/src/menu/menu.service.ts

@@ -4,7 +4,6 @@ import { Menu, User } from '@app/models';
 import { Repository } from 'typeorm';
 import { CreateMenuDto } from './dto/create-menu.dto';
 import { UpdateMenuDto } from './dto/update-menu.dto';
-import { DeleteMenuDto } from './dto/delete-menu.dto';
 
 export interface ITreeNodeData {
   // node-key='id' 设置节点的唯一标识
@@ -17,6 +16,14 @@ export interface ITreeNodeData {
   url: string;
   //组件
   component: string;
+  //图标
+  icon: string;
+  //类型
+  menuType: string;
+  //父节点
+  parentId: number;
+  //排序
+  order: number;
 }
 
 interface MenuMap {
@@ -30,6 +37,10 @@ const toNode = (menu: Menu): ITreeNodeData => {
     children: [],
     url: menu.path,
     component: menu.component,
+    icon: menu.icon,
+    menuType: menu.menuType,
+    parentId: menu.parentId,
+    order: menu.order,
   };
 };
 
@@ -58,13 +69,13 @@ export class MenuService {
     @InjectRepository(Menu)
     private menu: Repository<Menu>
   ) {}
-  async findAll(user: User) {
+  async findRoleMenu(email: string) {
     const userInfo = await this.user
       .createQueryBuilder('user')
       .leftJoinAndSelect('user.role', 'role')
       .leftJoinAndSelect('role.menus', 'menus')
       .where({
-        email: user.email,
+        email: email,
       })
       .orderBy('menus.order', 'ASC')
       .getOne();
@@ -75,6 +86,12 @@ export class MenuService {
     });
     return convertToTree(menus);
   }
+
+  async findAllMenu(){
+    const menu = this.menu.find();
+    return convertToTree(await menu)
+  }
+
   async createMenu(dto: CreateMenuDto) {
     const {
       order,
@@ -107,13 +124,23 @@ export class MenuService {
     });
     return true;
   }
-  async deleteMenu(dto: DeleteMenuDto) {
+  async deleteMenu(id: number, parentId: number) {
     const menu = this.menu.findOne({
       where: {
-        id: dto.id,
-        name: dto.name,
+        id: id,
       },
     });
+    const allMenu = await this.menu.find();
+    for (const tmp of allMenu){
+      if(Number(tmp.parentId) === Number(id)){
+        if(Number(parentId) === -1){
+          tmp.parentId = null;
+        }else {
+          tmp.parentId = parentId;
+        }
+        await this.updateMenu(tmp)
+      }
+    }
     return this.menu.remove(await menu);
   }
 }

packages/toolkits/pro/template/server/nestJs/src/role/role.controller.ts

@@ -10,7 +10,6 @@ import {
 import { RoleService } from './role.service';
 import { CreateRoleDto } from './dto/create-role.dto';
 import { UpdateRoleDto } from './dto/update-role.dto';
-import { DeleteRoleDto } from './dto/delete-role.dto';
 import { Permission } from '../public/permission.decorator';
 
 @Controller('role')
@@ -29,16 +28,22 @@ export class RoleController {
     return this.roleService.findAll();
   }
 
+  @Permission('role::get')
+  @Get('/detail')
+  getAllRoleDetail() {
+    return this.roleService.findAllDetail();
+  }
+
   @Patch()
   @Permission('role::update')
   updateRole(@Body() dto: UpdateRoleDto) {
     return this.roleService.update(dto);
   }
 
-  @Delete()
+  @Delete('/:id')
   @Permission('role::remove')
-  deleteRole(@Body() dto: DeleteRoleDto) {
-    return this.roleService.delete(dto);
+  deleteRole(@Param('id') id: number) {
+    return this.roleService.delete(id);
   }
 
   @Permission('role::get')

packages/toolkits/pro/template/server/nestJs/src/role/role.service.ts

@@ -1,10 +1,10 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { CreateRoleDto } from './dto/create-role.dto';
 import { UpdateRoleDto } from './dto/update-role.dto';
-import { DeleteRoleDto } from './dto/delete-role.dto';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Menu, Permission, Role } from '@app/models';
 import { DataSource, In, Repository } from 'typeorm';
+import { convertToTree } from "../menu/menu.service";
 
 @Injectable()
 export class RoleService {
@@ -42,7 +42,25 @@ export class RoleService {
     return this.role.save({ name, permission: permissions, menus });
   }
   findAll() {
-    return this.role.find();
+    return this.role.find()
+  }
+
+  async findAllDetail() {
+    const roleInfo = await this.role
+      .createQueryBuilder('role')
+      .leftJoinAndSelect('role.menus', 'menus')
+      .leftJoinAndSelect('role.permission', 'permission')
+      .getMany();
+    const menuTree = [] as any;
+    for(const item of roleInfo){
+      const temp = convertToTree(item.menus);
+      menuTree.push(temp)
+    }
+
+    return {
+      roleInfo: roleInfo,
+      menuTree: menuTree,
+    }
   }
 
   async findOne(id: string) {
@@ -83,10 +101,10 @@ export class RoleService {
     role.menus = menus.length ? menus : undefined;
     return this.role.save(role);
   }
-  async delete(data: DeleteRoleDto) {
+  async delete(id: number) {
     const role = await this.role.find({
       where: {
-        name: data.name,
+        id: id,
       },
     });
     return this.role.remove(role);

packages/toolkits/pro/template/tinyvue/src/api/menu.ts

@@ -0,0 +1,23 @@
+import axios from "axios";
+
+
+
+export function getAllMenu() {
+  return axios.get('/api/menu');
+}
+
+export function getRoleMenu(email: string) {
+  return axios.get(`/api/menu/role/${email}`);
+}
+
+export function updateMenu(data: any) {
+  return axios.patch(`/api/menu`, data);
+}
+
+export function deleteMenu(id: number, parentId: number) {
+  return axios.delete(`/api/menu?id=${id}&parentId=${parentId}`);
+}
+
+export function createMenu(data: any) {
+  return axios.post(`/api/menu`, data);
+}

packages/toolkits/pro/template/tinyvue/src/api/role.ts

@@ -2,6 +2,22 @@ import axios from "axios";
 
 
 
-export function getRoles() {
+export function getAllRole() {
   return axios.get('/api/role');
 }
+
+export function getAllRoleDetail() {
+  return axios.get('/api/role/detail');
+}
+
+export function updateRole(data: any) {
+  return axios.patch(`/api/role`, data);
+}
+
+export function deleteRole(id: number) {
+  return axios.delete(`/api/role/${id}`);
+}
+
+export function createRole(data: any) {
+  return axios.post(`/api/role`, data);
+}

packages/toolkits/pro/template/tinyvue/src/components/menu/index.vue

@@ -35,6 +35,8 @@
     IconApplication,
     IconGroup,
     IconFolderOpened,
+    IconActivation,
+    IconGrade,
   } from '@opentiny/vue-icon';
   import { TreeMenu as tinyTreeMenu } from '@opentiny/vue';
   import router from '@/router';
@@ -52,6 +54,8 @@
   const iconApplication = IconApplication();
   const iconFolderOpened = IconFolderOpened();
   const iconGroup = IconGroup();
+  const iconActivation = IconActivation();
+  const iconGrade = IconGrade();
   const tree = ref();
   const expandeArr = ref();
   const routerTitle = [
@@ -230,14 +234,26 @@
       bold: 'title',
     },
     {
-      value: 'PermissionSetting',
-      name: 'menu.permission.setting',
+      value: 'Role',
+      name: 'menu.role',
+      icon: iconActivation,
+      bold: 'main-title',
+    },
+    {
+      value: 'AllRole',
+      name: 'menu.role.info',
       icon: null,
       bold: 'title',
     },
     {
-      value: 'PermissionAdd',
-      name: 'menu.permission.permissionAdd',
+      value: 'Menu',
+      name: 'menu.menu',
+      icon: iconGrade,
+      bold: 'main-title',
+    },
+    {
+      value: 'AllMenu',
+      name: 'menu.menu.info',
       icon: null,
       bold: 'title',
     },
@@ -311,6 +327,9 @@
       'User',
       'Cloud',
       'UserManager',
+      'Permission',
+      'Role',
+      'Menu',
     ];
     if (filter.indexOf(data.id) === -1) {
       router.push({ name: data.id });

packages/toolkits/pro/template/tinyvue/src/components/navbar/index.vue

@@ -76,7 +76,7 @@
       show-header
       show-footer
       mask-closable="true"
-      height="350"
+      height="auto"
       width="600"
       :title="$t('userInfo.modal.title.pwdUpdate')"
     >
@@ -213,8 +213,8 @@ const state = reactive<{
     { label: 'messageBox.switchRoles', value: 1 },
     { label: 'messageBox.userCenter', value: 2 },
     { label: 'messageBox.userSettings', value: 3 },
-    { label: 'messageBox.logout', value: 4 },
-    { label: 'messageBox.updatePwd',value: 5 },
+    { label: 'messageBox.updatePwd',value: 4 },
+    { label: 'messageBox.logout', value: 5 },
   ];
 
   const switchRoles = async () => {
@@ -238,10 +238,10 @@ const state = reactive<{
         router.push({ name: 'Setting' });
         break;
       case 4:
-        logout();
+        handlePwdUpdate();
         break;
       case 5:
-        handlePwdUpdate();
+        logout();
         break;
       default:
       // eslint-disable-next-line no-console