From 92108e6c93de657838bbd766a9eb4f27d85e1c2d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 05 五月 2020 16:41:28 +0800
Subject: [PATCH] 2020-05-05

---
 src/templates/sharecomponent/tabscomponent/tabdragelement/index.jsx |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/templates/zshare/tabdragelement/index.jsx b/src/templates/sharecomponent/tabscomponent/tabdragelement/index.jsx
similarity index 82%
rename from src/templates/zshare/tabdragelement/index.jsx
rename to src/templates/sharecomponent/tabscomponent/tabdragelement/index.jsx
index 2d2a888..92bb326 100644
--- a/src/templates/zshare/tabdragelement/index.jsx
+++ b/src/templates/sharecomponent/tabscomponent/tabdragelement/index.jsx
@@ -9,7 +9,7 @@
 
 const { TabPane } = Tabs
 
-const Container = ({list, type, groupId, placeholder, handleList, handleMenu, deleteMenu, doubleClickCard }) => {
+const Container = ({list, placeholder, handleList, handleMenu, deleteMenu, doubleClickCard }) => {
   let target = null
   const [cards, setCards] = useState(list)
   const moveCard = (id, atIndex) => {
@@ -17,7 +17,8 @@
     if (!card) return
     
     const _cards = update(cards, { $splice: [[index, 1], [atIndex, 0, card]] })
-    handleList(type, _cards, card)
+
+    handleList(_cards)
   }
 
   if (!is(fromJS(cards), fromJS(list))) {
@@ -37,7 +38,7 @@
   }
 
   const [, drop] = useDrop({
-    accept: type,
+    accept: 'tabs',
     drop(item) {
       if (item.hasOwnProperty('originalIndex')) {
         return
@@ -50,9 +51,7 @@
       newcard.icon = ''
       newcard.type = item.subType
       newcard.linkTab = ''
-      newcard.subtabs = []
       newcard.supMenu = 'mainTable'
-      newcard.groupId = groupId
       newcard.focus = true
 
       let targetId = cards.length > 0 ? cards[cards.length - 1].uuid : 0
@@ -66,26 +65,18 @@
       targetIndex++
 
       const _cards = update(cards, { $splice: [[targetIndex, 0, newcard]] })
-      handleList(type, _cards, newcard)
+      handleList(_cards, newcard)
       target = null
     }
   })
-  
-  const edit = (card) => {
-    handleMenu(card)
-  }
 
   const doubleClickBab = id => {
     const { card } = findCard(id)
     doubleClickCard(card)
   }
-  
-  const del = (card) => {
-    deleteMenu({card: card, type: type})
-  }
 
   return (
-    <div ref={drop} className="ant-row maintable-tab-list">
+    <div ref={drop} className="ant-row model-tab-drag-list">
       <Tabs defaultActiveKey="0">
         {cards.map((card, index) => (
           <TabPane tab={
@@ -93,15 +84,14 @@
               <Card
                 key={card.uuid}
                 id={`${card.uuid}`}
-                type={type}
                 card={card}
                 moveCard={moveCard}
                 findCard={findCard}
                 hasDrop={hasDrop}
                 doubleClickCard={doubleClickBab}
               />
-              <Icon className="edit" type="edit" onClick={() => edit(card)} />
-              <Icon className="edit close" type="close" onClick={() => del(card)} />
+              <Icon className="edit" type="edit" onClick={() => handleMenu(card)} />
+              <Icon className="edit close" type="close" onClick={() => deleteMenu(card)} />
             </div>
           } key={`${index}`}>
             銆妠card.label}銆嬫爣绛惧唴瀹�

--
Gitblit v1.8.0