From 1a14ff6035932eadfb6ef7970e3adb24b4e158a6 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 18 十二月 2019 18:56:17 +0800 Subject: [PATCH] 2019-12-18 --- src/tabviews/commontable/mainAction/index.jsx | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/tabviews/commontable/mainAction/index.jsx b/src/tabviews/commontable/mainAction/index.jsx index 50298f9..096c27c 100644 --- a/src/tabviews/commontable/mainAction/index.jsx +++ b/src/tabviews/commontable/mainAction/index.jsx @@ -31,6 +31,7 @@ refreshdata = (item, type) => { this.props.refreshdata(item, type) } + actionTrigger = (item) => { const { setting } = this.props @@ -86,6 +87,8 @@ }, () => { this.improveAction(item) }) + } else if (item.OpenType === 'excelOut') { + this.refreshdata(item, 'excelOut') } else { notification.warning({ top: 92, @@ -499,7 +502,8 @@ message: this.props.dict['main.action.confirm.success'], duration: 2 }) - if (btn.OpenType === 'pop') { + + if (btn.OpenType === 'pop' && btn.setting && btn.setting.finish !== 'unclose') { this.setState({ visible: false }) @@ -708,7 +712,9 @@ let title = '' let width = '62vw' + let clickouter = false let container = document.body + if (execAction && execAction.setting) { title = execAction.setting.title width = execAction.setting.width + 'vw' @@ -717,13 +723,18 @@ width = execAction.setting.width + '%' container = () => document.getElementById('commontable' + this.props.MenuID) } + + if (execAction.setting.clickouter === 'close') { + clickouter = true + } } return ( <Modal + title={title} + maskClosable={clickouter} getContainer={container} wrapClassName='action-modal' - title={title} visible={this.state.visible} width={width} onOk={this.handleOk} @@ -734,6 +745,7 @@ <MutilForm dict={this.props.dict} action={execAction} + inputSubmit={this.handleOk} configMap={this.state.configMap} data={this.state.tabledata[0]} wrappedComponentRef={(inst) => this.formRef = inst} -- Gitblit v1.8.0