From afb39f8ab004b2607bb718edab02e99c7a010114 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 三月 2023 14:36:44 +0800
Subject: [PATCH] 2023-03-22

---
 src/menu/components/tabs/tabcomponents/index.jsx |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index a67e744..bda63dd 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,10 @@
     drop(item) {
       if (item.hasOwnProperty('originalIndex') || item.added) {
         return
+      } else if (['login', 'navbar', 'topbar'].includes(item.component)) {
+        return
       }
+      
       item.added = true
 
       if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
@@ -73,23 +95,28 @@
           })
           return
         }
-      } else if (item.component === 'tabs' && config.floor === 3) {
-        notification.warning({
-          top: 92,
-          message: '鏍囩椤垫渶澶氫负涓夐噸缁撴瀯锛�',
-          duration: 5
-        })
-        return
       }
 
       let name = ''
       let names = {
         bar: '鏌辩姸鍥�',
+        chart: '鍥捐〃',
         line: '鎶樼嚎鍥�',
         tabs: '鏍囩缁�',
         pie: '楗煎浘',
         search: '鎼滅储',
         table: '琛ㄦ牸',
+        group: '鍒嗙粍',
+        editor: '瀵屾枃鏈�',
+        code: '鑷畾涔�',
+        carousel: '杞挱',
+        form: '琛ㄥ崟',
+        dashboard: '浠〃鐩�',
+        scatter: '鏁ｇ偣鍥�',
+        tree: '鏍戝舰鍒楄〃',
+        balcony: '娴姩鍗�',
+        timeline: '鏃堕棿杞�',
+        antvG6: '鏍戝浘',
         card: '鍗＄墖'
       }
       let i = 1
@@ -101,26 +128,14 @@
         }
         i++
       }
-
-      let dataName = ''
-      while (!dataName) {
-        let _dataName = Utils.getdataName()
-        if (config.components.filter(com => com.dataName === _dataName).length === 0) {
-          dataName = _dataName
-        }
-      }
       
       let newcard = {
         uuid: Utils.getuuid(),
-        tabId: config.uuid,
-        parentId: config.parentId,
         type: item.component,
         subtype: item.subtype,
         config: item.config,
         width: item.width || 24,
-        dataName: dataName,
         name: name,
-        floor: config.floor ? (config.floor + 1) : 2, // 缁勪欢鐨勫眰绾�
         isNew: true                                   // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
       }
       
@@ -150,6 +165,7 @@
           card={card}
           moveCard={moveCard}
           delCard={deleteCard}
+          unGroup={unGroup}
           findCard={findCard}
           updateConfig={updateConfig}
         />

--
Gitblit v1.8.0