From f4b9504cad034ddcdef21c2081d14a4984fcd2d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 七月 2024 17:14:48 +0800
Subject: [PATCH] 2024-07-15
---
src/menu/components/card/cardcellcomponent/dragaction/action.jsx | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 14b00e5..44c1b19 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -48,6 +48,8 @@
hasProfile = true
} else if (card.OpenType === 'innerpage' && !card.pageTemplate) {
warning = <WarningOutlined style={{color: 'orange', marginLeft: '5px'}}/>
+ } else if (card.payMode === 'system') {
+ hasProfile = true
}
let btnElement = null
@@ -66,20 +68,20 @@
} else if (card.show === 'icon') {
btnElement = (<Button style={_style} type="link"><MkIcon type={card.icon}/>{warning}</Button>)
} else if (card.show === 'link') {
- btnElement = (<Button style={_style} type="link">{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>)
+ btnElement = (<Button style={_style} type="link">{card.showName || card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>)
} else {
- btnElement = (<Button style={_style}>{card.icon ? <MkIcon type={card.icon}/> : null}{card.label}{warning}</Button>)
+ btnElement = (<Button style={_style}>{card.icon ? <MkIcon type={card.icon}/> : null}{card.showName || card.label}{warning}</Button>)
}
- let _style_ = null
+ let _style_ = {opacity: isDragging ? 0.3 : 1, ...card.wrapStyle}
if (card.style && card.style.clear === 'left') {
- _style_ = {clear: 'left'}
+ _style_.clear = 'left'
} else if (card.style && card.style.clear === 'right') {
- _style_ = {float: 'right'}
+ _style_.float = 'right'
}
- let className = card.width || ''
+ let className = card.width || 0
if (card.hidden === 'true') {
className += ' mk-hidden'
}
@@ -105,9 +107,7 @@
</div>
} trigger="hover">
<div ref={node => drag(drop(node))} style={_style_} className={'ant-col card-button-cell ant-col-' + className} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
- <div style={{opacity: isDragging ? 0.3 : 1, ...card.wrapStyle}}>
- {btnElement}
- </div>
+ {btnElement}
</div>
</Popover>
)
--
Gitblit v1.8.0