From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx b/src/templates/sharecomponent/tabscomponent/tabdragelement/card.jsx
index 83b9a27..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, Popover } 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, editCard, delCard, 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)
}
@@ -40,18 +41,18 @@
delCard(id)
}
- const opacity = isDragging ? 0 : 1
+ const opacity = isDragging ? 0.5 : 1
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" type="edit" onClick={edit} />
- <Icon className="close" type="close" onClick={del} />
+ <EditOutlined className="edit" onClick={edit} />
+ <CloseOutlined className="close" onClick={del} />
</div>
} trigger="hover">
<div className="page-card" style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))} onDoubleClick={doubleClick}>
- {card.icon ? <Icon type={card.icon} /> : null}
+ {card.icon ? <MkIcon type={card.icon} /> : null}
{card.label}
</div>
</div>
--
Gitblit v1.8.0