From f7e9b835c30e5b3287b2c04e24950871cafa907d Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 07 Sep 2020 15:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/module/menu/menu.jsx | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/module/menu/menu.jsx b/src/module/menu/menu.jsx
index ccff58d..87ee211 100644
--- a/src/module/menu/menu.jsx
+++ b/src/module/menu/menu.jsx
@@ -37,14 +37,30 @@
super(props);
this.state = {
collapsed: true,
- menusListByRole: null
+ menusListByRole: null,
+ menusList: null,
};
}
componentDidMount() {
// 获取从登录页面记录在缓存里的菜单数据
let menusListByRole = window.localStorage.getItem('menusListByRole') ? JSON.parse(window.localStorage.getItem('menusListByRole')) : null;
- this.setState({ menusListByRole });
+ let menu = window.localStorage.getItem('menu') ? JSON.parse(window.localStorage.getItem('menu')) : [];//获取权限菜单
+ let administration = menu.find(({ moduleSymbol }) => moduleSymbol == 'administration');
+ let menusList = [];
+ if (administration) {
+ // setSelectList(selectList.concat({ name: '用户中心', key: 'user' }));
+ let temp = ["oa", "user"];
+ menusList = temp.reduce((p, n) => {
+ return p.concat(menusListByRole[n].menus)
+ }, []);
+ } else {
+ menusList = menusListByRole['oa'].menus
+ }
+ this.setState({
+ menusList
+ })
+ // this.setState({ menusListByRole });
}
onCollapse = collapsed => {
@@ -52,7 +68,7 @@
}
render() {
- const { collapsed, menusListByRole } = this.state;
+ const { collapsed, menusListByRole, menusList } = this.state;
return (
<Context.Consumer>
{({ role }) => (
@@ -64,11 +80,11 @@
collapsible={true}
>
{
- menusListByRole && menusListByRole[role] &&
+ menusList &&
<MenView
history={this.props.history}
- pathname={selected(menusListByRole[role].menus, this.props.location.pathname)}
- menudata={menusListByRole[role].menus || []}
+ pathname={selected(menusList, this.props.location.pathname)}
+ menudata={menusList || []}
/>
}
</Sider>
--
Gitblit v1.8.0