From f8c3c53f9e29541f8c0e3fcbf682c301fd17e06a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十一月 2020 17:49:23 +0800
Subject: [PATCH] 2020-11-23
---
src/templates/menuconfig/editsecmenu/index.jsx | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/templates/menuconfig/editsecmenu/index.jsx b/src/templates/menuconfig/editsecmenu/index.jsx
index 4aa7c4b..fcafd48 100644
--- a/src/templates/menuconfig/editsecmenu/index.jsx
+++ b/src/templates/menuconfig/editsecmenu/index.jsx
@@ -25,7 +25,7 @@
class EditMenu extends Component {
static propTpyes = {
menulist: PropTypes.any, // 浜岀骇鑿滃崟鍒楄〃
- supMenuList: PropTypes.array, // 涓�绾ц彍鍗曞垪琛�
+ menuTree: PropTypes.array, // 涓�绾ц彍鍗曞垪琛�
supMenu: PropTypes.object, // 浜岀骇鑿滃崟鎵�瀵瑰簲鐨勪竴绾ц彍鍗�
reload: PropTypes.func, // 鍒锋柊浜岀骇鑿滃崟鏁版嵁
exitEdit: PropTypes.func // 閫�鍑虹紪杈�
@@ -63,7 +63,7 @@
})
} else if (menu.type === 'close') {
confirm({
- title: dict['model.menu.close'].replace('@M', menu.card.text),
+ title: dict['model.menu.close'].replace('@M', menu.card.MenuName),
content: '',
onOk() {
let param = {
@@ -97,13 +97,13 @@
label: dict['model.super'] + dict['model.menu'],
initVal: this.props.supMenu.MenuID,
required: true,
- options: this.props.supMenuList
+ options: this.props.menuTree
},
{ // 鑿滃崟鍚嶇О
type: 'text',
key: 'menuName',
label: dict['model.menu'] + dict['model.name'],
- initVal: menu.card.text,
+ initVal: menu.card.MenuName,
required: true,
readonly: false
},
@@ -142,7 +142,7 @@
label: dict['model.super'] + dict['model.menu'],
initVal: this.props.supMenu.MenuID,
required: true,
- options: this.props.supMenuList
+ options: this.props.menuTree
},
{ // 鑿滃崟鍚嶇О
type: 'text',
@@ -231,7 +231,20 @@
this.props.exitEdit()
}
} else if (type === 'close') { // 閫�鍑虹紪杈�
- this.props.exitEdit()
+ if (!is(fromJS(this.props.menulist), fromJS(this.state.menulist))) {
+ let _this = this
+
+ confirm({
+ title: '鑿滃崟椤哄簭宸茶皟鏁达紝鏀惧純淇濆瓨鍚楋紵',
+ content: '',
+ onOk() {
+ _this.props.exitEdit()
+ },
+ onCancel() {}
+ })
+ } else {
+ this.props.exitEdit()
+ }
}
}
@@ -428,12 +441,12 @@
confirmLoading={this.state.confirmLoading}
onCancel={this.memuHandleCancel}
>
- {this.state.formlist &&
- <MenuForm
- dict={dict}
- formlist={this.state.formlist}
- wrappedComponentRef={(inst) => this.menuFormRef = inst}
- />}
+ {this.state.formlist ?
+ <MenuForm
+ dict={dict}
+ formlist={this.state.formlist}
+ wrappedComponentRef={(inst) => this.menuFormRef = inst}
+ /> : null}
</Modal>
<Modal
title={dict['model.thaw'] + dict['model.menu']}
--
Gitblit v1.8.0