From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/tabs/tabcomponents/index.jsx |   86 +++++++-----------------------------------
 1 files changed, 15 insertions(+), 71 deletions(-)

diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index 44ceaaf..a0ed8c1 100644
--- a/src/menu/components/tabs/tabcomponents/index.jsx
+++ b/src/menu/components/tabs/tabcomponents/index.jsx
@@ -5,7 +5,6 @@
 import { Empty, notification, Modal } from 'antd'
 
 import Utils from '@/utils/utils.js'
-import MKEmitter from '@/utils/events.js'
 import Card from './card'
 import './index.scss'
 
@@ -47,61 +46,10 @@
       })
     }
 
-    let uuids = []
-    const getUuids = (item) => {
-      if (item.type === 'tabs') {
-        item.subtabs.forEach(tab => {
-          tab.components.forEach(c => {
-            getUuids(c)
-          })
-        })
-      } else {
-        if (item.action && item.action.length) {
-          item.action.forEach(act => {
-            if (!act.origin) {
-              uuids.push(act.uuid)
-            }
-          })
-        }
-        if (item.type === 'card') {
-          item.subcards.forEach(_card => {
-            _card.elements && _card.elements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-            _card.backElements && _card.backElements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-          })
-        } else if (item.type === 'table' && item.subtype === 'tablecard') {
-          item.subcards.forEach(_card => {
-            _card.elements && _card.elements.forEach(cell => {
-              if (cell.eleType === 'button') {
-                uuids.push(cell.uuid)
-              }
-            })
-          })
-        } else if (item.type === 'table' && item.subtype === 'normaltable') {
-          item.cols && item.cols.forEach(col => {
-            if (col.type !== 'action') return
-            col.elements && col.elements.forEach(cell => {
-              uuids.push(cell.uuid)
-            })
-          })
-        }
-      }
-    }
-
-    getUuids(card)
-
     confirm({
       title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
       content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
       onOk() {
-        MKEmitter.emit('delButtons', uuids)
         handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
       },
       onCancel() {}
@@ -113,7 +61,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') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
@@ -125,23 +76,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
@@ -153,26 +109,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                                   // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
       }
       

--
Gitblit v1.8.0