From e1cee96b38805bcccf48e7bcb9d296f2bc54c720 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 24 一月 2025 11:10:32 +0800
Subject: [PATCH] 2025-01-24
---
src/menu/components/card/cardcellcomponent/dragaction/action.jsx | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 5b2b78c..c22c252 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -39,21 +39,30 @@
let warning = null
if (['pop', 'prompt', 'exec', 'form'].includes(card.OpenType)) {
hasProfile = true
+ if (card.formType === 'count_line') {
+ hasProfile = false
+ }
} else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
hasProfile = true
} else if (card.funcType === 'print') {
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
let _style = resetStyle(card.style)
+ if (_style.display === 'none') {
+ _style.display = 'block'
+ }
+
if (card.OpenType === 'form') {
if (card.formType === 'switch') {
btnElement = (<Switch style={_style} className={card.size === 'large' ? 'ant-switch-large' : ''} size={card.size} checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''}/>)
- } else if (card.formType === 'counter') {
+ } else if (card.formType === 'counter' || card.formType === 'count_line') {
btnElement = (<div style={_style} className={'mk-counter ' + card.size}><span><MinusOutlined /></span><span>1</span><span><PlusOutlined /></span></div>)
} else if (card.formType === 'radio') {
btnElement = (<Checkbox style={_style}></Checkbox>)
@@ -63,23 +72,31 @@
} 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'
}
- let className = card.width || ''
+ let className = card.width || 0
if (card.hidden === 'true') {
className += ' mk-hidden'
}
if (card.checkType) {
className += ' ' + card.checkType
+ }
+
+ let updateTime = null
+
+ if (card.updateTime && card.updateTime.indexOf(window.GLOB.curDate) > -1) {
+ updateTime = card.updateTime.substr(11)
}
return (
@@ -89,13 +106,12 @@
<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}
+ {hasProfile ? <ProfileOutlined className="profile" title="楠岃瘉淇℃伅" onClick={() => profileCard(id)} /> : null}
+ {updateTime}
</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