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 | 123 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 44 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 6e9ac94..7514e22 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -4,8 +4,10 @@
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 {
@@ -51,17 +53,33 @@
let reReadonly = {}
if (this.record.type === 'prev') {
- shows = ['type', 'label', 'enable', 'actionType']
+ shows = ['typeName', 'label', 'actionType']
+ if (this.record.actionType === 'close') {
+ shows.push('refreshTab', 'reload')
+ }
} else if (this.record.type === 'next') {
- shows = ['type', 'label', 'enable', 'actionType']
+ shows = ['typeName', 'label', 'actionType']
+ if (this.record.actionType === 'close') {
+ shows.push('refreshTab', 'reload')
+ }
} else if (this.record.type === 'close') {
- shows = ['type', 'label', 'enable']
+ shows = ['typeName', 'label', 'refreshTab', 'reload']
+ } else if (this.record.type === 'reset') {
+ shows = ['typeName', 'label']
} else {
- shows = ['type', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'enable', 'output', 'reload'] // 閫夐」鍒楄〃
-
+ 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.pop()
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+ 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') {
@@ -100,6 +118,13 @@
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') {
@@ -162,11 +187,19 @@
getFields() {
const { getFieldDecorator } = this.props.form
- const { interType, callbackType } = 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 = []
@@ -189,7 +222,7 @@
message: formRule.func.maxMessage
}]
} else if (item.key === 'output') {
- if (interType === 'system' || ((interType === 'outer' || interType === 'custom') && callbackType === 'script')) {
+ if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
_rules = [{
pattern: /^@[0-9a-zA-Z_]+@?$/,
message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
@@ -214,12 +247,7 @@
}
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: [
@@ -236,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>
@@ -244,12 +272,7 @@
} 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: [
@@ -258,19 +281,14 @@
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: [
@@ -282,14 +300,15 @@
})(
<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>
@@ -300,12 +319,7 @@
} 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: [
@@ -331,7 +345,7 @@
} 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: [
@@ -347,12 +361,7 @@
} 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: [
@@ -367,6 +376,22 @@
</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>
+ )
}
})
return fields
@@ -377,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