From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/header/index.jsx | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index cfbbe05..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) {
@@ -513,7 +508,7 @@
content: '閲嶆柊鍔犺浇搴旂敤淇℃伅',
onOk() {
return new Promise(resolve => {
- if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ if (!window.GLOB.IndexDB) {
notification.warning({
top: 92,
message: '鏇存柊澶辫触锛岃鍒锋柊椤甸潰閲嶈瘯锛�',
@@ -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>
--
Gitblit v1.8.0