From 131bc212f0cfe964c9a38bbe6178aca4f4a16677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:50:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/formaction/actionform/index.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index 69ca082..09c15d7 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -57,10 +57,13 @@
} else if (this.record.type === 'close' || this.record.type === 'reset') {
shows = ['typeName', 'label']
} else {
- shows = ['typeName', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'output', 'reload', 'preButton'] // 閫夐」鍒楄〃
+ shows = ['typeName', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'output', 'reload', 'preButton', 'formCache'] // 閫夐」鍒楄〃
if (this.record.execSuccess === 'never') {
shows.push('resetForms')
+ }
+ 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')
@@ -102,6 +105,9 @@
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.linkmenu && this.record.linkmenu !== 'goback') {
@@ -260,7 +266,7 @@
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>
)
--
Gitblit v1.8.0