From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 256 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 205 insertions(+), 51 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index dce21d6..4dfb893 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
@@ -11,15 +11,16 @@
const { TextArea } = Input
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'refreshTab', 'reload'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'refreshTab', 'reload'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'refreshTab', 'reload'],
- excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width'],
- excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'resetPageIndex', 'pagination', 'search', 'width'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'syncComponent', 'clickouter'],
- tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width'],
- innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'open'],
- funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width']
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden'],
+ excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
+ excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
+ popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'hidden'],
+ tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden'],
+ innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
+ funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
+ form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden']
}
class ActionForm extends Component {
@@ -29,7 +30,8 @@
setting: PropTypes.object, // 椤甸潰璁剧疆
formlist: PropTypes.any, // 琛ㄥ崟淇℃伅
card: PropTypes.any, // 鎸夐挳淇℃伅
- inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
+ inputSubmit: PropTypes.func, // 鍥炶溅鎻愪氦浜嬩欢
+ updRecord: PropTypes.func // 鏇存柊淇℃伅
}
state = {
@@ -38,13 +40,13 @@
requireOptions: [],
insertUpdateOptions: [{
value: 'insert',
- text: this.props.dict['header.form.action.insert']
+ text: '娣诲姞'
}, {
value: 'update',
- text: this.props.dict['header.form.action.update']
+ text: '淇敼'
}, {
value: 'audit',
- text: this.props.dict['header.form.action.audit']
+ text: '瀹℃牳'
}],
deleteOptions: [{
value: 'LogicDelete',
@@ -54,7 +56,7 @@
text: '鐗╃悊鍒犻櫎'
}, {
value: 'custom',
- text: this.props.dict['header.form.custom']
+ text: '鑷畾涔�'
}],
interTypeOptions: [{
value: 'system',
@@ -139,6 +141,7 @@
}
}, 100)
}
+ this.props.updRecord && this.props.updRecord(this.record)
}
getMutilOptions = (requireOptions) => {
@@ -186,6 +189,16 @@
shows.push('sql', 'sqlType', 'output')
}
+ if (Ot === 'required') {
+ shows.push('progress')
+ }
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
+
if (this.record.sqlType === 'insert') {
reOptions.Ot = requireOptions.filter(op => op.value === 'notRequired')
} else {
@@ -197,6 +210,53 @@
} else {
reOptions.sqlType = this.state.insertUpdateOptions
}
+ // if (this.record.execSuccess === 'goback') {
+ shows.push('reload')
+ // }
+ } else if (openType === 'form') {
+ let intertype = this.record.intertype
+
+ if (this.record.formType === 'switch') {
+ shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText')
+ } else {
+ shows.push('field', 'openVal', 'closeVal')
+ }
+
+ reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom')
+
+ if (intertype === 'outer') {
+ shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+ reRequired.innerFunc = false
+
+ if (this.record.sysInterface === 'false') {
+ reReadonly.interface = false
+ reRequired.interface = true
+ } else {
+ reReadonly.interface = true
+ reRequired.interface = false
+ }
+ } else if (intertype === 'inner') {
+ shows.push('innerFunc')
+ reRequired.innerFunc = true
+ } else {
+ shows.push('sql', 'sqlType')
+ }
+
+ if (this.record.execSuccess === 'goback') {
+ shows.push('reload')
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
+
+ reOptions.Ot = requireOptions
+ reOptions.sqlType = [{
+ value: 'update',
+ text: '淇敼'
+ }, {
+ value: 'custom',
+ text: '鑷畾涔�'
+ }]
} else if (openType === 'excelIn') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -216,6 +276,9 @@
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (openType === 'excelOut') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
@@ -234,11 +297,17 @@
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (openType === 'popview') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.display === 'drawer') {
shows.push('placement')
+ }
+ if (this.record.popClose === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (openType === 'tab') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -249,9 +318,13 @@
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.pageTemplate === 'custom') {
- shows.push('url', 'joint')
+ shows.push('url', 'joint', 'open')
} else if (this.record.pageTemplate === 'linkpage') {
- shows.push('linkmenu', 'joint')
+ shows.push('linkmenu', 'open')
+
+ if (Ot === 'requiredSgl') {
+ shows.push('joint')
+ }
reRequired.linkmenu = true
reTooltip.linkmenu = ''
@@ -268,7 +341,7 @@
let _funcType = this.record.funcType
if (_funcType === 'print') {
- shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
+ shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (this.record.intertype === 'outer') {
shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
@@ -284,6 +357,9 @@
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
shows.push('execSuccess', 'execError')
} else if (_funcType === 'closetab') {
@@ -293,8 +369,23 @@
reRequired.linkmenu = false
reTooltip.linkmenu = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
+ } else if (_funcType === 'copyurl') {
+ shows.push('linkmenu')
+
+ reRequired.linkmenu = false
+ reTooltip.linkmenu = '鍙互鎸囧畾鍒嗕韩鐨勭洰鏍囧湴鍧�銆�'
+
+ if (this.record.linkmenu) {
+ shows.push('Ot')
+ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ }
} else if (_funcType === 'goBack') {
shows.push('reload')
+ } else if (_funcType === 'megvii') {
+ shows.push('subFunc', 'progress')
+ } else if (_funcType === 'pay') {
+ shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
}
}
@@ -308,6 +399,9 @@
]
if (this.record.control) {
shows.push('controlField', 'controlVal')
+ }
+ if (this.record.control === 'disabled') {
+ shows.push('reason')
}
}
} else {
@@ -332,6 +426,9 @@
}
if (this.record.control) {
shows.push('controlField', 'controlVal')
+ }
+ if (this.record.control === 'disabled') {
+ shows.push('reason')
}
}
@@ -375,6 +472,10 @@
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
+ } else if (value === 'form') {
+ _fieldval.Ot = 'requiredSgl'
+
+ this.record.Ot = 'requiredSgl'
} else if (value === 'excelIn') {
_fieldval.intertype = 'system'
_fieldval.Ot = 'notRequired'
@@ -428,6 +529,8 @@
this.record.control = ''
_fieldval.control = ''
}
+
+ this.props.updRecord && this.props.updRecord(this.record)
} else if (key === 'funcType') {
if (value === 'print') {
_fieldval.label = '鎵撳嵃'
@@ -446,10 +549,12 @@
} else if (value === 'update') {
_fieldval.label = '淇敼'
_fieldval.Ot = 'requiredSgl'
- if (hasclass) {
- _fieldval.class = 'purple'
- } else {
- _fieldval.color = 'primary'
+ if (this.record.OpenType !== 'form') {
+ if (hasclass) {
+ _fieldval.class = 'purple'
+ } else {
+ _fieldval.color = 'primary'
+ }
}
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
@@ -469,10 +574,10 @@
}
}
- this.record.label = _fieldval.label
- this.record.Ot = _fieldval.Ot
- this.record.class = _fieldval.class || ''
- this.record.color = _fieldval.color || ''
+ this.record.label = _fieldval.label || this.record.label || ''
+ this.record.Ot = _fieldval.Ot || this.record.Ot || ''
+ this.record.class = _fieldval.class || this.record.class || ''
+ this.record.color = _fieldval.color || this.record.color || ''
if (appType !== 'mob' && _fieldval.Ot === 'notRequired') {
this.record.control = ''
@@ -490,6 +595,8 @@
}
} else if (key === 'intertype') {
this.record.sysInterface = 'false'
+
+ this.props.updRecord && this.props.updRecord(this.record)
} else if (key === 'sysInterface') {
if (value === 'true') {
_fieldval.interface = window.GLOB.mainSystemApi || ''
@@ -549,6 +656,14 @@
let content = null
let initVal = item.initVal || ''
+ if (item.type === 'splitLine') {
+ fields.push(
+ <Col span={24} key={index}>
+ <p style={{borderBottom: '1px solid #e9e9e9', color: '#1890ff', textAlign: 'center'}}>{item.label}</p>
+ </Col>
+ )
+ return
+ }
if (item.type === 'text') {
rules = [
{ required: item.required, message: dict['form.required.input'] + item.label + '!' }
@@ -566,6 +681,24 @@
{ pattern: formRule.func.pattern, message: formRule.func.message },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
+ } else if (item.key === 'output') {
+ if (this.record.intertype === 'system') {
+ rules = [{
+ pattern: /^@[0-9a-zA-Z_]*$/,
+ message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ } else {
+ rules = [{
+ pattern: /^[0-9a-zA-Z_]*$/,
+ message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ }
} else {
rules.push({ max: formRule.input.max, message: formRule.input.message })
}
@@ -576,25 +709,42 @@
{ required: item.required, message: dict['form.required.input'] + item.label + '!' }
]
- content = <InputNumber min={item.min} max={item.max} precision={item.precision} />
+ content = <InputNumber min={item.min} max={item.max} precision={item.precision} onPressEnter={this.handleSubmit}/>
} else if (item.type === 'select') {
rules = [
{ required: item.required, message: dict['form.required.select'] + item.label + '!' }
]
- content = <Select
- showSearch
- 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 key={index} value={(option.value || option.field)}>
- {(option.text || option.label)}
- </Select.Option>
- )}
- </Select>
+ if (item.extendName) {
+ content = <Select
+ showSearch
+ allowClear={item.allowClear === true || !item.required}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+ option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ onChange={(value) => {this.optionChange(item.key, value)}}
+ getPopupContainer={() => document.getElementById('winter')}
+ >
+ {item.options.map((option, index) =>
+ <Select.Option key={index} extend={option[item.extendName] || ''} value={(option.value || option.field)}>
+ {(option.text || option.label)}
+ </Select.Option>
+ )}
+ </Select>
+ } else {
+ content = <Select
+ showSearch
+ allowClear={item.allowClear === true || !item.required}
+ 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 key={index} value={(option.value || option.field)}>
+ {(option.text || option.label)}
+ </Select.Option>
+ )}
+ </Select>
+ }
} else if (item.type === 'radio') {
rules = [
{ required: item.required, message: dict['form.required.select'] + item.label + '!' }
@@ -603,6 +753,14 @@
content = <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}}>
{item.options.map(option => <Radio key={option.value} value={option.value}>{option.text}</Radio>)}
</Radio.Group>
+ } else if (item.type === 'checkbox') {
+ rules = [
+ { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ ]
+
+ content = <Checkbox.Group>
+ {item.options.map(option => <Checkbox key={option.value} value={option.value}>{option.text}</Checkbox>)}
+ </Checkbox.Group>
} else if (item.type === 'cascader') {
initVal = item.initVal || []
rules = [
@@ -628,7 +786,7 @@
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} label={item.tooltip ?
+ <Form.Item className={className} help={item.help} label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
@@ -646,7 +804,7 @@
}
handleConfirm = () => {
- const { setting, card } = this.props
+ const { card } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
@@ -655,16 +813,12 @@
values.verify = card.verify || null
values.modal = card.modal || null
- if (values.OpenType === 'excelOut') {
- if (values.intertype === 'system' && setting.interType !== 'system') {
- notification.warning({
- top: 92,
- message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄧ郴缁熷嚱鏁帮紝瀵煎嚭Excel涓嶅彲浣跨敤绯荤粺鍑芥暟锛�',
- duration: 5
- })
- return
+ if (values.OpenType === 'form') {
+ if (/^(0|[1-9]\d*)$/.test(values.openVal) && /^(0|[1-9]\d*)$/.test(values.closeVal)) {
+ values.openVal = +values.openVal
+ values.closeVal = +values.closeVal
}
-
+ } else if (values.OpenType === 'excelOut') {
values.Ot = 'notRequired'
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
--
Gitblit v1.8.0