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/menu/components/card/cardcellcomponent/dragaction/action.jsx | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 60cf952..364400e 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -1,8 +1,10 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Popover, Button } from 'antd'
+import { Popover, Button, Switch, Checkbox } from 'antd'
+import { EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined, ProfileOutlined } from '@ant-design/icons'
import { resetStyle } from '@/utils/utils-custom.js'
+import MkIcon from '@/components/mk-icon'
import './index.scss'
const Card = ({ id, card, moveCard, findCard, editCard, copyCard, delCard, profileCard, changeStyle, doubleClickCard }) => {
@@ -28,7 +30,7 @@
})
let hasProfile = false
- if (['pop', 'prompt', 'exec'].includes(card.OpenType)) {
+ if (['pop', 'prompt', 'exec', 'form'].includes(card.OpenType)) {
hasProfile = true
} else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
hasProfile = true
@@ -38,26 +40,33 @@
let btnElement = null
let _style = resetStyle(card.style)
- if (card.show === 'icon') {
- btnElement = (<Button style={_style} type="link"><Icon type={card.icon}/></Button>)
+
+ if (card.OpenType === 'form') {
+ if (card.formType === 'switch') {
+ btnElement = (<Switch style={_style} size={card.size} checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''}/>)
+ } else {
+ btnElement = (<Checkbox style={_style}></Checkbox>)
+ }
+ } else if (card.show === 'icon') {
+ btnElement = (<Button style={_style} type="link"><MkIcon type={card.icon}/></Button>)
} else if (card.show === 'link') {
- btnElement = (<Button style={_style} type="link">{card.label}{card.icon ? <Icon type={card.icon}/> : null}</Button>)
+ btnElement = (<Button style={_style} type="link">{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}</Button>)
} else {
- btnElement = (<Button style={_style}> {card.icon ? <Icon type={card.icon}/> : null}{card.label} </Button>)
+ btnElement = (<Button style={_style}> {card.icon ? <MkIcon type={card.icon}/> : null}{card.label} </Button>)
}
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => editCard(id)} />
- <Icon className="copy" title="澶嶅埗" type="copy" onClick={() => copyCard(id)} />
- <Icon className="close" title="鍒犻櫎" type="close" onClick={() => delCard(id)} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)} type="font-colors" />
- {hasProfile ? <Icon className="profile" title="setting" type="profile" onClick={() => profileCard(id)} /> : null}
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => editCard(id)} />
+ <CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} />
+ <CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)} />
+ {hasProfile ? <ProfileOutlined className="profile" title="setting" onClick={() => profileCard(id)} /> : null}
</div>
} trigger="hover">
<div ref={node => drag(drop(node))} className={'ant-col card-button-cell ant-col-' + card.width} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
- <div style={{opacity: isDragging ? 0 : 1}}>
+ <div style={{opacity: isDragging ? 0 : 1, ...card.wrapStyle}}>
{btnElement}
</div>
</div>
--
Gitblit v1.8.0