From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 12 十二月 2023 21:05:37 +0800 Subject: [PATCH] 2023-12-12 --- src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx | 46 +++++++++++++++++++++++++++++++--------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx b/src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx index bc89726..078536c 100644 --- a/src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx +++ b/src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx @@ -1,9 +1,12 @@ import React from 'react' import { useDrag, useDrop } from 'react-dnd' -import { Icon } from 'antd' +import { Popover } from 'antd' +import { EditOutlined, CloseOutlined } from '@ant-design/icons' + +import MkIcon from '@/components/mk-icon' import './index.scss' -const Card = ({ id, card, moveCard, findCard, doubleClickCard, hasDrop }) => { +const Card = ({ id, card, moveCard, findCard, doubleClickCard, editCard, delCard }) => { const originalIndex = findCard(id).index const [{ isDragging }, drag] = useDrag({ item: { type: 'tabs', id, originalIndex }, @@ -15,13 +18,11 @@ accept: 'tabs', canDrop: () => true, drop: (item) => { - if (!item.hasOwnProperty('originalIndex')) { - hasDrop(card) - } - }, - hover({ id: draggedId }) { - if (!draggedId) return - if (draggedId !== id) { + const { id: draggedId, originalIndex } = item + + if (originalIndex === undefined) { + item.dropTargetId = id + } else if (draggedId && draggedId !== id) { const { index: overIndex } = findCard(id) moveCard(draggedId, overIndex) } @@ -32,15 +33,30 @@ doubleClickCard(id) } - const opacity = isDragging ? 0 : 1 + const edit = () => { + editCard(id) + } + + const del = () => { + delCard(id) + } + + const opacity = isDragging ? 0.5 : 1 return ( - <div className="page-card" style={{ opacity: opacity}}> - <div ref={node => drag(drop(node))} onDoubleClick={doubleClick}> - {card.icon ? <Icon type={card.icon} /> : null} - {card.label} + <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={ + <div className="mk-popover-control"> + <EditOutlined className="edit" onClick={edit} /> + <CloseOutlined className="close" onClick={del} /> </div> - </div> + } trigger="hover"> + <div className="page-card" style={{ opacity: opacity}}> + <div ref={node => drag(drop(node))} onDoubleClick={doubleClick}> + {card.icon ? <MkIcon type={card.icon} /> : null} + {card.label} + </div> + </div> + </Popover> ) } export default Card -- Gitblit v1.8.0