From 461e4fff4b51d067671244eec63b097cd9012b6e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 30 三月 2020 09:25:41 +0800
Subject: [PATCH] 2020-03-30
---
src/templates/comtableconfig/index.jsx | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 7f749bd..1b241b7 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -33,7 +33,7 @@
import TransferForm from '@/components/transferform'
import SourceElement from '@/templates/zshare/dragelement/source'
import CreateFunc from '@/templates/zshare/createfunc'
-// import CreateInterface from '@/templates/zshare/createinterface'
+import CreateInterface from '@/templates/zshare/createinterface'
import Source from './source'
import './index.scss'
@@ -1098,30 +1098,47 @@
const { menu } = this.props
const { config } = this.state
- this.settingRef.handleConfirm().then(setting => {
- if (/[^\s]+\s+[^\s]+/ig.test(setting.dataresource) && config.setting.dataresource !== setting.dataresource) {
- let param = {
- func: 's_DataSrc_Save',
- LText: setting.dataresource,
- MenuID: menu.MenuID
+ this.menuformRef.handleConfirm().then(res => {
+ this.settingRef.handleConfirm().then(setting => {
+ if (/[^\s]+\s+[^\s]+/ig.test(setting.dataresource) && config.setting.dataresource !== setting.dataresource) {
+ let param = {
+ func: 's_DataSrc_Save',
+ LText: setting.dataresource,
+ MenuID: menu.MenuID
+ }
+
+ param.LText = Utils.formatOptions(param.LText)
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+
+ Api.getLocalConfig(param)
}
- param.LText = Utils.formatOptions(param.LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
- Api.getLocalConfig(param)
- }
-
- // let _config = {...config, setting: setting}
-
- // this.refs.tableCreatInterface.exec(setting.innerFunc, newLText, DelText).then(result => {
- // if (result === 'success') {
- // this.setState({
- // config: {...config, setting: setting}
- // })
- // }
- // })
+ if (setting.interType !== 'inner' || setting.innerFunc) {
+ notification.warning({
+ top: 92,
+ message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖涓嶅瓨鍦ㄥ唴閮ㄥ嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
+ duration: 10
+ })
+ return
+ }
+
+ let _config = {...config, setting: setting}
+ let _menu = {
+ type: 'main',
+ MenuID: menu.MenuID,
+ menuName: res.menuName,
+ menuNo: res.menuNo
+ }
+
+ this.refs.tableCreatInterface.exec(_menu, _config).then(result => {
+ if (result === 'success') {
+ this.setState({
+ config: _config
+ })
+ }
+ })
+ })
})
}
@@ -3092,7 +3109,7 @@
})
}}
footer={[
- // <CreateInterface key="interface" dict={this.state.dict} ref="tableCreatInterface" trigger={this.tableCreatInterface}/>,
+ <CreateInterface key="interface" dict={this.state.dict} ref="tableCreatInterface" trigger={this.tableCreatInterface}/>,
<CreateFunc key="create" dict={this.state.dict} ref="tableCreatFunc" trigger={this.tableCreatFunc}/>,
<Button key="cancel" onClick={() => { this.setState({ settingVisible: false }) }}>{this.state.dict['header.cancel']}</Button>,
<Button key="confirm" type="primary" onClick={this.settingSave}>{this.state.dict['header.confirm']}</Button>
--
Gitblit v1.8.0