From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/menu/components/share/actioncomponent/index.jsx | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 32764df..ea3fb0c 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -160,7 +160,7 @@
if (usefulFields) {
try {
usefulFields = JSON.parse(usefulFields)
- } catch {
+ } catch (e) {
usefulFields = []
}
} else {
@@ -176,14 +176,14 @@
if (menulist) {
try {
menulist = JSON.parse(menulist)
- } catch {
+ } catch (e) {
menulist = []
}
} else {
menulist = []
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid)
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, config.uuid) || []
this.setState({
visible: true,
@@ -415,11 +415,7 @@
} else if (element.OpenType === 'innerpage' && element.pageTemplate === 'linkpage') {
MKEmitter.emit('changeEditMenu', {MenuID: element.linkmenu})
} else {
- notification.warning({
- top: 92,
- message: '姝ゆ寜閽棤瀛愰厤缃」锛�',
- duration: 5
- })
+ this.handleAction(element)
}
}
@@ -494,7 +490,7 @@
{/* 鎸夐挳浣跨敤绯荤粺瀛樺偍杩囩▼鏃讹紝楠岃瘉淇℃伅妯℃�佹 */}
<Modal
wrapClassName="model-table-action-verify-modal"
- title={'楠岃瘉淇℃伅'}
+ title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
visible={profVisible}
width={'75vw'}
maskClosable={false}
--
Gitblit v1.8.0