From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/menu/components/form/simple-form/index.jsx | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index b5e6fb1..2d1855a 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -140,6 +140,13 @@
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
}
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
+ }
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
idCtrl = true
@@ -160,6 +167,13 @@
card.subcards.forEach(item => {
if (item.subButton.intertype === 'system' && !item.subButton.sqlType) {
card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳璇疯缃搷浣滅被鍨媊})
+ }
+ if (item.subButton.verify && !item.subButton.output) {
+ if (item.subButton.verify.noteEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�肩煭淇″彂閫佹棤鏁堬紒`})
+ } else if (item.subButton.verify.emailEnable === 'true') {
+ card.errors.push({ level: 0, detail: `${item.subButton.label} 鎸夐挳鏈缃繑鍥炲�奸偖浠跺彂閫佹棤鏁堬紒`})
+ }
}
item.fields.forEach(m => {
if (m.dataSource && /@ID@/ig.test(m.dataSource)) {
@@ -361,7 +375,7 @@
})
}
- if (item.type === 'switch' || item.type === 'check') {
+ if (['switch', 'check', 'popSelect'].includes(item.type)) {
_linksupFields.push({
field: item.field,
label: item.label
@@ -467,6 +481,10 @@
pasteForm = (forms, res) => {
let _config = fromJS(this.state.card).toJS()
+ forms.forEach(item => {
+ delete item.focus
+ })
+
_config.subcards[0].fields = forms
if (res.subButton) {
@@ -497,8 +515,6 @@
}
})
} else {
- _config.subcards[0].fields = forms
-
this.updateComponent(_config)
}
}
--
Gitblit v1.8.0