From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/formaction/actionform/index.jsx | 323 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 180 insertions(+), 143 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index a49f945..7514e22 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -1,84 +1,142 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-// import { fromJS } from 'immutable'
import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
+import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
+const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
const { TextArea } = Input
class ActionForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
formlist: PropTypes.any, // 琛ㄥ崟淇℃伅
card: PropTypes.any, // 鎸夐挳淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
}
state = {
- formlist: null, // 琛ㄥ崟淇℃伅
- interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
- procMode: null, // 鍙傛暟鏂瑰紡
- linkmenu: null
+ formlist: null
}
+ record = {}
UNSAFE_componentWillMount () {
- const { card } = this.props
+ this.props.formlist.forEach(item => {
+ this.record[item.key] = item.initVal
+ })
- let _intertype = card.intertype || 'system' // 鎺ュ彛绫诲瀷
- let _procMode = card.procMode || 'system' // 鍙傛暟璇锋眰鏂瑰紡
-
- let _options = this.getOptions(_intertype, _procMode, card.linkmenu)
+ let { shows, reRequired, reReadonly } = this.getMutilOptions()
this.setState({
- interType: _intertype,
- procMode: _procMode,
- linkmenu: card.linkmenu,
formlist: this.props.formlist.map(item => {
- if (item.key === 'innerFunc' && _procMode === 'inner') {
- item.required = true
+ item.hidden = !shows.includes(item.key)
+ item.initVal = this.record[item.key]
+
+ if (reRequired[item.key] !== undefined) {
+ item.required = reRequired[item.key]
+ }
+ if (reReadonly[item.key] !== undefined) {
+ item.readonly = reReadonly[item.key]
}
- item.hidden = !_options.includes(item.key)
return item
})
})
}
- getOptions = (_intertype, _procMode, linkmenu) => {
- const { card } = this.props
+ getMutilOptions = () => {
+ let shows = []
+ let reRequired = {}
+ let reReadonly = {}
- if (card.type === 'prev') {
- return ['type', 'label', 'enable']
- } else if (card.type === 'next') {
- return ['type', 'label', 'enable']
- }
- let _options = ['type', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'enable', 'output', 'reload'] // 閫夐」鍒楄〃
-
- if (_intertype === 'custom') {
- _options.pop()
- _options.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method', 'cross')
- if (_procMode === 'system') {
- _options.push('sql', 'sqlType')
- } else {
- _options.push('innerFunc')
+ if (this.record.type === 'prev') {
+ shows = ['typeName', 'label', 'actionType']
+ if (this.record.actionType === 'close') {
+ shows.push('refreshTab', 'reload')
}
- } else if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
- } else if (_intertype === 'inner') {
- _options.push('innerFunc')
+ } else if (this.record.type === 'next') {
+ shows = ['typeName', 'label', 'actionType']
+ if (this.record.actionType === 'close') {
+ shows.push('refreshTab', 'reload')
+ }
+ } else if (this.record.type === 'close') {
+ shows = ['typeName', 'label', 'refreshTab', 'reload']
+ } else if (this.record.type === 'reset') {
+ shows = ['typeName', 'label']
} else {
- _options.push('sql', 'sqlType')
- }
-
- if (linkmenu && linkmenu !== 'goback') {
- _options.push('open')
+ shows = ['typeName', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'output', 'reload', 'preButton', 'refreshTab'] // 閫夐」鍒楄〃
+
+ if (this.record.execSuccess === 'never') {
+ shows.push('resetForms')
+ }
+ if (this.record.refreshTab && this.record.refreshTab.length) {
+ shows.push('urlPar')
+ }
+ if (this.record.syncComponent && this.record.syncComponent[0]) {
+ shows.push('syncDelay')
+ }
+ if (this.record.intertype === 'custom') {
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType', 'outerBlacklist')
+ if (this.record.procMode === 'system') {
+ shows.push('sql', 'sqlType')
+ } else if (this.record.procMode === 'inner') {
+ shows.push('innerFunc')
+ }
+ if (this.record.callbackType === 'func') {
+ shows.push('callbackFunc')
+ } else if (this.record.callbackType !== 'none') {
+ shows.push('cbTable')
+ }
+ } else if (this.record.intertype === 'outer') {
+ shows.push('procMode', 'sysInterface', 'interface', 'outerFunc', 'callbackType')
+ if (this.record.procMode === 'system') {
+ shows.push('sql', 'sqlType')
+ } else if (this.record.procMode === 'inner') {
+ shows.push('innerFunc')
+ }
+ if (this.record.callbackType === 'func') {
+ shows.push('callbackFunc')
+ } else if (this.record.callbackType !== 'none') {
+ shows.push('cbTable')
+ }
+
+ reRequired.outerFunc = false
+ if (this.record.sysInterface === 'false') {
+ reReadonly.interface = false
+ reRequired.interface = true
+
+ shows.push('proInterface')
+ } else if (this.record.sysInterface === 'true') {
+ reReadonly.interface = true
+ reRequired.interface = false
+ reRequired.outerFunc = true
+ }
+ } else if (this.record.intertype === 'inner') {
+ shows.push('innerFunc')
+ } else {
+ shows.push('sql', 'sqlType')
+ // if (this.record.execSuccess === 'never' && this.record.resetForms && this.record.resetForms[0]) {
+ // shows.push('returnValue')
+ // }
+ }
+
+ if (this.record.syncComponent && this.record.syncComponent[0] === 'multiComponent') {
+ shows.push('syncComponents')
+ }
+
+ if (this.record.linkmenu && this.record.linkmenu !== 'goback') {
+ shows.push('open')
+ }
}
- return _options
+ return {
+ shows,
+ reRequired,
+ reReadonly
+ }
}
/**
@@ -88,66 +146,35 @@
* 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
*/
optionChange = (key, value) => {
- const { procMode, linkmenu } = this.state
+ this.record[key] = value
+ let _fieldval = {}
- if (key === 'intertype') {
- let _options = this.getOptions(value, procMode, linkmenu)
-
- this.setState({
- interType: value,
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
-
- if (item.key === 'interface') {
- item.readonly = false
- } else if (item.key === 'sysInterface') {
- item.initVal = 'false'
- }
- return item
- })
- })
- } else if (key === 'procMode') {
- let _options = this.getOptions(this.state.interType, value, linkmenu)
-
- 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 === 'linkmenu') {
- let _options = this.getOptions(this.state.interType, procMode, value)
-
- this.setState({
- linkmenu: value,
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
- return item
- })
- })
- } else if (key === 'sysInterface') {
+ if (key === 'sysInterface') {
if (value === 'true') {
- this.props.form.setFieldsValue({
- interface: window.GLOB.mainSystemApi || ''
- })
+ _fieldval.interface = window.GLOB.mainSystemApi || ''
+ this.record.interface = window.GLOB.mainSystemApi || ''
}
- this.setState({
- formlist: this.state.formlist.map(item => {
- if (item.key === 'interface' && value === 'true') {
- item.readonly = true
- } else if (item.key === 'interface') {
- item.readonly = false
- }
-
- return item
- })
- })
}
+
+ let { shows, reRequired, reReadonly } = this.getMutilOptions()
+
+ this.setState({
+ formlist: this.state.formlist.map(item => {
+ item.hidden = !shows.includes(item.key)
+ item.initVal = this.record[item.key]
+
+ if (reRequired[item.key] !== undefined) {
+ item.required = reRequired[item.key]
+ }
+ if (reReadonly[item.key] !== undefined) {
+ item.readonly = reReadonly[item.key]
+ }
+
+ return item
+ })
+ }, () => {
+ this.props.form.setFieldsValue(_fieldval)
+ })
}
handleSubmit = (e) => {
@@ -160,11 +187,19 @@
getFields() {
const { getFieldDecorator } = this.props.form
- const { interType } = this.state
const fields = []
this.state.formlist.forEach((item, index) => {
if (item.hidden || item.forbid) return
+
+ let label = item.label
+ if (item.tooltip) {
+ if (item.toolWidth) {
+ label = <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.toolWidth}} title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip>
+ } else {
+ label = <Tooltip placement="topLeft" title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip>
+ }
+ }
if (item.type === 'text') {
let _rules = []
@@ -187,7 +222,7 @@
message: formRule.func.maxMessage
}]
} else if (item.key === 'output') {
- if (interType === 'system') {
+ if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
_rules = [{
pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
@@ -212,18 +247,13 @@
}
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || '',
rules: [
{
required: item.readonly ? false : !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
},
..._rules
]
@@ -234,7 +264,7 @@
} else if (item.type === 'tip') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <Form.Item label={label}>
{item.initVal}
</Form.Item>
</Col>
@@ -242,52 +272,43 @@
} else if (item.type === 'number') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
{
required: item.readonly ? false : !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
- })(<InputNumber min={0} max={10000} precision={0} onPressEnter={this.handleSubmit}/>)}
+ })(<InputNumber min={0} max={10000} placeholder={item.placeholder || ''} precision={0} onPressEnter={this.handleSubmit}/>)}
</Form.Item>
</Col>
)
} else if (item.type === 'select') { // 涓嬫媺鎼滅储
fields.push(
<Col span={12} key={index}>
- <Form.Item help={item.help || null} label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item help={item.help || null} label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || '',
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
<Select
showSearch
+ mode={item.mode || ''}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('winter')}
allowClear={item.allowClear}
>
{item.options.map((option, index) =>
- <Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value}>
- {option.text}
+ <Select.Option title={option.text || option.label} key={index} value={option.value}>
+ {option.text || option.label}
</Select.Option>
)}
</Select>
@@ -298,18 +319,13 @@
} else if (item.type === 'radio') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
@@ -329,13 +345,13 @@
} else if (item.type === 'textarea') {
fields.push(
<Col span={24} key={index}>
- <Form.Item label={item.label} className="textarea">
+ <Form.Item label={label} className="textarea">
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
{
required: item.readonly ? false : !!item.required,
- message: this.props.dict['form.required.input'] + item.label + '!'
+ message: '璇疯緭鍏�' + item.label + '!'
}
]
})(<TextArea rows={2} readOnly={item.readonly}/>)}
@@ -345,23 +361,34 @@
} else if (item.type === 'cascader') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || [],
rules: [
{
required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ message: '璇烽�夋嫨' + item.label + '!'
}
]
})(
- <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/>
+ <Cascader onChange={(value) => {this.optionChange(item.key, value)}} options={item.options || []} expandTrigger="hover" placeholder=""/>
)}
+ </Form.Item>
+ </Col>
+ )
+ } else if (item.type === 'table') {
+ fields.push(
+ <Col span={24} key={index}>
+ <Form.Item label={label} className="textarea">
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: item.required,
+ message: '璇锋坊鍔�' + item.label + '!'
+ }
+ ]
+ })(<MKTable columns={item.columns || []} actions={item.actions}/>)}
</Form.Item>
</Col>
)
@@ -375,6 +402,16 @@
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+ }
+ if (values.resetForms) {
+ if (values.resetForms.length === 0) {
+ values.resetForms = null
+ } else {
+ values.returnValue = 'true'
+ }
+ }
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0