From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 12 六月 2023 12:06:18 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/menu/menushell/index.jsx | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx index e21cb1a..9533aa5 100644 --- a/src/menu/menushell/index.jsx +++ b/src/menu/menushell/index.jsx @@ -36,6 +36,25 @@ setCards(_cards) } + const unGroup = (id) => { + let { card, index } = findCard(`${id}`) + let components = [...card.components].map(item => { + if (item.wrap) { + item.wrap.width = card.width + item.width = card.width + } else if (item.plot) { + item.plot.width = card.width + item.width = card.width + } + return item + }) + card.components = [] + + const _cards = update(cards, { $splice: [[index, 1, card, ...components]] }) + + handleList({...menu, components: _cards}) + } + const deleteCard = (id) => { const { card } = findCard(id) @@ -98,6 +117,9 @@ tree: '鏍戝舰鍒楄〃', balcony: '娴姩鍗�', timeline: '鏃堕棿杞�', + antvG6: '鏍戝浘', + iframe: 'iframe', + module: '妯″潡', card: '鍗$墖' } let i = 1 @@ -152,6 +174,7 @@ card={card} moveCard={moveCard} delCard={deleteCard} + unGroup={unGroup} findCard={findCard} updateConfig={updateConfig} /> -- Gitblit v1.8.0