From 07acb5f4dc11e484801ccfcd95eee8845128c62a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 十一月 2019 22:41:29 +0800
Subject: [PATCH] 2019-11-26-01
---
src/templates/comtableconfig/actionform/index.jsx | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/templates/comtableconfig/actionform/index.jsx b/src/templates/comtableconfig/actionform/index.jsx
index b327c62..449e8e0 100644
--- a/src/templates/comtableconfig/actionform/index.jsx
+++ b/src/templates/comtableconfig/actionform/index.jsx
@@ -73,11 +73,16 @@
if (key === 'OpenType') {
let _options = null
if (value === 'newpage') {
- _options = ['label', 'position', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class']
+ _options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
+ } else if (value === 'blank' || value === 'tab' || value === 'popview') {
+ _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position']
+ } else {
+ _options = ['label', 'position', 'OpenType', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
}
this.setState({
openType: value,
- expand: value === 'newpage' ? false : this.state.expand,
+ expand: false,
+ interType: 'inner',
formlist: this.state.formlist.map(item => {
if (_options) {
item.hidden = !_options.includes(item.key)
@@ -216,9 +221,9 @@
let expand = !this.state.expand
let _options = null
if (expand) {
- _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class']
+ _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
} else {
- _options = ['label', 'position', 'OpenType', 'innerFunc', 'Ot', 'icon', 'class']
+ _options = ['label', 'position', 'OpenType', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
}
if (!expand) {
this.setState({
@@ -249,11 +254,13 @@
let _options = null
if (_opentype === 'newpage') {
_options = ['label', 'Ot', 'OpenType', 'pageTemplate', 'icon', 'class', 'position']
+ } else if (_opentype === 'blank' || _opentype === 'tab' || _opentype === 'popview') {
+ _options = ['label', 'Ot', 'OpenType', 'icon', 'class', 'position']
} else {
if (_intertype === 'outer') {
- _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class']
+ _options = ['label', 'position', 'OpenType', 'intertype', 'innerFunc', 'interface', 'outerFunc', 'callbackFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
} else {
- _options = ['label', 'position', 'OpenType', 'innerFunc', 'Ot', 'icon', 'class']
+ _options = ['label', 'position', 'OpenType', 'innerFunc', 'Ot', 'icon', 'class', 'execSuccess', 'execError']
}
}
this.setState({
@@ -276,6 +283,7 @@
}
render() {
+ const { openType } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -289,7 +297,7 @@
return (
<Form {...formItemLayout} className="ant-advanced-search-form commontable-action-form" id="winter">
<Row gutter={24}>{this.getFields()}</Row>
- {this.state.openType !== 'newpage' && <Row>
+ {openType !== 'newpage' && openType !== 'blank' && openType !== 'tab' && openType !== 'popview' && <Row>
<Col span={24} style={{ textAlign: 'right' }}>
<span className="superconfig" onClick={this.toggle}>
楂樼骇璁剧疆 <Icon type={this.state.expand ? 'up' : 'down'} />
--
Gitblit v1.8.0