From b6e8966b84a0641a29de57e3e7240e1227406765 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 05 一月 2021 11:30:42 +0800 Subject: [PATCH] 2021-01-05 --- src/menu/datasource/verifycard/index.jsx | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx index a8f732c..094a0c8 100644 --- a/src/menu/datasource/verifycard/index.jsx +++ b/src/menu/datasource/verifycard/index.jsx @@ -157,13 +157,25 @@ let getcomponentmarks = (box, conf) => { if (!conf.parentId && box.Template === 'CustomPage') { box.components.forEach(item => { - if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) { + if (item.type === 'group') { + item.components.forEach(cell => { + if (cell.uuid !== conf.uuid && cell.setting && cell.setting.varMark) { + Marks.push(cell.setting.varMark.toLowerCase()) + } + }) + } else if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) { Marks.push(item.setting.varMark.toLowerCase()) } }) } else if (conf.parentId === box.parentId && conf.tabId === box.uuid) { box.components.forEach(item => { - if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) { + if (item.type === 'group') { + item.components.forEach(cell => { + if (cell.uuid !== conf.uuid && cell.setting && cell.setting.varMark) { + Marks.push(cell.setting.varMark.toLowerCase()) + } + }) + } else if (item.uuid !== conf.uuid && item.setting && item.setting.varMark) { Marks.push(item.setting.varMark.toLowerCase()) } }) -- Gitblit v1.8.0