From e91ac311580bdbf636ae3fa7e9c2b6fd261d8bc3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 一月 2020 00:57:41 +0800
Subject: [PATCH] 2020-01-19
---
src/api/index.js | 4 ++--
src/components/header/index.jsx | 5 ++++-
src/components/sidemenu/index.jsx | 10 ++++++++++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 5984450..062999d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -121,8 +121,8 @@
param.SessionUid = sessionStorage.getItem('SessionUid') || ''
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
param.appkey = window.GLOB.appkey || ''
-
- if (sessionStorage.getItem('isEditState') && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
+
+ if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
param.rduri = options.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID')
param.SessionUid = sessionStorage.getItem('CloudSessionUid') || ''
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 1442179..3fedb90 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -230,16 +230,17 @@
let UserID = sessionStorage.getItem('CloudUserID')
let LoginUID = sessionStorage.getItem('CloudLoginUID')
- sessionStorage.setItem('isEditState', state)
if (state && (!UserID || !LoginUID)) {
this.setState({
loginVisible: true
})
} else {
+ sessionStorage.setItem('isEditState', state)
this.setState({
menulist: null
})
this.loadmenu()
+ this.props.modifyMainMenu('')
this.props.resetEditState(state)
}
}
@@ -254,6 +255,7 @@
sessionStorage.setItem('CloudUserID', res.UserID)
sessionStorage.setItem('CloudSessionUid', Utils.getuuid())
sessionStorage.setItem('CloudLoginUID', res.LoginUID)
+ sessionStorage.setItem('isEditState', 'true')
this.setState({
menulist: null,
@@ -261,6 +263,7 @@
loginLoading: false
})
this.loadmenu()
+ this.props.modifyMainMenu('')
this.props.resetEditState(true)
} else {
this.setState({
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index c1080e3..89e9edc 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -36,6 +36,16 @@
}
async loadsubmenu (menu) {
+ if (!menu || !menu.MenuID) { // 娌℃湁涓昏彍鍗曟椂锛屾竻绌轰笅绾ц彍鍗�
+ this.setState({
+ subMenulist: [],
+ rootSubmenuKeys: [],
+ openKeys: [],
+ editMenu: null
+ })
+ return
+ }
+
let result = await Api.getSystemConfig({func: 'sPC_Get_FunMenu', ParentID: menu.MenuID})
if (result.status) {
if (result.data.length === 0) { // 鏌ヨ鑿滃崟涓虹┖
--
Gitblit v1.8.0