From 515f0149680345557c373b385e165756107d44fa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 九月 2021 22:04:24 +0800
Subject: [PATCH] 2021-09-19
---
src/components/header/index.jsx | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 22d4bf1..16d1e9d 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -8,7 +8,6 @@
import {
toggleCollapse,
- modifyMenuTree,
modifyMainMenu,
initActionPermission,
initMenuPermission,
@@ -210,7 +209,6 @@
sessionStorage.removeItem('ThirdMenu')
}
- this.props.modifyMenuTree(menulist)
this.props.modifyMainMenu(mainMenu)
this.props.initMenuPermission([...thdMenuList, {MenuID: 'home_page_id', EasyCode: '', MenuName: 'home', type: 'CustomPage'}])
@@ -373,6 +371,8 @@
sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
sessionStorage.setItem('isEditState', 'true')
+
+ this.props.modifyMainMenu(null)
this.props.history.replace('/design')
}
@@ -563,14 +563,6 @@
UNSAFE_componentWillMount () {
// 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
this.getRolesMenu()
- }
-
- UNSAFE_componentWillReceiveProps (nextProps) {
- if (!is(fromJS(this.props.menuTree), fromJS(nextProps.menuTree)) && !is(fromJS(this.state.menulist), fromJS(nextProps.menuTree))) {
- this.setState({
- menulist: nextProps.menuTree
- })
- }
}
componentDidMount () {
@@ -857,7 +849,6 @@
const mapStateToProps = (state) => {
return {
collapse: state.collapse,
- menuTree: state.menuTree,
mainMenu: state.mainMenu,
permAction: state.permAction,
}
@@ -866,7 +857,6 @@
const mapDispatchToProps = (dispatch) => {
return {
toggleCollapse: (collapse) => dispatch(toggleCollapse(collapse)),
- modifyMenuTree: (menuTree) => dispatch(modifyMenuTree(menuTree)),
modifyMainMenu: (mainMenu) => dispatch(modifyMainMenu(mainMenu)),
initActionPermission: (permAction) => dispatch(initActionPermission(permAction)),
initMenuPermission: (permMenus) => dispatch(initMenuPermission(permMenus)),
--
Gitblit v1.8.0