From a6c0423a5164d0bbecfc27d59b7ea140cdab6fca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 17 八月 2022 10:58:19 +0800
Subject: [PATCH] 2022-08-17
---
src/menu/components/form/step-form/index.jsx | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index 0a05e41..f153e7a 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -164,29 +164,31 @@
card.errors = []
if (card.wrap.datatype !== 'static') {
+ let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
+ if (supModule === 'empty') {
+ supModule = ''
+ }
+ let columns = card.columns.map(c => c.field)
+ // let lowcols = card.columns.map(c => c.field.toLowerCase())
+
if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
} else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
} else if (!card.setting.primaryKey) {
card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
+ } else if (!columns.includes(card.setting.primaryKey)) {
+ card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
} else if (!card.setting.supModule) {
card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
}
-
- let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : ''
- if (supModule === 'empty') {
- supModule = ''
- }
- let columns = card.columns.map(c => c.field)
- let lowcols = card.columns.map(c => c.field.toLowerCase())
card.subcards.forEach(item => {
item.fields.forEach(m => {
if (m.type === 'linkMain' && !supModule) {
card.errors.push({ level: 1, detail: `鍒嗙粍鈥�${item.setting.title}鈥濅腑鍏宠仈涓昏〃琛ㄥ崟鈥�${m.label}鈥濇棤鏁坄})
- } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
- card.errors.push({ level: 1, detail: `鍒嗙粍鈥�${item.setting.title}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
+ // } else if (m.field && !columns.includes(m.field) && lowcols.includes(m.field.toLowerCase())) {
+ // card.errors.push({ level: 1, detail: `鍒嗙粍鈥�${item.setting.title}鈥濅腑琛ㄥ崟鈥�${m.label}鈥濆ぇ灏忓啓涓庡瓧娈甸泦涓嶄竴鑷碻})
}
})
})
--
Gitblit v1.8.0