From 050e480c054c278ea8845e75e64466dee6bc0966 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 四月 2024 15:18:24 +0800
Subject: [PATCH] 2024-04-25
---
src/menu/components/card/cardcellcomponent/index.jsx | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 9c1dbd3..50386cc 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -151,9 +151,13 @@
} else {
options.push('width', 'minHeight', 'float')
_style.minHeight = _style.minHeight || '28px'
+ _style.textAlign = _style.textAlign || 'center'
}
+
if (element.wrapStyle) {
_style.float = element.wrapStyle.textAlign || 'left'
+ } else {
+ _style.float = _style.float || 'center'
}
} else if (element.eleType === 'picture') {
options = ['background', 'border', 'margin']
@@ -168,6 +172,10 @@
options = ['padding', 'margin']
} else if (element.eleType === 'splitline') {
options = ['padding', 'margin']
+ }
+ if (['text', 'number', 'formula', 'currentDate'].includes(element.eleType)) {
+ options.push('fontFamily')
+ _style.fontFamily = _style.fontFamily ? _style.fontFamily.split(',') : []
}
if (element.eleType !== 'button' && element.eleType !== 'tag') {
@@ -204,8 +212,16 @@
let _card = fromJS(card).toJS()
if (['text', 'number', 'formula', 'currentDate', 'sequence', 'icon'].includes(_card.eleType)) {
- _card.style = style
+ _card.style = fromJS(style).toJS()
let line = _card.height || null
+
+ if (style.fontFamily) {
+ if (style.fontFamily.length === 0) {
+ delete _card.style.fontFamily
+ } else {
+ _card.style.fontFamily = style.fontFamily.join(',')
+ }
+ }
if (['currentDate', 'sequence'].includes(_card.eleType) || (_card.eleType === 'icon' && _card.tipType !== 'text')) {
line = 1
@@ -239,9 +255,17 @@
} else if (_card.eleType === 'button') { // 鎷嗗垎style
_card.style = fromJS(style).toJS()
- if (style.float) {
+ if (style.float === 'center') {
+ delete _card.style.float
+ } else if (style.float) {
_card.wrapStyle = {textAlign: style.float}
delete _card.style.float
+ }
+ if (style.textAlign === 'center') {
+ delete _card.style.textAlign
+ }
+ if (style.minHeight === '28px') {
+ delete _card.style.minHeight
}
} else if (_card.eleType === 'picture') {
_card.style = style
@@ -380,6 +404,9 @@
if (!['text', 'number', 'icon'].includes(res.eleType)) {
delete res.style.display
}
+ if (!['text', 'number', 'formula', 'currentDate'].includes(res.eleType)) {
+ delete res.style.fontFamily
+ }
if (res.eleType === 'splitline' && (cell.eleType !== 'splitline' || cell.focus)) {
res.style.paddingTop = '5px'
--
Gitblit v1.8.0