From 76427d51a079a5fd1f45bf7188249e7a4647ae05 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 九月 2020 10:37:25 +0800
Subject: [PATCH] 2020-09-14
---
src/menu/actioncomponent/index.jsx | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/menu/actioncomponent/index.jsx b/src/menu/actioncomponent/index.jsx
index b9185b7..a1073ac 100644
--- a/src/menu/actioncomponent/index.jsx
+++ b/src/menu/actioncomponent/index.jsx
@@ -28,7 +28,6 @@
type: PropTypes.string, // 鑿滃崟绫诲瀷锛屼富琛ㄦ垨瀛愯〃
menu: PropTypes.object, // 鑿滃崟淇℃伅锛堣彍鍗昳d锛岃彍鍗曞弬鏁帮紝鑿滃崟鍚嶇О锛�
config: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
- usefulFields: PropTypes.array, // 鑷畾涔夊嚱鏁板彲鐢ㄥ瓧娈�
tabs: PropTypes.array, // 鎵�鏈夋爣绛�
setSubConfig: PropTypes.func, // 璁剧疆瀛愰厤缃俊鎭�
updateaction: PropTypes.func // 鑿滃崟閰嶇疆鏇存柊
@@ -84,8 +83,7 @@
* @description 鎸夐挳缂栬緫锛岃幏鍙栨寜閽〃鍗曚俊鎭�
*/
handleAction = (card) => {
- const { menu } = this.props
- const { config } = this.props
+ const { menu, config } = this.props
let ableField = menu.permFuncField ? menu.permFuncField.join(', ') : ''
let functip = <div>
@@ -103,6 +101,23 @@
}
})
}
+
+ // let modules = []
+
+ // menu.components.forEach(item => {
+ // if (item.uuid === config.uuid) return
+
+ // modules.push({
+ // value: item.uuid,
+ // text: item.setting.name
+ // })
+ // })
+
+ // if (supModule && supModule !== 'empty') {
+ // if (modules.filter(item => item.value === supModule).length === 0) {
+ // supModule = ''
+ // }
+ // }
if (menu.fstMenuList && card.linkmenu && card.linkmenu.length > 0) {
let _param = {
@@ -492,8 +507,8 @@
}
btnParam.LText = btnParam.LText.join(' union all ')
+ btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
btnParam.LText = Utils.formatOptions(btnParam.LText)
- btnParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
btnParam.secretkey = Utils.encrypt(btnParam.LText, btnParam.timestamp)
_LongParam = window.btoa(window.encodeURIComponent(JSON.stringify(_tab)))
@@ -602,8 +617,6 @@
confirm({
content: dict['model.confirm'] + dict['model.delete'] + ` - ${card.label} 锛焋,
- okText: dict['model.confirm'],
- cancelText: this.state.dict['model.cancel'],
onOk() {
let _actionlist = fromJS(_this.state.actionlist).toJS()
@@ -720,10 +733,10 @@
}
// 鍒涘缓瀛樺偍杩囩▼锛屽繀椤诲～鍐欏唴閮ㄥ嚱鏁板悕
- if (!btn.innerFunc) {
+ if (btn.intertype !== 'inner') {
notification.warning({
top: 92,
- message: '璇峰～鍐欏唴閮ㄥ嚱鏁帮紒',
+ message: '浣跨敤鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
duration: 5
})
return
--
Gitblit v1.8.0