From 5e1d4d5155c57c43739d61914e2d29a64f9bb683 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 17:40:38 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index e83ff55..c02a963 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -214,7 +214,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'output')
+ shows.push('innerFunc', 'output', 'recordUser')
if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
shows.push('preFunc')
}
@@ -295,7 +295,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'recordUser')
reRequired.innerFunc = true
} else {
shows.push('sql', 'sqlType')
@@ -346,7 +346,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'recordUser')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -381,7 +381,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'recordUser')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -459,7 +459,7 @@
shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'recordUser')
reRequired.innerFunc = true
}
if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
@@ -980,11 +980,12 @@
values.$fixed = card.$fixed || false
if (card.OpenType === 'excelOut' && values.OpenType === 'excelIn') {
- if (values.verify && values.verify.columns && values.verify.columns.length > 0) {
- values.verify.columns = values.verify.columns.map(col => {
+ values.verify = {columns: [], scripts: [], sheet: 'Sheet1', default: 'true', range: 1, uniques: []}
+ if (card.verify && card.verify.columns) {
+ values.verify.columns = card.verify.columns.map(col => {
col.required = col.required || 'true'
col.type = col.type || 'Nvarchar(50)'
- col.import = col.import || 'true'
+ col.import = 'true'
if (col.type === 'text' || col.type === 'image') {
col.type = 'Nvarchar(50)'
@@ -1007,15 +1008,12 @@
return col
})
- values.verify.sheet = values.verify.sheet || 'Sheet1'
- }
-
- if (values.verify) {
- values.verify.scripts = []
+ values.verify.sheet = card.verify.sheet || 'Sheet1'
}
} else if (card.OpenType === 'excelIn' && values.OpenType === 'excelOut') {
- if (values.verify && values.verify.columns && values.verify.columns.length > 0) {
- values.verify.columns = values.verify.columns.map(col => {
+ values.verify = {columns: [], scripts: [], dataType: 'default'}
+ if (card.verify && card.verify.columns) {
+ values.verify.columns = card.verify.columns.map(col => {
col.type = col.type || 'text'
col.output = col.output || 'true'
col.required = col.required || 'false'
@@ -1033,10 +1031,6 @@
return col
})
- }
-
- if (values.verify) {
- values.verify.scripts = []
}
}
--
Gitblit v1.8.0