From 1d1ef9c117f162f5ee48237b67d69fbd015b10d1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 23 七月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/pc/menushell/index.jsx | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index 64d7e2f..32b17b4 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/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)
@@ -114,7 +133,8 @@
balcony: '娴姩鍗�',
timeline: '鏃堕棿杞�',
antvG6: '鏍戝浘',
- login: '鐧诲綍'
+ login: '鐧诲綍',
+ iframe: 'iframe'
}
let i = 1
@@ -172,6 +192,7 @@
card={card}
moveCard={moveCard}
delCard={deleteCard}
+ unGroup={unGroup}
findCard={findCard}
updateConfig={updateConfig}
/>
--
Gitblit v1.8.0