From d441fa1e1cc80f4ea462a750a42a2b25c1f2b202 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十二月 2020 15:17:51 +0800
Subject: [PATCH] 2020-12-04
---
src/components/header/index.jsx | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 486af95..c9e352c 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -15,7 +15,6 @@
resetState,
resetEditState,
resetEditLevel,
- modifyDataManager,
initActionPermission,
initMenuPermission,
logout
@@ -52,7 +51,8 @@
searchkey: '',
thdMenuList: [],
oriVersion: '',
- newVersion: ''
+ newVersion: '',
+ debug: sessionStorage.getItem('debug') === 'true'
}
handleCollapse = () => {
@@ -418,7 +418,8 @@
})
} else {
sessionStorage.setItem('isEditState', 'true')
- this.props.modifyDataManager(sessionStorage.getItem('cloudDataM') === 'true')
+ sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
+ sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
if (window.GLOB.systemType === 'production') {
this.props.resetEditLevel('HS')
@@ -489,13 +490,16 @@
sessionStorage.setItem('CloudUserName', res.UserName)
sessionStorage.setItem('CloudFullName', res.FullName)
sessionStorage.setItem('CloudAvatar', res.icon)
- sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
-
- sessionStorage.setItem('isEditState', 'true')
- if (res.dataM) {
- this.props.modifyDataManager(true)
- }
+ sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
+ sessionStorage.setItem('localDataM', sessionStorage.setItem('dataM') || '')
+
+ sessionStorage.setItem('cloudRole_id', res.role_id || '')
+ sessionStorage.setItem('localRole_id', sessionStorage.getItem('role_id') || '')
+
+ sessionStorage.setItem('role_id', res.role_id || '')
+ sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
+ sessionStorage.setItem('isEditState', 'true')
if (window.GLOB.systemType === 'production') {
this.props.resetEditLevel('HS')
@@ -698,11 +702,11 @@
render () {
const { mainMenu, collapse } = this.props
- const { thdMenuList, searchkey, oriVersion, newVersion } = this.state
+ const { thdMenuList, searchkey, oriVersion, newVersion, debug } = this.state
const menu = (
<Menu className="header-dropdown">
- {this.props.debug && <Menu.Item key="switch">
+ {debug && <Menu.Item key="switch">
{this.state.dict['main.edit']}
<Switch size="small" className="edit-switch" disabled={!!this.props.editLevel} checked={this.props.editState} onChange={this.changeEditState} />
</Menu.Item>}
@@ -836,7 +840,6 @@
collapse: state.collapse,
menuTree: state.menuTree,
mainMenu: state.mainMenu,
- debug: state.debug,
editState: state.editState,
editLevel: state.editLevel,
permAction: state.permAction,
@@ -854,7 +857,6 @@
resetEditLevel: (level) => dispatch(resetEditLevel(level)),
initActionPermission: (permAction) => dispatch(initActionPermission(permAction)),
initMenuPermission: (permMenus) => dispatch(initMenuPermission(permMenus)),
- modifyDataManager: (dataManager) => dispatch(modifyDataManager(dataManager)),
resetState: () => dispatch(resetState()),
logout: () => dispatch(logout())
}
--
Gitblit v1.8.0