From 4326527e1383fd83dc6f991d4d65de8d17bf82ee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 三月 2023 13:57:45 +0800
Subject: [PATCH] 2023-03-21
---
src/index.js | 2 --
src/views/sso/index.jsx | 2 --
src/views/systemfunc/index.jsx | 2 ++
src/views/billprint/index.jsx | 1 -
src/components/header/index.jsx | 11 +++--------
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 2 --
src/views/login/index.jsx | 6 ------
7 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 991636e..94e445b 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -33,7 +33,6 @@
userName: '',
fullName: '',
logourl: window.GLOB.mainlogo,
- appVersion: window.GLOB.appVersion,
loginVisible: false,
loginLoading: false,
avatar: Utils.getrealurl(sessionStorage.getItem('avatar')),
@@ -288,8 +287,6 @@
loginVisible: true
})
} else {
- sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
- sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
sessionStorage.setItem('isEditState', 'true')
this.props.modifyMainMenu(null)
@@ -332,8 +329,6 @@
sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('cloudRole_id', res.role_id || '')
- sessionStorage.setItem('role_id', res.role_id || '')
- sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
sessionStorage.setItem('isEditState', 'true')
if (param.remember) {
@@ -540,7 +535,7 @@
about = () => {
Modal.success({
- title: '绯荤粺鐗堟湰v' + this.state.appVersion
+ title: '绯荤粺鐗堟湰v' + window.GLOB.appVersion
})
}
@@ -552,7 +547,7 @@
render () {
const { mainMenu, collapse } = this.props
- const { thdMenuList, searchkey, debug, menulist, appVersion } = this.state
+ const { thdMenuList, searchkey, debug, menulist } = this.state
const navBar = window.GLOB.navBar
const menu = (
@@ -571,7 +566,7 @@
<Menu.Item key="verup" onClick={this.verup}>
椤甸潰鏇存柊
</Menu.Item>
- {appVersion ? <Menu.Item key="version" onClick={this.about}>
+ {window.GLOB.appVersion ? <Menu.Item key="version" onClick={this.about}>
鍏充簬
</Menu.Item> : null}
<Menu.Item key="logout" onClick={this.logout}>閫�鍑�</Menu.Item>
diff --git a/src/index.js b/src/index.js
index d9eb39e..b4541b2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -45,8 +45,6 @@
}
sessionStorage.removeItem('isEditState')
-sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
-sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
// 鏂扮郴缁熸枃浠剁疆浜巃dmin涓� ../options.json , { cache: 'no-cache'}
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index b8e80e2..4935f6f 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -186,13 +186,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 1ebe237..b1a6a03 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -61,7 +61,6 @@
let param = JSON.parse(window.decodeURIComponent(window.atob(params.param)))
sessionStorage.setItem('dataM', param.dataM || '')
- sessionStorage.setItem('localDataM', param.dataM || '')
this.setState({
BID: param.id || '',
tempId: param.tempId,
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index af5ae0b..2738aa7 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -91,13 +91,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -195,13 +193,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -246,13 +242,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
diff --git a/src/views/sso/index.jsx b/src/views/sso/index.jsx
index f889cad..fd3b884 100644
--- a/src/views/sso/index.jsx
+++ b/src/views/sso/index.jsx
@@ -32,13 +32,11 @@
sessionStorage.setItem('Full_Name', res.FullName)
sessionStorage.setItem('avatar', res.icon || '')
sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('debug', res.debug || '')
sessionStorage.setItem('role_id', res.role_id || '')
sessionStorage.setItem('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
this.getMessage()
} else {
diff --git a/src/views/systemfunc/index.jsx b/src/views/systemfunc/index.jsx
index eed695a..6910e9b 100644
--- a/src/views/systemfunc/index.jsx
+++ b/src/views/systemfunc/index.jsx
@@ -13,6 +13,8 @@
class Design extends Component {
UNSAFE_componentWillMount() {
+ sessionStorage.setItem('role_id', sessionStorage.getItem('cloudRole_id'))
+ sessionStorage.setItem('dataM', sessionStorage.getItem('cloudDataM'))
document.body.className = 'mk-blue-black'
sessionStorage.setItem('isEditState', 'true')
window.GLOB.mkHS = true
--
Gitblit v1.8.0