From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
index a10ded7..f98d56e 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
@@ -1,9 +1,9 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon } from 'antd'
+import { Icon, Popover } from 'antd'
import './index.scss'
-const Card = ({ id, card, showfield, moveCard, findCard, editCard, delCard, hasDrop }) => {
+const Card = ({ id, card, showfield, moveCard, findCard, editCard, delCard, markCard }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'columns', id, originalIndex },
@@ -15,44 +15,48 @@
accept: 'columns',
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)
}
- },
+ }
})
const opacity = isDragging ? 0 : 1
return (
- <div className="page-card" style={{ flex: card.Width, opacity: opacity}}>
- <div ref={node => drag(drop(node))}>
- <span className="ant-table-header-column">
- <div className="ant-table-column-sorters" title={card.label} style={{textAlign: card.Align}}>
- <span className="ant-table-column-title">{card.label}</span>
- {card.IsSort === 'true' ?
- <span className="ant-table-column-sorter">
- <Icon type="caret-up" />
- <Icon type="caret-down" />
- </span> : null
- }
- </div>
- {showfield ?
- <div className="ant-table-column-fields">
- <span className="ant-table-column-title">{card.type === 'colspan' ? card.subfield : card.field}</span>
- </div> : null
- }
- </span>
+ <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <Icon className="edit" title="edit" type="edit" onClick={() => editCard(id)} />
+ <Icon className="close" title="delete" type="close" onClick={() => delCard(id)} />
+ {['text', 'number'].includes(card.type) && !card.origin ? <Icon className="profile" title="mark" type="ant-design" onClick={() => markCard(id)} /> : null}
</div>
- <Icon className="edit" title="edit" type="edit" onClick={() => editCard(id)} />
- <Icon className="edit close" title="delete" type="close" onClick={() => delCard(id)} />
- </div>
+ } trigger="hover">
+ <div className="page-card" style={{ flex: card.Width, opacity: opacity}}>
+ <div ref={node => drag(drop(node))}>
+ <span className="ant-table-header-column">
+ <div className="ant-table-column-sorters" title={card.label} style={{textAlign: card.Align}}>
+ <span className="ant-table-column-title">{card.label}</span>
+ {card.IsSort === 'true' ?
+ <span className="ant-table-column-sorter">
+ <Icon type="caret-up" />
+ <Icon type="caret-down" />
+ </span> : null
+ }
+ </div>
+ {showfield ?
+ <div className="ant-table-column-fields">
+ <span className="ant-table-column-title">{card.type === 'colspan' ? card.subfield : card.field}</span>
+ </div> : null
+ }
+ </span>
+ </div>
+ </div>
+ </Popover>
)
}
export default Card
--
Gitblit v1.8.0