From f128d679cacda2a6b5b730ad0368b5fe73f887f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:27:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/step-form/index.jsx | 67 +++------------------------------
1 files changed, 7 insertions(+), 60 deletions(-)
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index e968838..68225bc 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -128,72 +128,19 @@
card.width = card.wrap.width
card.name = card.wrap.name
card.errors = []
- let idCtrl = false
+ card.$c_fc = true
if (card.wrap.datatype === 'dynamic') {
- let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
- if (supModule === 'empty') {
- supModule = ''
- }
-
card.$c_ds = true
- card.errors = checkComponent(card)
-
- if (card.errors.length === 0) {
- card.$tables = getTables(card)
- }
-
- 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)) {
- idCtrl = true
- }
- if (m.type === 'linkMain' && !supModule) {
- card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
- }
- })
- })
} else {
- let supModule = ''
- if (card.wrap.datatype === 'static') {
- supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : ''
- }
-
- card.$tables = getTables(card)
-
- 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)) {
- idCtrl = true
- }
- if (m.type === 'linkMain' && !supModule && card.wrap.datatype === 'static') {
- card.errors.push({ level: 1, detail: `璇锋鏌ュ垎缁勨��${item.setting.title}鈥濅腑鍏宠仈涓昏〃鈥�${m.label}鈥濇槸鍚︽湁鏁坄})
- }
- })
- })
+ delete card.$c_ds
}
- card.idCtrl = idCtrl
+ card.errors = checkComponent(card)
+ card.$tables = getTables(card)
+
+ delete card.$c_ds
+ delete card.$c_fc
this.setState({
card: card
--
Gitblit v1.8.0