From ef265678501d84a70a03b9918a09828002fed562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= Date: Fri, 9 Sep 2022 18:15:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=AE=E5=BD=95=E3=80=81?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E3=80=81=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebFirst/database/sqlite.db | Bin 155648 -> 155648 bytes .../Config/SwaggerDoc.xml | 7 +++ .../Controllers/MenuController.cs | 15 ++++- .../yi-sqlsugar-dev.db | Bin 118784 -> 118784 bytes .../ModelsTemplate/MenuEntity.cs | 10 +++ .../Yi.Framework.Service/UserService.cs | 16 +++-- Yi.Vue3.X.RuoYi/src/api/system/menu.js | 2 +- Yi.Vue3.X.RuoYi/src/utils/ruoyi.js | 1 + .../src/views/system/menu/index.vue | 58 +++++++++--------- 9 files changed, 75 insertions(+), 34 deletions(-) diff --git a/WebFirst/database/sqlite.db b/WebFirst/database/sqlite.db index b49bcebf8d0e651d4fcec6fde1ca4417d9d1cbd6..6f14ee401cdf7ea5ed5e156f047bc58198831cbc 100644 GIT binary patch delta 201 zcmZoTz}awsbAmME<%u%RjF&einCLSqHBZ%VpQ_KeeX2gwZAL*$1w(TyLsKhbGd%+n z3lmd|$%#)jwy!i~ik1`M;45O_zra6}Ka<~xpONnx-vYj(&58<9eCgV4O56^4ywtoB gIOF;5mM6Qn0rfuJ*MiWc(WWrnL7z!|Sv(UX0DrASga7~l delta 80 zcmV-W0I&amzzKlB36L8B(UBZO0nxEwG%o=lgOx9bl`jFel`jI@0ki$!TmiStG6Faq m5C#s`01wa)nGb0XG7kX`*0UiX!VUu{h9H+fF9Ii~UjhM*z8XdV diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index bc81ce88..0861a9b6 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -148,6 +148,13 @@ + + + 插入 + + + + 得到树形菜单 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index 81ab9f17..119554e9 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -37,7 +37,20 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpGet] public async Task GetList([FromQuery] MenuEntity menu) { - return Result.Success().SetData(await _iMenuService.SelctGetList(menu)); + var p= await _iMenuService.SelctGetList(menu); + p.ForEach(m => m.Children = new List()); + return Result.Success().SetData(p); + } + + /// + /// 插入 + /// + /// + /// + [HttpPost] + public async Task Add(MenuEntity menu) + { + return Result.Success().SetData(await _iMenuService._repository.InsertReturnSnowflakeIdAsync(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 793982e83785f79fcc68ca5da8837b8fbf9a3ecd..c254745dbe83a11bc09a9aab825eaf36db00878f 100644 GIT binary patch delta 1317 zcmb7^ZD?Cn7{|}Kxk+wby!USD$<2%HGK#E`Hp|V;OA`glCf31Zw#t0L#k}0CjqQ?| zq+L5!vK6tSIFwPYFpw356@*PUyZB{@-IwVX1rhu(#1-cph(mFL*bn}1n=q%Jc3;Bt zsx<7E` zT$+=2d_xjOAV-7F*CfTRFh<{?t-r_UXLNfgx4U}iaJ5pZG;*Qoe62X1ul1?XXt+O= z8<{HAW{nTaw68T>ptDxd{u>d@ZFl%=$|LO5lFN50WOZ8ogwVCtoiXYb9+O&x7e|Sd zm2Bd&ILeFncVFBt`#9tI8vT*yr^(mGP@U>#G;T)BxLl_rJRz>%jjatN5WQ(8x{Q+z z`U_|M-Z(Zz3%qziC>v{2^cCLz33>hO)6>2cn~}c-%_PMZT)()zNV|DFrnfHEB9NxHoqg-DY~0%6irB{NJt=TZ^EuTIXH?v|Fesh ziN_;aGnG!qwRCa3RGcVOXP)D{wjBZ*vDpoOFN_^HLmiKwR^Iyg{Nl~i=WbkHyr=9` zCXvj<1|v}wtx(g2sYat(*@yxudKtg~7S^l# z_CeN#68;1TAI;08=>gqhy~Xw0&}{`=1N_>J)E2;3fG>wRnaF@uz^C6qCIMCeOYcD@ z0+s>Be!v5O(}4Le0B*oZz=0J`CN97U){`9w?2?HS&;VH3#HvipuRO+j4$Pf}&ivna z5s*0togMHLQv%r@WNd&TrueFEi;Z?>#M*|9qs_NrV_Gbmuz3JEtmQAsln=FdnXYg9 E2kwa{Qvd(} delta 1100 zcmZ9~Uu;uV7y$6|-JW}HZ}08trQFMHyA8T5i!QO{uBEzl7#39aLNfjY!8o?2tV>D? z3vD+xWEsvl#={hy&DF$^)y&K%T$orNKxA+DC<*bw5JBrkV*Hc%Vgkmm?S+UpxykqY z&Ue0Z?m73|qI7Oiy4bWyA%wKx`}pa6@42|Bkm$kGo5NR!p*&;=eT0|z0d-wnQc_CX zL*?7jpLQq(O{-DOFI4){Fe!4J@2>TDCcw-dW1*}B7Q&)O3BEOCN~U4J`PRy=6x;wi znucKIb{3*+7rjfGT|1fkyyvXUHboE8g|=OZ((|>^pb6oR_|) z0K;@7*oX}KdI9#+k!Ga7SQ{`J1G@cA z5q=feihXtr(lqDA^!+h7PSdK+miLVV(6kS87#Vi;QY<}`G55_{x0MhDMeG$81#f;Bmy10p6n&%%A0lQ1%;;75TF`|l}uO?e3q zE$FQuo}JA@|8!xpP|TbdVmjOAHW=w4J#y_>@o^Kw3=M7-G_roVynb;u9*-9@g`%M+ zzBsa5BQYx$i%vF@;CB|Be8T2|Dutf$kl?qnhn?Rvh8kWr7$+U4#4TcXX_Iv5FI zyXxHHgO8ThKltpIxyqqJCjZLGVzxM$d^wZL*f*vi2yy%71O#7?M`Kp^1l8G#a?9gh zL1(+Qoy};lvHbqVg)1BHeq5a|Rp(|OyglFefc$7Kb0Twc?CCE^M69lGXDpf6QClEj zue<@O3yktwg(60MD{1N|y|HSX`Tl^aToPWYgtF7TfeBqnz;&g|ZXv6(Ct1bpc zhxzQK8I3eKXezB~B;-K*0TFD#2<^c+0SEFt!fZhQ>lBu4ad0n-FzRR<4)kN0?!dh= zqmj+3YZ_N=JNEE*tn)X9j{VkxLz^6Y+b3v5bMV#oSmtw3{t(N!1N&8k*TKv!gzDhv zRY4<49nMvG9Eir6Mn>d@j!rFOo!de3@@|btbvXYJYalQ>j%8vU&UMlMfViFj8wiSv U$+g=$yjJ [SugarColumn(ColumnName="Remark" )] public string Remark { get; set; } + /// + /// 组件路径 + /// + [SugarColumn(ColumnName="Component" )] + public string Component { get; set; } + /// + /// 路由参数 + /// + [SugarColumn(ColumnName="Query" )] + public string Query { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs index c330927b..cde1d7aa 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs @@ -124,14 +124,22 @@ namespace Yi.Framework.Service { userRoleMenu.RoleCodes.Add(role.RoleCode); - foreach (var menu in role.Menus) + if (role.Menus.IsNotNull()) { - if (!string.IsNullOrEmpty(menu.PermissionCode)) + foreach (var menu in role.Menus) { - userRoleMenu.PermissionCodes.Add(menu.PermissionCode); - userRoleMenu.Menus.Add(menu); + + + if (!string.IsNullOrEmpty(menu.PermissionCode)) + { + userRoleMenu.PermissionCodes.Add(menu.PermissionCode); + userRoleMenu.Menus.Add(menu); + } + + } } + //刚好可以去除一下多余的导航属性 role.Menus = null; userRoleMenu.Roles.Add(role); diff --git a/Yi.Vue3.X.RuoYi/src/api/system/menu.js b/Yi.Vue3.X.RuoYi/src/api/system/menu.js index 07d79630..5c04e404 100644 --- a/Yi.Vue3.X.RuoYi/src/api/system/menu.js +++ b/Yi.Vue3.X.RuoYi/src/api/system/menu.js @@ -36,7 +36,7 @@ export function roleMenuTreeselect(roleId) { // 新增菜单 export function addMenu(data) { return request({ - url: '/system/menu', + url: '/menu/add', method: 'post', data: data }) diff --git a/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js b/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js index 9a9dc3d3..e7993c1d 100644 --- a/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js +++ b/Yi.Vue3.X.RuoYi/src/utils/ruoyi.js @@ -157,6 +157,7 @@ export function mergeRecursive(source, target) { * @param {*} children 孩子节点字段 默认 'children' */ export function handleTree(data, id, parentId, children) { + let config = { id: id || 'id', parentId: parentId || 'parentId', 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 02f091dc..fc2c7220 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/menu/index.vue @@ -106,8 +106,8 @@ @@ -122,8 +122,8 @@ - - + + - + - +