From d2392435048a5d75f2d10b4d88a2c8ac29a254f1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 六月 2025 22:34:05 +0800
Subject: [PATCH] 2025-06-18

---
 src/menu/menushell/index.jsx |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index f83e918..6c73b42 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,11 @@
         tree: '鏍戝舰鍒楄〃',
         balcony: '娴姩鍗�',
         timeline: '鏃堕棿杞�',
+        antvG6: '鏍戝浘',
+        antvX6: '娴佺▼鍥�',
+        iframe: 'iframe',
+        module: '妯″潡',
+        calendar: '鏃ュ巻',
         card: '鍗$墖'
       }
       let i = 1
@@ -117,7 +141,6 @@
         config: item.config,
         width: item.width || 24,
         name: name,
-        floor: 1,   // 缁勪欢鐨勫眰绾�
         isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
       }
       
@@ -138,8 +161,12 @@
     }
   })
 
+  let style = JSON.stringify(menu.style || {})
+  style = style.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
+  style = JSON.parse(style)
+
   return (
-    <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={menu.style}>
+    <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={style}>
       <div className="ant-row">
         {cards.map(card => (
           <Card
@@ -148,6 +175,7 @@
             card={card}
             moveCard={moveCard}
             delCard={deleteCard}
+            unGroup={unGroup}
             findCard={findCard}
             updateConfig={updateConfig}
           />

--
Gitblit v1.8.0