From b5e70973340bf912b733acd737f55f90653dece8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 七月 2021 09:48:25 +0800
Subject: [PATCH] 2021-07-03
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 97e077b..55483c8 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -37,6 +37,7 @@
interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
funcType: null, // 鍔熻兘绫诲瀷
procMode: null, // 鍙傛暟鏂瑰紡
+ pageTemplate: null,
Ot: null,
requireOptions: [{
value: 'notRequired',
@@ -93,10 +94,11 @@
let _opentype = card.OpenType // 鎵撳紑鏂瑰紡
let _intertype = card.intertype || 'system' // 鎺ュ彛绫诲瀷
let _funcType = card.funcType || '' // 鍔熻兘鎸夐挳榛樿绫诲瀷
- let _procMode = card.procMode || 'system' // 鍙傛暟璇锋眰鏂瑰紡
- let _Ot = card.Ot || 'requiredSgl' // 鍙傛暟璇锋眰鏂瑰紡
+ let _procMode = card.procMode || 'system'
+ let _Ot = card.Ot || 'requiredSgl'
+ let _pageTemplate = card.pageTemplate || ''
- let _options = this.getOptions(_opentype, _intertype, _funcType, card.pageTemplate, _procMode, _Ot)
+ let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot)
this.setState({
Ot: _Ot,
@@ -104,6 +106,7 @@
interType: _intertype,
procMode: _procMode,
funcType: _funcType,
+ pageTemplate: _pageTemplate,
formlist: this.props.formlist.map(item => {
if (item.key === 'class') {
item.options = btnCustomClasses
@@ -115,7 +118,7 @@
} else if (item.key === 'Ot') {
if (type === 'card') {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
- } else if (card.pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
+ } else if (_pageTemplate === 'pay') { // 琛岀骇鎸夐挳銆佹敮浠樻寜閽紝鍙兘閫夊崟琛�
item.options = this.state.requireOptions.filter(op => ['requiredSgl'].includes(op.value))
} else if (['innerpage', 'tab', 'popview', 'excelIn'].includes(_opentype)) {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -220,13 +223,12 @@
*/
optionChange = (key, value) => {
const { card, type } = this.props
- const { openType, procMode, Ot } = this.state
+ const { openType, procMode, Ot, pageTemplate } = this.state
if (key === 'OpenType') {
- let _options = this.getOptions(value, 'system', this.state.funcType, card.pageTemplate, 'system', Ot)
+ let _options = this.getOptions(value, 'system', this.state.funcType, '', 'system', Ot)
let _fieldval = {}
-
let _formlist = this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
@@ -258,6 +260,8 @@
item.options = this.state.insertUpdateOptions
}
_fieldval.sqlType = ''
+ } else if (item.key === 'pageTemplate') {
+ item.initVal = ''
}
return item
@@ -267,6 +271,7 @@
openType: value,
intertype: 'system',
procMode: 'system',
+ pageTemplate: '',
formlist: _formlist
}, () => {
if (value === 'excelIn') {
@@ -280,7 +285,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'funcType') {
- let _options = this.getOptions(openType, this.state.interType, value, card.pageTemplate, procMode, Ot)
+ let _options = this.getOptions(openType, this.state.interType, value, pageTemplate, procMode, Ot)
let _fieldval = {}
this.setState({
@@ -347,6 +352,7 @@
let _options = this.getOptions(openType, this.state.interType, this.state.funcType, value, procMode, Ot)
this.setState({
+ pageTemplate: value,
formlist: this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
@@ -367,7 +373,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'intertype') {
- let _options = this.getOptions(openType, value, this.state.funcType, '', procMode, Ot)
+ let _options = this.getOptions(openType, value, this.state.funcType, pageTemplate, procMode, Ot)
this.setState({
interType: value,
@@ -389,7 +395,7 @@
})
})
} else if (key === 'procMode') {
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, '', value, Ot)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, value, Ot)
this.setState({
procMode: value,
@@ -403,7 +409,7 @@
})
})
} else if (key === 'Ot') {
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, '', procMode, value)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, value)
this.setState({
Ot: value,
@@ -523,7 +529,7 @@
</Form.Item>
</Col>
)
- } else if (item.type === 'select') { // 涓嬫媺鎼滅储
+ } else if (item.type === 'select') {
fields.push(
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
@@ -543,13 +549,14 @@
})(
<Select
showSearch
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ allowClear={item.allowClear === true}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('winter')}
>
{item.options.map((option, index) =>
- <Select.Option id={index} key={option.value || option.field} value={option.value || option.field}>
- {option.text || option.label}
+ <Select.Option key={index} value={(option.value || option.field)}>
+ {(option.text || option.label)}
</Select.Option>
)}
</Select>
--
Gitblit v1.8.0