From c45ce4462a072c391e0948475b3c17887969f68e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 12:20:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/menudesign/index.jsx | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index eac50e4..fdf22ba 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -73,6 +73,13 @@
}
UNSAFE_componentWillMount() {
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
if (!sessionStorage.getItem('UserID')) {
sessionStorage.removeItem('isEditState')
sessionStorage.removeItem('appType')
@@ -87,6 +94,7 @@
window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
+ window.GLOB.developing = true
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
@@ -864,8 +872,6 @@
menuloading: true
})
- window.GLOB.saving = true
-
setTimeout(() => {
let _pass = this.verifyConfig(config)
@@ -1029,8 +1035,6 @@
menuloading: false
})
- window.GLOB.saving = false
-
if (!res) return
if (res.status) {
@@ -1055,8 +1059,6 @@
this.setState({
menuloading: false
})
-
- window.GLOB.saving = false
if (!error) {
notification.warning({
--
Gitblit v1.8.0