From 692beefe63b8597a7e45b9f6e8ac9f3424c70b3d Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Tue, 1 Mar 2022 09:07:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(menus):=20=E5=A2=9E=E5=8A=A0=E7=89=B9?= =?UTF-8?q?=E5=AE=9A=E4=BA=8E=E7=94=A8=E6=88=B7/=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=9A=84=E8=B5=B7=E5=A7=8B=E9=A1=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/vue/src/api/platform/menu.ts | 20 + apps/vue/src/api/platform/model/menuModel.ts | 3 +- .../views/identity/components/MenuModal.vue | 20 +- .../identity/role/components/RoleTable.vue | 33 +- .../identity/user/components/UserTable.vue | 38 +- .../LINGYUN/Platform/Menus/Dto/MenuDto.cs | 1 + .../Menus/Dto/RoleMenuStartupInput.cs | 10 + .../Menus/Dto/UserMenuStartupInput.cs | 8 + .../LINGYUN/Platform/Menus/IMenuAppService.cs | 6 +- .../LINGYUN/Platform/Menus/MenuAppService.cs | 81 ++- .../PlatformApplicationMappingProfile.cs | 3 +- .../Platform/Localization/Resources/en.json | 1 + .../Localization/Resources/zh-Hans.json | 1 + .../Platform/Menus/IRoleMenuRepository.cs | 4 +- .../Platform/Menus/IUserMenuRepository.cs | 4 +- .../LINGYUN/Platform/Menus/MenuManager.cs | 46 +- .../LINGYUN/Platform/Menus/RoleMenu.cs | 2 + .../LINGYUN/Platform/Menus/UserMenu.cs | 2 + .../Menus/EfCoreRoleMenuRepository.cs | 23 +- .../Menus/EfCoreUserMenuRepository.cs | 18 +- .../LINGYUN/Platform/Menus/MenuController.cs | 14 + ...-Startup-With-UserAndRole-Menu.Designer.cs | 673 ++++++++++++++++++ ...Add-Field-Startup-With-UserAndRole-Menu.cs | 37 + ...ApiHostMigrationsDbContextModelSnapshot.cs | 28 +- 24 files changed, 1014 insertions(+), 62 deletions(-) create mode 100644 aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN/Platform/Menus/Dto/RoleMenuStartupInput.cs create mode 100644 aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN/Platform/Menus/Dto/UserMenuStartupInput.cs create mode 100644 aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Migrations/20220301001241_Add-Field-Startup-With-UserAndRole-Menu.Designer.cs create mode 100644 aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Migrations/20220301001241_Add-Field-Startup-With-UserAndRole-Menu.cs diff --git a/apps/vue/src/api/platform/menu.ts b/apps/vue/src/api/platform/menu.ts index 3656d3bd4..8326f0fb7 100644 --- a/apps/vue/src/api/platform/menu.ts +++ b/apps/vue/src/api/platform/menu.ts @@ -18,8 +18,10 @@ enum Api { GetAll = '/api/platform/menus/all', GetUserMenus = '/api/platform/menus/by-user/{userId}/{framework}', SetUserMenus = 'api/platform/menus/by-user', + SetUserStartup = 'api/platform/menus/startup/{id}/by-user', GetRoleMenus = '/api/platform/menus/by-role/{role}/{framework}', SetRoleMenus = '/api/platform/menus/by-role', + SetRoleStartup = 'api/platform/menus/startup/{id}/by-role', GetMyMenus = '/api/platform/menus/by-current-user', Create = '/api/platform/menus', Delete = '/api/platform/menus/{id}', @@ -85,9 +87,27 @@ export const setUserMenu = (input: UserMenu) => { }); }; +export const setUserStartupMenu = (userId: string, menuId: string) => { + return defHttp.put({ + url: format(Api.SetUserStartup, { id: menuId }), + data: { + userId: userId, + }, + }); +}; + export const setRoleMenu = (input: RoleMenu) => { return defHttp.put({ url: Api.SetRoleMenus, data: input, }); }; + +export const setRoleStartupMenu = (roleName: string, menuId: string) => { + return defHttp.put({ + url: format(Api.SetRoleStartup, { id: menuId }), + data: { + roleName: roleName, + }, + }); +}; diff --git a/apps/vue/src/api/platform/model/menuModel.ts b/apps/vue/src/api/platform/model/menuModel.ts index 55b29e314..43874d700 100644 --- a/apps/vue/src/api/platform/model/menuModel.ts +++ b/apps/vue/src/api/platform/model/menuModel.ts @@ -46,7 +46,8 @@ export class Menu extends Route { component!: string; framework = ''; parentId?: string; - isPublic!: boolean; + isPublic = false; + startup = false; children = new Array(); } diff --git a/apps/vue/src/views/identity/components/MenuModal.vue b/apps/vue/src/views/identity/components/MenuModal.vue index e4ef2302f..a974cc21c 100644 --- a/apps/vue/src/views/identity/components/MenuModal.vue +++ b/apps/vue/src/views/identity/components/MenuModal.vue @@ -13,6 +13,14 @@