From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
index 308dfd4..91ff3d3 100644
--- a/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
+++ b/src/templates/sharecomponent/columncomponent/dragcolumn/card.jsx
@@ -1,6 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Popover } from 'antd'
+import { Popover } from 'antd'
+import { EditOutlined, CloseOutlined, AntDesignOutlined, CaretUpOutlined, CaretDownOutlined, CloseCircleOutlined } from '@ant-design/icons'
import './index.scss'
const Card = ({ id, card, showfield, moveCard, findCard, editCard, delCard, markCard }) => {
@@ -31,9 +32,9 @@
return (
<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}
+ <EditOutlined className="edit" onClick={() => editCard(id)} />
+ <CloseOutlined className="close" onClick={() => delCard(id)} />
+ {['text', 'number'].includes(card.type) && !card.origin ? <AntDesignOutlined className="profile" title="鏍囪" onClick={() => markCard(id)} /> : null}
</div>
} trigger="hover">
<div className="page-card" style={{ flex: card.Width, opacity: opacity}}>
@@ -43,15 +44,15 @@
<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" />
+ <CaretUpOutlined />
+ <CaretDownOutlined />
</span> : null
}
</div>
{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}
+ {card.Hide === 'true' ? <CloseCircleOutlined style={{marginLeft: '5px', color: 'orange', fontSize: '12px'}}/> : null}
</div> : null
}
</span>
--
Gitblit v1.8.0