From f74d06cff0e27653c2c5ff33cf3824fa3cfb4464 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 17 三月 2023 15:21:47 +0800 Subject: [PATCH] 2023-03-17 --- src/views/mobdesign/index.jsx | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx index 7e740f5..d933964 100644 --- a/src/views/mobdesign/index.jsx +++ b/src/views/mobdesign/index.jsx @@ -1189,6 +1189,18 @@ menus.push(menuObj[cell.openmenu]) } }) + + if (item.subtype === 'dualdatacard') { + card.backElements && card.backElements.forEach(cell => { + if (cell.eleType !== 'button') return + + if (cell.linkmenu && menuObj[cell.linkmenu]) { + menus.push(menuObj[cell.linkmenu]) + } else if (cell.openmenu && menuObj[cell.openmenu]) { + menus.push(menuObj[cell.openmenu]) + } + }) + } }) } else if (item.type === 'balcony') { item.elements && item.elements.forEach(cell => { @@ -1769,12 +1781,22 @@ let config = fromJS(this.state.config).toJS() if (item.type === 'search') { - notification.warning({ - top: 92, - message: '绉诲姩绔悳绱㈢粍浠朵笉鍙矘璐达紒', - duration: 5 - }) - return + if (config.components.filter(card => card.type === 'topbar' && card.wrap.type !== 'navbar').length > 0) { + notification.warning({ + top: 92, + message: '瀵艰埅鏍忎娇鐢ㄤ簡鎼滅储锛屼笉鍙坊鍔犳悳绱㈢粍浠讹紒', + duration: 5 + }) + return + } + if (config.components.filter(card => card.type === 'search').length > 0) { + notification.warning({ + top: 92, + message: '鎼滅储鏉′欢涓嶅彲閲嶅娣诲姞锛�', + duration: 5 + }) + return + } } if (item.type === 'topbar') { -- Gitblit v1.8.0