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/menu/components/share/actioncomponent/dragaction/card.jsx | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/dragaction/card.jsx b/src/menu/components/share/actioncomponent/dragaction/card.jsx
index d0baf35..5518861 100644
--- a/src/menu/components/share/actioncomponent/dragaction/card.jsx
+++ b/src/menu/components/share/actioncomponent/dragaction/card.jsx
@@ -1,6 +1,9 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Button, Popover } from 'antd'
+import { Button, Popover } from 'antd'
+import { CopyOutlined, EditOutlined, FontColorsOutlined, CloseOutlined, ProfileOutlined, WarningOutlined } from '@ant-design/icons'
+
+import MkIcon from '@/components/mk-icon'
import { resetStyle } from '@/utils/utils-custom.js'
import './index.scss'
@@ -25,7 +28,7 @@
moveCard(draggedId, overIndex)
},
})
- const opacity = isDragging ? 0 : 1
+ const opacity = isDragging ? 0.5 : 1
let hasProfile = false
if (['pop', 'prompt', 'exec'].includes(card.OpenType)) {
@@ -33,6 +36,8 @@
} else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
hasProfile = true
} else if (card.funcType === 'print') {
+ hasProfile = true
+ } else if (card.funcType === 'megvii') {
hasProfile = true
}
@@ -45,16 +50,22 @@
_class = 'swiper swiper-' + card.color
show = 'button'
}
+ if (card.hidden === 'true') {
+ _class += ' mk-hidden'
+ }
+ let warning = null
+ if (card.OpenType === 'innerpage' && !card.pageTemplate) {
+ warning = <WarningOutlined style={{color: 'orange', marginLeft: '5px'}}/>
+ }
if (show === 'icon') {
btnElement = (
<Button
type="link"
- icon={card.icon}
style={_style}
className={_class}
onDoubleClick={() => doubleClickCard(id)}
- >{card.icon ? '' : card.label}</Button>
+ >{card.icon ? <MkIcon type={card.icon}/> : card.label}{warning}</Button>
)
} else if (show === 'link') {
btnElement = (
@@ -63,17 +74,16 @@
style={_style}
className={_class}
onDoubleClick={() => doubleClickCard(id)}
- >{card.label}{card.icon ? <Icon type={card.icon}/> : null}</Button>
+ >{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>
)
} else {
btnElement = (
<Button
- icon={card.icon}
style={_style}
className={_class}
onDoubleClick={() => doubleClickCard(id)}
>
- {card.label}
+ <MkIcon type={card.icon}/>{card.label}{warning}
</Button>
)
}
@@ -81,11 +91,11 @@
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <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)} />
- {type !== 'datacard' ? <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)} type="font-colors" /> : ''}
- {hasProfile ? <Icon className="profile" title="楠岃瘉" type="profile" onClick={() => profileCard(id)} /> : null}
+ <EditOutlined className="edit" onClick={() => editCard(id)} />
+ <CopyOutlined className="copy" onClick={() => copyCard(id)} />
+ <CloseOutlined className="close" onClick={() => delCard(id)} />
+ {type !== 'datacard' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> : ''}
+ {hasProfile ? <ProfileOutlined className="profile" title="楠岃瘉" onClick={() => profileCard(id)} /> : null}
</div>
} trigger="hover">
<div className="page-card" style={{ opacity: opacity}}>
--
Gitblit v1.8.0