From c45a375e5b4ce0e33c7fc8a1aecdad67d60acc9e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 01 三月 2021 15:09:06 +0800
Subject: [PATCH] 2021-03-01
---
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 315b7a3..9e150f6 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',
@@ -92,6 +93,7 @@
let _opentype = card.OpenType // 鎵撳紑鏂瑰紡
// 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 // 鏂伴〉闈㈢被鍨�
@@ -104,17 +106,20 @@
}
let _tabs = this.props.tabs.filter(tab => tab.type === 'SubTable')
- let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _tabTemplate)
+ 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') {
@@ -169,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') { // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
@@ -184,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')
}
@@ -198,16 +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 === 'custom') {
- _options.push('sql', 'sqlType', 'innerFunc', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method')
+ _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', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
} else {
@@ -226,11 +236,11 @@
* @description 鍒囨崲
*/
optionChange = (key, value) => {
- const { openType, funcType } = this.state
+ const { openType, funcType, procMode } = this.state
const { card } = this.props
if (key === 'OpenType') {
- let _options = this.getOptions(value, 'system', '', 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)
@@ -276,6 +286,7 @@
openType: value,
funcType: '',
intertype: 'system',
+ procMode: 'system',
formlist: _formlist
}, () => {
if (value === 'excelIn') {
@@ -334,7 +345,7 @@
// 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({
@@ -388,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({
@@ -429,7 +440,7 @@
})
})
} else if (key === 'intertype') {
- let _options = this.getOptions(openType, value, funcType, '', '')
+ let _options = this.getOptions(openType, value, funcType, '', '', procMode)
this.setState({
interType: value,
@@ -447,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') {
@@ -620,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>
)
@@ -638,7 +665,7 @@
}
]
})(
- <Cascader options={item.options || []} placeholder="" />
+ <Cascader allowClear options={item.options || []} placeholder="" />
)}
</Form.Item>
</Col>
@@ -649,13 +676,13 @@
}
handleConfirm = () => {
- const { setting } = this.props
+ const { setting, card } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
- values.uuid = this.props.card.uuid
- values.verify = this.props.card.verify || null
+ values.uuid = card.uuid
+ values.verify = card.verify || null
if (values.OpenType === 'excelIn') {
values.position = 'toolbar'
@@ -673,14 +700,18 @@
values.Ot = 'notRequired'
} else if (values.OpenType === 'popview' && !values.linkTab) { // 娌℃湁鍏宠仈鏍囩锛堟柊寤烘椂锛夛紝鍒涘缓鏂版爣绛綢d
values.linkTab = Utils.getuuid()
- values.createTab = true // 鐢ㄤ簬鏍囪鎸夐挳澶嶅埗鏃讹紝鏄惁澶嶅埗鍘熸湁鏍囩
} else if (values.OpenType === 'funcbutton') { // 杞崲鎵撳嵃鏃舵墦寮�鏂瑰紡
values.position = 'toolbar'
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
- if (values.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(this.props.card.Ot)) {
+ if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
values.verify.uniques = []
- } else if (this.props.card.Ot === 'requiredOnce' && ['notRequired', 'requiredSgl', 'required'].includes(values.Ot)) {
- values.verify.uniques = []
+ }
+ if (card.Ot !== values.Ot) {
+ if (values.Ot === 'notRequired') {
+ values.verify.invalid = 'false'
+ } else if (card.Ot === 'notRequired' && values.Ot !== 'notRequired') {
+ values.verify.invalid = 'true'
+ }
}
}
@@ -704,7 +735,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