From 432b788acf901b0720184b8ee8bc81a2e6fa47e0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 九月 2021 18:22:02 +0800
Subject: [PATCH] 2021-09-28
---
src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
index d480eab..308dfd4 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
@@ -3,7 +3,7 @@
import { Icon, Popover } from 'antd'
import './index.scss'
-const Card = ({ id, card, showfield, moveCard, findCard, editCard, delCard, markCard, 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 },
@@ -14,9 +14,11 @@
const [, drop] = useDrop({
accept: 'columns',
canDrop: () => true,
- drop: ({ id: draggedId, originalIndex }) => {
+ drop: (item) => {
+ const { id: draggedId, originalIndex } = item
+
if (originalIndex === undefined) {
- hasDrop(card)
+ item.dropTargetId = id
} else if (draggedId && draggedId !== id) {
const { index: overIndex } = findCard(id)
moveCard(draggedId, overIndex)
@@ -35,7 +37,7 @@
</div>
} trigger="hover">
<div className="page-card" style={{ flex: card.Width, opacity: opacity}}>
- <div ref={node => drag(drop(node))}>
+ <div ref={node => drag(drop(node))} onDoubleClick={() => editCard(id)}>
<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>
@@ -49,6 +51,7 @@
{showfield ?
<div className="ant-table-column-fields">
<span className="ant-table-column-title">{card.type === 'colspan' ? card.subfield : card.field}</span>
+ {card.Hide === 'true' ? <Icon style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}} type="close-circle" /> : null}
</div> : null
}
</span>
--
Gitblit v1.8.0