From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/formaction/actionform/index.jsx | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index ff0fa6f..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 {
@@ -52,15 +54,26 @@
if (this.record.type === 'prev') {
shows = ['typeName', 'label', 'actionType']
+ if (this.record.actionType === 'close') {
+ shows.push('refreshTab', 'reload')
+ }
} else if (this.record.type === 'next') {
shows = ['typeName', 'label', 'actionType']
- } else if (this.record.type === 'close' || this.record.type === 'reset') {
+ 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 {
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')
@@ -105,9 +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.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') {
@@ -359,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
@@ -372,8 +405,12 @@
if (values.outerBlacklist) {
values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
}
- if (values.resetForms && values.resetForms.length === 0) {
- values.resetForms = null
+ if (values.resetForms) {
+ if (values.resetForms.length === 0) {
+ values.resetForms = null
+ } else {
+ values.returnValue = 'true'
+ }
}
resolve(values)
} else {
--
Gitblit v1.8.0