From a5f41b5d98f23d618dc7519c605ce943b114dfd5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 13 十一月 2023 18:07:51 +0800
Subject: [PATCH] 2023-11-13
---
src/menu/components/form/formaction/actionform/index.jsx | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 6e9ac94..a55b914 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -51,17 +51,17 @@
let reReadonly = {}
if (this.record.type === 'prev') {
- shows = ['type', 'label', 'enable', 'actionType']
+ shows = ['typeName', 'label', 'actionType']
} else if (this.record.type === 'next') {
- shows = ['type', 'label', 'enable', 'actionType']
- } else if (this.record.type === 'close') {
- shows = ['type', 'label', 'enable']
+ shows = ['typeName', 'label', 'actionType']
+ } else if (this.record.type === 'close' || 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', 'resetForm'] // 閫夐」鍒楄〃
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') {
@@ -288,8 +288,8 @@
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>
@@ -377,6 +377,9 @@
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+ }
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0