From 316877c1d9e5b6d92334f30b03d97d7e833cd934 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 二月 2021 16:01:57 +0800
Subject: [PATCH] 2021-02-02
---
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 157 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 100 insertions(+), 57 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 6516f5f..464e035 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -36,6 +36,7 @@
interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
funcType: null, // 鍔熻兘绫诲瀷
position: null, // 鎸夐挳浣嶇疆
+ procMode: null, // 澶栭儴鎺ュ彛鍙傛暟澶勭悊鏂瑰紡
pageTemplate: null,
requireOptions: [{
value: 'notRequired',
@@ -69,6 +70,19 @@
}, {
value: 'custom',
text: this.props.dict['header.form.custom']
+ }],
+ interTypeOptions: [{
+ value: 'system',
+ text: this.props.dict['model.interface.system']
+ }, {
+ value: 'inner',
+ text: this.props.dict['model.interface.inner']
+ }, {
+ value: 'outer',
+ text: this.props.dict['model.interface.outer']
+ }, {
+ value: 'custom',
+ text: '鑷畾涔�'
}]
}
@@ -77,8 +91,9 @@
const { card } = this.props
let _opentype = card.OpenType // 鎵撳紑鏂瑰紡
- let _tabType = card.tabType || 'SubTable' // 鎸夐挳涓哄脊绐楋紙鏍囩锛夋椂锛屾爣绛剧殑绫诲瀷
+ // let _tabType = card.tabType || 'SubTable' // 鎸夐挳涓哄脊绐楋紙鏍囩锛夋椂锛屾爣绛剧殑绫诲瀷
let _intertype = card.intertype || 'system' // 鎺ュ彛绫诲瀷
+ let _procMode = card.procMode || 'system' // 鍙傛暟澶勭悊鏂瑰紡
let _funcType = card.funcType || '' // 鍔熻兘鎸夐挳榛樿绫诲瀷
let _tabTemplate = card.tabTemplate // 鎸夐挳涓烘爣绛鹃〉鏃讹紝鏍囩绫诲瀷锛氫笁绾ц彍鍗曟垨琛ㄥ崟鏍囩椤�
let _pageTemplate = card.pageTemplate // 鏂伴〉闈㈢被鍨�
@@ -90,20 +105,26 @@
_opentype = 'tab'
}
- let _tabs = this.props.tabs.filter(tab => tab.type === _tabType)
- let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _tabTemplate)
+ let _tabs = this.props.tabs.filter(tab => tab.type === 'SubTable')
+ let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _tabTemplate, _procMode)
this.setState({
openType: _opentype,
pageTemplate: _pageTemplate,
interType: _intertype,
+ procMode: _procMode,
position: card.position || 'toolbar',
funcType: _funcType,
formlist: this.props.formlist.map(item => {
if (item.key === 'class') {
item.options = btnClasses
+ } else if (item.key === 'innerFunc' && _procMode === 'inner') {
+ item.required = true
} else if (item.key === 'icon') {
item.options = btnIcons
+ } else if (item.key === 'intertype') {
+ let iscustom = ['pop', 'prompt', 'exec'].includes(_opentype)
+ item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
} else if (item.key === 'Ot') {
if (card.position === 'grid' || _pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
@@ -153,7 +174,7 @@
}
}
- getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _tabTemplate) => {
+ getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _tabTemplate, _procMode) => {
let _options = fromJS(actionTypeOptions[_opentype]).toJS() // 閫夐」鍒楄〃
if (_opentype === 'innerpage') { // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
@@ -168,13 +189,13 @@
}
} else if (_opentype === 'excelOut') { // 瀵煎叆瀵煎嚭
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
} else if (_opentype === 'excelIn') { // 瀵煎叆瀵煎嚭
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
@@ -182,14 +203,21 @@
if (_funcType === 'print') {
_options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
}
} else if (_opentype !== 'popview') { // 鎵撳紑鏂瑰紡涓嶆槸寮圭獥椤甸潰鏃�
- if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ if (_intertype === 'custom') {
+ _options.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method')
+ if (_procMode === 'system') {
+ _options.push('sql', 'sqlType')
+ } else {
+ _options.push('innerFunc')
+ }
+ } else if (_intertype === 'outer') {
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
} else {
@@ -205,24 +233,27 @@
}
/**
- * @description 涓嬫媺鍒囨崲
- * 1銆佹墦寮�鏂瑰紡鍒囨崲锛岄噸缃彲瑙佽〃鍗曞拰琛ㄥ崟鍊�
- * 2銆佹樉绀轰綅缃垏鎹紝閲嶇疆閫夋嫨琛�
- * 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
+ * @description 鍒囨崲
*/
- openTypeChange = (key, value) => {
+ optionChange = (key, value) => {
+ const { openType, funcType, procMode } = this.state
const { card } = this.props
if (key === 'OpenType') {
- let _options = this.getOptions(value, this.state.interType, this.state.funcType, this.state.pageTemplate, card.tabTemplate)
+ let _options = this.getOptions(value, 'system', '', this.state.pageTemplate, card.tabTemplate, 'system')
let _fieldval = {}
let _formlist = this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
+ if (item.key === 'intertype') {
+ let iscustom = ['pop', 'prompt', 'exec'].includes(value)
+ item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
+ }
+
if (item.hidden) return item
if (item.key === 'intertype') {
- _fieldval.intertype = this.state.interType
+ _fieldval.intertype = 'system'
} else if (item.key === 'Ot') {
if (this.state.position === 'grid' || this.state.pageTemplate === 'pay') {
item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
@@ -253,6 +284,9 @@
this.setState({
openType: value,
+ funcType: '',
+ intertype: 'system',
+ procMode: 'system',
formlist: _formlist
}, () => {
if (value === 'excelIn') {
@@ -275,10 +309,10 @@
if (value === 'grid' || this.state.pageTemplate === 'pay') {
item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
_fieldval.Ot = 'requiredSgl'
- } else if (this.state.openType === 'innerpage' && this.state.pageTemplate === 'billprint') {
+ } else if (openType === 'innerpage' && this.state.pageTemplate === 'billprint') {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
_fieldval.Ot = 'requiredSgl'
- } else if (['innerpage', 'blank', 'tab', 'popview'].includes(this.state.openType)) {
+ } else if (['innerpage', 'blank', 'tab', 'popview'].includes(openType)) {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
_fieldval.Ot = 'requiredSgl'
} else {
@@ -290,28 +324,28 @@
}, () => {
this.props.form.setFieldsValue(_fieldval)
})
- } else if (key === 'tabType') {
- let _tabs = this.props.tabs.filter(tab => tab.type === value)
- let _fieldval = {}
+ // } else if (key === 'tabType') {
+ // let _tabs = this.props.tabs.filter(tab => tab.type === value)
+ // let _fieldval = {}
- this.setState({
- formlist: this.state.formlist.map(item => {
- if (item.key === 'linkTab') {
- item.options = [
- {
- value: '',
- text: '鏂板缓'
- },
- ..._tabs
- ]
- }
- return item
- })
- }, () => {
- this.props.form.setFieldsValue(_fieldval)
- })
+ // this.setState({
+ // formlist: this.state.formlist.map(item => {
+ // if (item.key === 'linkTab') {
+ // item.options = [
+ // {
+ // value: '',
+ // text: '鏂板缓'
+ // },
+ // ..._tabs
+ // ]
+ // }
+ // return item
+ // })
+ // }, () => {
+ // this.props.form.setFieldsValue(_fieldval)
+ // })
} else if (key === 'funcType') {
- let _options = this.getOptions('funcbutton', this.state.interType, value, card.pageTemplate, card.tabTemplate)
+ let _options = this.getOptions('funcbutton', this.state.interType, value, card.pageTemplate, card.tabTemplate, procMode)
let _fieldval = {}
this.setState({
@@ -365,7 +399,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'pageTemplate') {
- let _options = this.getOptions('innerpage', this.state.interType, this.state.funcType, value, card.tabTemplate)
+ let _options = this.getOptions('innerpage', this.state.interType, this.state.funcType, value, card.tabTemplate, procMode)
let _fieldval = {}
this.setState({
@@ -405,15 +439,8 @@
return item
})
})
- }
- }
-
- onChange = (e, key) => {
- const { openType, funcType } = this.state
- let value = e.target.value
-
- if (key === 'intertype') {
- let _options = this.getOptions(openType, value, funcType, '', '')
+ } else if (key === 'intertype') {
+ let _options = this.getOptions(openType, value, funcType, '', '', procMode)
this.setState({
interType: value,
@@ -431,10 +458,20 @@
}
return item
})
- }, () => {
- if (this.props.form.getFieldValue('sqlType') !== undefined) {
- this.props.form.setFieldsValue({sqlType: ''})
- }
+ })
+ } else if (key === 'procMode') {
+ let _options = this.getOptions(openType, this.state.interType, funcType, '', '', value)
+
+ this.setState({
+ procMode: value,
+ formlist: this.state.formlist.map(item => {
+ item.hidden = !_options.includes(item.key)
+
+ if (item.key === 'innerFunc') {
+ item.required = true
+ }
+ return item
+ })
})
} else if (key === 'sysInterface') {
if (value === 'true') {
@@ -560,7 +597,7 @@
<Select
showSearch
filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
- onChange={(value) => {this.openTypeChange(item.key, value)}}
+ onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('winter')}
>
{item.options.map((option, index) =>
@@ -586,7 +623,7 @@
}
]
})(
- <Radio.Group onChange={(e) => {this.onChange(e, item.key)}} disabled={item.readonly}>
+ <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}} disabled={item.readonly}>
{
item.options.map(option => {
return (
@@ -604,8 +641,14 @@
<Col span={24} key={index}>
<Form.Item label={item.label} className="textarea">
{getFieldDecorator(item.key, {
- initialValue: item.initVal
- })(<TextArea rows={4} />)}
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: item.readonly ? false : !!item.required,
+ message: this.props.dict['form.required.input'] + item.label + '!'
+ }
+ ]
+ })(<TextArea rows={2} readOnly={item.readonly} />)}
</Form.Item>
</Col>
)
@@ -688,7 +731,7 @@
}
}
return (
- <Form {...formItemLayout} className="ant-advanced-search-form commontable-action-form" id="winter">
+ <Form {...formItemLayout} className="normal-action-list-form" id="winter">
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
--
Gitblit v1.8.0