From cec96a86ed6b3fba6a10d6d46818e9755ac3b5ca Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 10 三月 2023 11:13:51 +0800 Subject: [PATCH] 2023-03-10 --- src/menu/components/form/step-form/index.jsx | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx index 0886155..3f37ddf 100644 --- a/src/menu/components/form/step-form/index.jsx +++ b/src/menu/components/form/step-form/index.jsx @@ -132,6 +132,7 @@ card.width = card.wrap.width card.name = card.wrap.name card.errors = [] + let idCtrl = false if (card.wrap.datatype !== 'static') { let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : '' @@ -158,6 +159,9 @@ card.subcards.forEach(item => { 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}鈥濇槸鍚︽湁鏁坄}) } @@ -170,12 +174,17 @@ card.subcards.forEach(item => { 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}鈥濇槸鍚︽湁鏁坄}) } }) }) } + + card.idCtrl = idCtrl this.setState({ card: card @@ -435,7 +444,6 @@ let _tabfields = [] let _linkableFields = [] let _linksupFields = [] - let _allFields = [] let standardform = null let uniq = new Map() @@ -445,13 +453,6 @@ group.fields.forEach((item, i) => { if (_form.uuid === item.uuid) { index = i - } - - if (item.field) { - _allFields.push({ - field: item.field, - label: item.label - }) } if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) { @@ -524,7 +525,7 @@ standardform, visible: true, editform: _form, - formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, _allFields, card.columns) + formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, card.columns) }) } -- Gitblit v1.8.0