From f9816a4078fdba44115c69025d9982997f23b484 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 29 四月 2024 16:00:49 +0800 Subject: [PATCH] Merge branch 'develop' --- src/views/pcdesign/index.jsx | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx index 4efe859..8206e33 100644 --- a/src/views/pcdesign/index.jsx +++ b/src/views/pcdesign/index.jsx @@ -877,7 +877,7 @@ return } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') { item.action && item.action.forEach(btn => { - if (btn.hidden === 'true') return + if (btn.hidden === 'true' || btn.permission === 'false') return m.children.push({ key: btn.uuid, @@ -886,7 +886,7 @@ }) item.subcards.forEach(card => { card.elements && card.elements.forEach(cell => { - if (cell.eleType !== 'button' || cell.hidden === 'true') return + if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return m.children.push({ key: cell.uuid, @@ -895,7 +895,7 @@ }) card.backElements && card.backElements.forEach(cell => { - if (cell.eleType !== 'button' || cell.hidden === 'true') return + if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return m.children.push({ key: cell.uuid, @@ -905,7 +905,7 @@ }) } else if (item.type === 'balcony') { item.elements && item.elements.forEach(cell => { - if (cell.eleType !== 'button' || cell.hidden === 'true') return + if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return m.children.push({ key: cell.uuid, @@ -923,7 +923,7 @@ } } else if (item.type === 'table') { item.action.forEach(btn => { - if (btn.hidden === 'true') return + if (btn.hidden === 'true' || btn.permission === 'false') return m.children.push({ key: btn.uuid, @@ -936,7 +936,7 @@ loopCol(col.subcols) } else if (col.type === 'custom') { col.elements.forEach(cell => { - if (cell.eleType !== 'button' || cell.hidden === 'true') return + if (cell.eleType !== 'button' || cell.hidden === 'true' || cell.permission === 'false') return m.children.push({ key: cell.uuid, title: cell.label, -- Gitblit v1.8.0