From b5364600d98c8749caba625ec813d4fe670d0a19 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 十二月 2021 17:29:55 +0800
Subject: [PATCH] 2021-12-16
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 2bc9602..e703f77 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -16,7 +16,7 @@
exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'icon', 'class', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'output', 'refreshTab', 'reload'],
excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width'],
excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'resetPageIndex', 'pagination', 'search', 'width'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'placement'],
+ popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'placement', 'syncComponent', 'clickouter'],
tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'linkmenu', 'width'],
innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'icon', 'class', 'width', 'open'],
funcbutton: ['label', 'OpenType', 'funcType', 'show', 'icon', 'class', 'width']
@@ -38,6 +38,7 @@
interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
funcType: null, // 鍔熻兘绫诲瀷
procMode: null, // 鍙傛暟鏂瑰紡
+ control: '',
pageTemplate: null,
appType: sessionStorage.getItem('appType'),
Ot: null,
@@ -66,10 +67,10 @@
}],
deleteOptions: [{
value: 'LogicDelete',
- text: this.props.dict['header.form.action.LogicDelete']
+ text: '閫昏緫鍒犻櫎'
}, {
value: 'delete',
- text: this.props.dict['header.form.action.delete']
+ text: '鐗╃悊鍒犻櫎'
}, {
value: 'custom',
text: this.props.dict['header.form.custom']
@@ -97,13 +98,15 @@
let _intertype = card.intertype || 'system' // 鎺ュ彛绫诲瀷
let _funcType = card.funcType || '' // 鍔熻兘鎸夐挳榛樿绫诲瀷
let _procMode = card.procMode || 'system'
- let _Ot = card.Ot || 'requiredSgl'
+ let _Ot = card.Ot
let _pageTemplate = card.pageTemplate || ''
+ let control = card.control || ''
- let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot)
+ let _options = this.getOptions(_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, control)
this.setState({
Ot: _Ot,
+ control: control,
openType: _opentype,
interType: _intertype,
procMode: _procMode,
@@ -126,18 +129,14 @@
let iscustom = ['pop', 'prompt', 'exec'].includes(_opentype)
item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
} else if (item.key === 'Ot') {
- if (type === 'card') {
- if (card.sqlType === 'insert') {
- item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
- } else {
- item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
- }
+ if (card.sqlType === 'insert') {
+ item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
+ } else if (type === 'card') {
+ item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
} 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))
- } else if (card.sqlType === 'insert') {
- item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
} else {
item.options = this.state.requireOptions
}
@@ -157,7 +156,7 @@
})
}
- getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot) => {
+ getOptions = (_opentype, _intertype, _funcType, _pageTemplate, _procMode, _Ot, _control) => {
let _options = actionTypeOptions[_opentype] ? fromJS(actionTypeOptions[_opentype]).toJS() : [] // 閫夐」鍒楄〃
if (_opentype === 'innerpage') { // 鏂伴〉闈紝鍙�夋ā鏉�(鑷畾涔夋椂锛屽彲濉叆澶栭儴閾炬帴)
@@ -216,7 +215,10 @@
}
if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
- _options.push('controlField', 'controlVal')
+ _options.push('control')
+ if (_control) {
+ _options.push('controlField', 'controlVal')
+ }
}
if (_Ot === 'requiredSgl' && ['pop', 'prompt', 'exec'].includes(_opentype)) {
_options.push('swipe')
@@ -245,11 +247,11 @@
* 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
*/
optionChange = (key, value) => {
- const { card, type } = this.props
- const { openType, procMode, Ot, pageTemplate } = this.state
+ const { type } = this.props
+ const { openType, procMode, Ot, pageTemplate, control } = this.state
if (key === 'OpenType') {
- let _options = this.getOptions(value, 'system', this.state.funcType, '', 'system', Ot)
+ let _options = this.getOptions(value, 'system', this.state.funcType, '', 'system', Ot, control)
let _fieldval = {}
let _formlist = this.state.formlist.map(item => {
@@ -258,12 +260,16 @@
if (item.key === 'intertype') {
let iscustom = ['pop', 'prompt', 'exec'].includes(value)
item.options = this.state.interTypeOptions.filter(op => (iscustom || op.value !== 'custom'))
+ } else if (item.key === 'control') {
+ item.initVal = control
}
if (item.hidden) return item
if (item.key === 'intertype') {
_fieldval.intertype = 'system'
+ } else if (item.key === 'popClose' && value === 'popview') {
+ _fieldval.popClose = 'grid'
} else if (item.key === 'Ot') {
if (type === 'card') {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -316,7 +322,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'funcType') {
- let _options = this.getOptions(openType, this.state.interType, value, pageTemplate, procMode, Ot)
+ let _options = this.getOptions(openType, this.state.interType, value, pageTemplate, procMode, Ot, control)
let _fieldval = {}
if (value === 'print') {
@@ -359,16 +365,14 @@
let _fieldval = {}
this.setState({
formlist: this.state.formlist.map(item => {
- if (item.key === 'Ot' && type === 'card') {
+ if (item.key === 'Ot') {
if (value === 'insert') {
item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
- } else {
+ } else if (type === 'card') {
item.options = this.state.requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ } else {
+ item.options = this.state.requireOptions
}
- } else if (item.key === 'Ot' && value === 'insert') {
- item.options = this.state.requireOptions.filter(op => ['notRequired'].includes(op.value))
- } else if (item.key === 'Ot') {
- item.options = this.state.requireOptions
}
return item
})
@@ -391,15 +395,11 @@
_fieldval.Ot = 'requiredSgl'
}
- if (card.$type === 'tableButton') { // 琛ㄦ牸鎸夐挳
- delete _fieldval.Ot
- }
-
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'pageTemplate') {
let _fieldval = {}
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, value, procMode, Ot)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, value, procMode, Ot, control)
this.setState({
pageTemplate: value,
@@ -423,7 +423,7 @@
this.props.form.setFieldsValue(_fieldval)
})
} else if (key === 'intertype') {
- let _options = this.getOptions(openType, value, this.state.funcType, pageTemplate, procMode, Ot)
+ let _options = this.getOptions(openType, value, this.state.funcType, pageTemplate, procMode, Ot, control)
this.setState({
interType: value,
@@ -445,7 +445,7 @@
})
})
} else if (key === 'procMode') {
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, value, Ot)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, value, Ot, control)
this.setState({
procMode: value,
@@ -459,7 +459,7 @@
})
})
} else if (key === 'Ot') {
- let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, value)
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, value, control)
this.setState({
Ot: value,
@@ -468,6 +468,16 @@
return item
})
})
+ } else if (key === 'control') {
+ let _options = this.getOptions(openType, this.state.interType, this.state.funcType, pageTemplate, procMode, Ot, value)
+
+ this.setState({
+ control: value,
+ formlist: this.state.formlist.map(item => {
+ item.hidden = !_options.includes(item.key)
+ return item
+ })
+ })
} else if (key === 'sysInterface') {
if (value === 'true') {
this.props.form.setFieldsValue({
--
Gitblit v1.8.0