From 99c9aed75c0bf5356e3170b7070ed00d7ba653ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 一月 2023 17:00:30 +0800
Subject: [PATCH] 2023-01-29

---
 src/mob/components/tabs/tabcomponents/index.jsx |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/mob/components/tabs/tabcomponents/index.jsx b/src/mob/components/tabs/tabcomponents/index.jsx
index 2259bf2..1d146b5 100644
--- a/src/mob/components/tabs/tabcomponents/index.jsx
+++ b/src/mob/components/tabs/tabcomponents/index.jsx
@@ -2,11 +2,9 @@
 import { useDrop } from 'react-dnd'
 import { is, fromJS } from 'immutable'
 import update from 'immutability-helper'
-import { Empty, notification, Modal } from 'antd'
+import { Empty, Modal } from 'antd'
 
 import Utils from '@/utils/utils.js'
-import MKEmitter from '@/utils/events.js'
-import MenuUtils from '@/utils/utils-custom.js'
 import Card from './card'
 import './index.scss'
 
@@ -36,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)
 
@@ -48,17 +65,11 @@
       })
     }
 
-    let uuids = MenuUtils.getDelButtonIds(card)
-
     confirm({
       title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
       content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
       onOk() {
         handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
-
-        if (uuids.length === 0) return
-        
-        MKEmitter.emit('delButtons', uuids)
       },
       onCancel() {}
     })
@@ -69,30 +80,20 @@
     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') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
-        if (cards.filter(card => card.type === 'search').length > 0) {
-          notification.warning({
-            top: 92,
-            message: '鎼滅储鏉′欢涓嶅彲閲嶅娣诲姞锛�',
-            duration: 5
-          })
-          return
-        }
-      } else if (item.component === 'tabs' && config.floor === 3) {
-        notification.warning({
-          top: 92,
-          message: '鏍囩椤垫渶澶氫负涓夐噸缁撴瀯锛�',
-          duration: 5
-        })
+      if (item.component === 'search') { // 绉诲姩绔爣绛鹃〉涓笉鍙坊鍔犳悳绱�
+        item.added = false
         return
       }
 
       let name = ''
       let names = {
-        bbar: '鏌辩姸鍥�',
+        bar: '鏌辩姸鍥�',
         line: '鎶樼嚎鍥�',
         tabs: '鏍囩缁�',
         pie: '楗煎浘',
@@ -102,12 +103,14 @@
         editor: '瀵屾枃鏈�',
         code: '鑷畾涔�',
         carousel: '杞挱',
-        form: '琛ㄥ崟',
         dashboard: '浠〃鐩�',
-        scatter: '鏁ｇ偣鍥�',
+        form: '琛ㄥ崟',
+        card: '鍗＄墖',
+        navbar: '瀵艰埅鏍�',
         menubar: '鑿滃崟鏍�',
-        tree: '鏍戝舰鍒楄〃',
-        card: '鍗＄墖'
+        balcony: '娴姩鍗�',
+        timeline: '鏃堕棿杞�',
+        login: '鐧诲綍'
       }
       let i = 1
       
@@ -121,15 +124,11 @@
       
       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: Utils.getdataName(),
         name: name,
-        floor: config.floor ? (config.floor + 1) : 2, // 缁勪欢鐨勫眰绾�
         isNew: true                                   // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
       }
       
@@ -159,6 +158,7 @@
           card={card}
           moveCard={moveCard}
           delCard={deleteCard}
+          unGroup={unGroup}
           findCard={findCard}
           updateConfig={updateConfig}
         />

--
Gitblit v1.8.0