From 31674fc70ecdf068aa6e09a581574f28509d4be3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 16 七月 2023 12:20:42 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 5a87254..9d066d2 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -166,7 +166,7 @@
reOptions.intertype = this.state.interTypeOptions
if (intertype === 'custom') {
- shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
} else if (this.record.procMode === 'inner') {
@@ -388,6 +388,8 @@
shows.push('placement')
} else if (this.record.display === 'drawer') {
shows.push('placement')
+ } else if (this.record.display === 'modal') {
+ shows.push('popshow')
}
if (this.record.popClose === 'grid') {
shows.push('resetPageIndex')
--
Gitblit v1.8.0