From 5d5dc4dde6c6e2e91f94f5bf54a8a74cf5cc8375 Mon Sep 17 00:00:00 2001 From: xxx Date: Thu, 21 Sep 2023 10:02:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/compenents/left-menu/index.tsx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/compenents/left-menu/index.tsx b/src/compenents/left-menu/index.tsx index 85f7715..e514641 100644 --- a/src/compenents/left-menu/index.tsx +++ b/src/compenents/left-menu/index.tsx @@ -37,16 +37,16 @@ const items = [ , null, null, - null + "resource-category-menu" ), getItem( "资源管理", "resource", , [ - getItem("视频", "/videos", null, null, null, null), - getItem("图片", "/images", null, null, null, null), - getItem("课件", "/courseware", null, null, null, null), + getItem("视频", "/videos", null, null, null, "resource-menu"), + getItem("图片", "/images", null, null, null, "resource-menu"), + getItem("课件", "/courseware", null, null, null, "resource-menu"), ], null, null @@ -92,7 +92,6 @@ const items = [ "admin-user-index" ), getItem("管理日志", "/system/adminlog", null, null, null, "admin-log"), - // getItem("角色配置", "/system/adminroles", null, null, null, null), ], null, null @@ -120,6 +119,7 @@ export const LeftMenu: React.FC = () => { } return []; }; + const openKeyMerge = (pathname: string): string[] => { let newOpenKeys = hit(pathname); for (let i = 0; i < openKeys.length; i++) { @@ -166,8 +166,14 @@ export const LeftMenu: React.FC = () => { for (let i in items) { let menuItem = items[i]; - if (!menuItem.children) { - // 一级菜单不做权限控制 + // 一级菜单=>没有子菜单&配置了权限 + if (menuItem.children === null) { + if ( + menuItem.permission !== null && + typeof permissions[menuItem.permission] === "undefined" + ) { + continue; + } menus.push(menuItem); continue; }