From cdd5b449130ea4d7223fde4f414a11a7d0c33d6d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 三月 2024 17:52:16 +0800
Subject: [PATCH] 2024-03-07
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 4cbb8a3..7395d2a 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -65,8 +65,14 @@
}
if (card.eleType === 'picture' && card.maxWidth) {
_style.maxWidth = card.maxWidth
- let left = _style.marginLeft && _style.marginLeft !== '0px' ? _style.marginLeft : 'auto'
- let right = _style.marginRight && _style.marginRight !== '0px' ? _style.marginRight : 'auto'
+ let left = _style.marginLeft || 'auto'
+ let right = _style.marginRight || 'auto'
+
+ if (_style.marginLeft === '0px' && _style.marginRight === '0px') {
+ left = 'auto'
+ right = 'auto'
+ }
+
_style.margin = (_style.marginTop || 0) + ' ' + right + ' ' + (_style.marginBottom || 0) + ' ' + left
delete _style.marginLeft
delete _style.marginRight
@@ -77,7 +83,7 @@
const getContent = () => {
if (card.eleType === 'sequence') {
return (
- <div style={{height: card.innerHeight || 'auto'}} className="ant-mk-text">1</div>
+ <div style={{height: card.innerHeight || 'auto'}} className="ant-mk-text">{card.prefix || ''}1{card.postfix || ''}</div>
)
} else if (card.eleType === 'text' || card.eleType === 'number') {
let val = `${card.prefix || ''}${card.datatype === 'static' ? (card.value || '') : (card.field || '')}${card.postfix || ''}`
--
Gitblit v1.8.0