From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 27 八月 2023 18:37:36 +0800 Subject: [PATCH] 2023-08-27 --- src/mob/modalconfig/index.jsx | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx index 285307a..c33da82 100644 --- a/src/mob/modalconfig/index.jsx +++ b/src/mob/modalconfig/index.jsx @@ -137,23 +137,22 @@ let _linkableFields = [] let _linksupFields = [] let standardform = null - - let uniq = new Map() let index = null - uniq.set(card.field, true) config.fields.forEach((item, i) => { if (card.uuid === item.uuid) { index = i } - if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) { + if (!item.field || card.field === item.field) return + + if (['text', 'number', 'textarea', 'color'].includes(item.type)) { _inputfields.push({ field: item.field, label: item.label }) } - if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) { + if (item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) { _tabfields.push({ field: item.field, label: item.label @@ -168,19 +167,18 @@ } if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return - if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫� - if (item.field && !uniq.has(item.field)) { - uniq.set(item.field, true) - _linkableFields.push({ - field: item.field, - label: item.label + '-琛ㄥ崟' - }) - _linksupFields.push({ - field: item.field, - label: item.label - }) - } + _linksupFields.push({ + field: item.field, + label: item.label + }) + + if (item.type === 'checkcard' && item.multiple === 'true') return + + _linkableFields.push({ + field: item.field, + label: item.label + '-琛ㄥ崟' + }) }) if (index !== null) { @@ -196,10 +194,9 @@ columns = componentConfig.subColumns || [] } + let _fields = _linkableFields.map(cell => cell.field) columns.forEach(col => { - if (col.field && !uniq.has(col.field)) { - uniq.set(col.field, true) - + if (col.field && !_fields.includes(col.field)) { _linkableFields.push({ field: col.field, label: col.label + '-鏄剧ず鍒�' @@ -525,6 +522,7 @@ </DndProvider> <Modal title={card && card.$copy ? '澶嶅埗' : '缂栬緫'} + wrapClassName="mk-scroll-modal" visible={this.state.visible} width={950} maskClosable={false} -- Gitblit v1.8.0