From d712ae0a0d338bdc96c463c9ffe42f8c844f3c37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 12:46:57 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/pcdesign/index.jsx | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 36018b0..9a294ce 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -776,15 +776,14 @@
}
}
} else {
- let uuids = {} // 閲嶇疆鍏叡鏁版嵁婧�
+ let commonId = Utils.getuuid()
if (config.interfaces && config.interfaces.length > 0) {
config.interfaces = config.interfaces.map(inter => {
- uuids[inter.uuid] = this.getuuid()
- inter.uuid = uuids[inter.uuid]
+ inter.uuid = md5(commonId + inter.uuid)
return inter
})
}
- config.components = MenuUtils.resetConfig(config.components, uuids, urlParam.clearMenu)
+ config.components = MenuUtils.resetConfig(config.components, commonId, urlParam.clearMenu)
if (config.version !== 2.0) {
config.components = this.collectTB(config.components)
@@ -1374,14 +1373,14 @@
}
resolve(result)
- })
+ }, this.netError)
} else {
resolve(res)
}
} else {
resolve(res)
}
- })
+ }, this.netError)
}
}
}).then(res => { // 椤甸潰淇濆瓨
@@ -1419,10 +1418,23 @@
duration: 5
})
}
- })
+ }, this.netError)
}, 300 + (+sessionStorage.getItem('mkDelay')))
}
+ netError = (error) => {
+ this.setState({
+ menuloading: false
+ })
+ if (!error) {
+ notification.warning({
+ top: 92,
+ message: '淇濆瓨澶辫触锛岃妫�鏌ョ綉缁滄槸鍚︽甯搞��',
+ duration: 5
+ })
+ }
+ }
+
getRoleFields = () => {
if (sessionStorage.getItem('sysRoles') || sessionStorage.getItem('permFuncField')) return
Api.getSystemConfig({func: 'sPC_Get_Roles_sModular'}).then(res => {
--
Gitblit v1.8.0