From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/tabs/tabcomponents/index.jsx | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index 76caf18..673c529 100644
--- a/src/menu/components/tabs/tabcomponents/index.jsx
+++ b/src/menu/components/tabs/tabcomponents/index.jsx
@@ -34,6 +34,25 @@
handleList({...config, components: cards.map(item => item.uuid === element.uuid ? element : item)})
}
+ 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({...config, components: _cards})
+ }
+
const deleteCard = (id) => {
const { card } = findCard(id)
@@ -61,7 +80,7 @@
drop(item) {
if (item.hasOwnProperty('originalIndex') || item.added) {
return
- } else if (['login', 'navbar', 'topbar'].includes(item.component)) {
+ } else if (['login', 'navbar', 'topbar', 'iframe'].includes(item.component)) {
return
}
@@ -97,6 +116,9 @@
tree: '鏍戝舰鍒楄〃',
balcony: '娴姩鍗�',
timeline: '鏃堕棿杞�',
+ antvG6: '鏍戝浘',
+ antvX6: '娴佺▼鍥�',
+ calendar: '鏃ュ巻',
card: '鍗＄墖'
}
let i = 1
@@ -145,6 +167,7 @@
card={card}
moveCard={moveCard}
delCard={deleteCard}
+ unGroup={unGroup}
findCard={findCard}
updateConfig={updateConfig}
/>
--
Gitblit v1.8.0