From 01631860f4f032ee1d08161403eaad76ca75a9da Mon Sep 17 00:00:00 2001 From: chenchun <454313500@qq.com> Date: Sun, 11 Sep 2022 22:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Config/SwaggerDoc.xml | 9 ++++- .../Controllers/MenuController.cs | 18 +++++++-- .../yi-sqlsugar-dev.db | Bin 126976 -> 126976 bytes .../ModelsTemplate/MenuEntity.cs | 1 - Yi.Vue3.X.RuoYi/src/api/system/menu.js | 15 +++++--- .../src/store/modules/permission.js | 36 ++++++++++-------- .../src/views/system/menu/index.vue | 9 +++-- .../src/views/system/role/index.vue | 8 ++-- .../src/views/system/user/index.vue | 29 +++++--------- 9 files changed, 71 insertions(+), 54 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index a609e384..bee8e277 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -236,7 +236,7 @@ 菜单管理 - + 动态条件查询全部 @@ -250,6 +250,13 @@ + + + 更新 + + + + 得到树形菜单 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index d714b507..0040af29 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -20,10 +20,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// [ApiController] [Route("api/[controller]/[action]")] - public class MenuController + public class MenuController: BaseSimpleRdController { private IMenuService _iMenuService; - public MenuController(ILogger logger, IMenuService iMenuService) + public MenuController(ILogger logger, IMenuService iMenuService):base(logger,iMenuService) { _iMenuService = iMenuService; } @@ -35,7 +35,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// [HttpGet] - public async Task GetList([FromQuery] MenuEntity menu) + public async Task SelctGetList([FromQuery] MenuEntity menu) { return Result.Success().SetData(await _iMenuService.SelctGetList(menu)); } @@ -51,6 +51,18 @@ namespace Yi.Framework.ApiMicroservice.Controllers return Result.Success().SetData(await _iMenuService._repository.InsertReturnSnowflakeIdAsync(menu)); } + /// + /// 更新 + /// + /// + /// + [HttpPut] + public async Task Update(MenuEntity menu) + { + //注意，这里如果是主目录，还需要判断/，需要以/开头 + return Result.Success().SetData(await _iMenuService._repository.UpdateIgnoreNullAsync(menu)); + } + /// /// 得到树形菜单 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 33cc8114129a14bf113a1311c3945bbb16603cba..04e4220184518901b34d411c5344825415c1bde1 100644 GIT binary patch delta 452 zcmZp8z~1nHeS$RO+=(*IjB^_kwk9wx%va>w!obNrhk<(z|1^GMJ{#VHyv{tQd9rv| zxTPU*xpT!1cRhJ2L~r30|SHTF)nkK=@;u56+#UR ziYtptQgb1sp^-5&P}3}AP10~poUcDI2{1h0y!-j?`Onuad_JMg$iT=**C35ij18*8 z8Dx$0^rLl*I@$&X5NS(YLqi24Ln|XwD^oK)Lqk&o6LVvTefkiJc{@uD;|3-cpwsH7 z@2F#}7EEMDF;Y}~x@0}0jyZ;rW>$uVdM2jEmImf#CHeU|`XC~M2}QHC?DXCBjJhi5 z&M~txu+TFzFfcVYG|SD;%Ph$+(x3jLo>7T|KLP@$D>Q(@vVl>WU(W;_XomzCc!91| i7d-|E3?3jy3dmVt-z31m4dn0wIsMg4+dKOi%M$>-AZ(8S delta 429 zcmZp8z~1nHeS$ROq=_=ljFTD@wk9wx%va=(VBq9oVdUGwzlxuO&xZFPuQShSo-7^~ z7Cs2vu2jJIlS`ia2!pdK2QLSMHG?%L1B0ZjsEFy7h$aDs7yWad_D-Gtu!>Q1`hf~Y zew7qv5jGT+3=9k$3^z+;7Sz4T0WK~*_l322xrG{|>6H5@I7~Aw6b&S>1i@O zOwEnW4NNRb^7C^*7-$GXkSYhz4rj1M($X9poE+0v*E4FWn(CPvn^+oIn&;-{WtQX@ zfv6BBF`%E2luut?&!{Vau5|j3dPXGi?C;$Ke diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs index fb6d363c..b20eb81b 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs @@ -13,7 +13,6 @@ namespace Yi.Framework.Model.Models { public MenuEntity() { - this.IsDeleted = false; this.CreateTime = DateTime.Now; } [JsonConverter(typeof(ValueToStringConverter))] diff --git a/Yi.Vue3.X.RuoYi/src/api/system/menu.js b/Yi.Vue3.X.RuoYi/src/api/system/menu.js index f4a0818d..2cab2ce1 100644 --- a/Yi.Vue3.X.RuoYi/src/api/system/menu.js +++ b/Yi.Vue3.X.RuoYi/src/api/system/menu.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询菜单列表 export function listMenu(query) { return request({ - url: '/menu/getList', + url: '/menu/selctGetList', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listMenu(query) { // 查询菜单详细 export function getMenu(menuId) { return request({ - url: '/system/menu/' + menuId, + url: '/menu/getById/' + menuId, method: 'get' }) } @@ -45,7 +45,7 @@ export function addMenu(data) { // 修改菜单 export function updateMenu(data) { return request({ - url: '/system/menu', + url: '/menu/update', method: 'put', data: data }) @@ -53,8 +53,13 @@ export function updateMenu(data) { // 删除菜单 export function delMenu(menuId) { + if("string"==typeof(menuId)) + { + menuId=[menuId]; + } return request({ - url: '/system/menu/' + menuId, - method: 'delete' + url: '/menu/delList', + method: 'delete', + data:menuId }) } \ No newline at end of file diff --git a/Yi.Vue3.X.RuoYi/src/store/modules/permission.js b/Yi.Vue3.X.RuoYi/src/store/modules/permission.js index 7f626039..2aa465c9 100644 --- a/Yi.Vue3.X.RuoYi/src/store/modules/permission.js +++ b/Yi.Vue3.X.RuoYi/src/store/modules/permission.js @@ -35,8 +35,11 @@ const usePermissionStore = defineStore( generateRoutes(roles) { return new Promise(resolve => { // 向后端请求路由数据 -// getRouters().then(response => { -// const res=response.data; + getRouters().then(response => { + // const res=response.data; + + + const res=[ { "name": "System", @@ -345,23 +348,24 @@ const res=[ ]; - const sdata = JSON.parse(JSON.stringify(res)) - const rdata = JSON.parse(JSON.stringify(res)) - const defaultData = JSON.parse(JSON.stringify(res)) - const sidebarRoutes = filterAsyncRouter(sdata) - const rewriteRoutes = filterAsyncRouter(rdata, false, true) - const defaultRoutes = filterAsyncRouter(defaultData) - const asyncRoutes = filterDynamicRoutes(dynamicRoutes) - asyncRoutes.forEach(route => { router.addRoute(route) }) - this.setRoutes(rewriteRoutes) - this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)) - this.setDefaultRoutes(sidebarRoutes) - this.setTopbarRoutes(defaultRoutes) - resolve(rewriteRoutes) + +const sdata = JSON.parse(JSON.stringify(res)) +const rdata = JSON.parse(JSON.stringify(res)) +const defaultData = JSON.parse(JSON.stringify(res)) +const sidebarRoutes = filterAsyncRouter(sdata) +const rewriteRoutes = filterAsyncRouter(rdata, false, true) +const defaultRoutes = filterAsyncRouter(defaultData) +const asyncRoutes = filterDynamicRoutes(dynamicRoutes) +asyncRoutes.forEach(route => { router.addRoute(route) }) +this.setRoutes(rewriteRoutes) +this.setSidebarRouters(constantRoutes.concat(sidebarRoutes)) +this.setDefaultRoutes(sidebarRoutes) +this.setTopbarRoutes(defaultRoutes) +resolve(rewriteRoutes) - // }) + }) }) } } diff --git a/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue index 47de969f..539572be 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue @@ -62,7 +62,8 @@ - + +