From e5fc2d92b1036aabf9ffc2c9706ed401bd9735c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 九月 2021 18:14:29 +0800
Subject: [PATCH] 2021-09-09
---
src/menu/components/card/cardcellcomponent/index.jsx | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 3a03296..58f38e9 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -161,6 +161,12 @@
if (comIds.length !== 3 || comIds[0] !== cards.uuid || comIds[1] !== cardCell.uuid || !card) return
+ if (card.eleType === 'button') {
+ if ((style.paddingLeft || style.paddingRight) && !style.width) {
+ style.width = 'auto'
+ }
+ }
+
let _card = this.resetCardStyle(card, style)
let _elements = elements.map(cell => {
@@ -178,7 +184,7 @@
resetCardStyle = (card, style) => {
let _card = fromJS(card).toJS()
- if (_card.eleType === 'text' || _card.eleType === 'number') {
+ if (['text', 'number', 'formula'].includes(_card.eleType)) {
_card.style = style
let fontSize = 14
@@ -261,7 +267,7 @@
if (usefulFields) {
try {
usefulFields = JSON.parse(usefulFields)
- } catch {
+ } catch (e) {
usefulFields = []
}
} else {
@@ -277,7 +283,7 @@
if (menulist) {
try {
menulist = JSON.parse(menulist)
- } catch {
+ } catch (e) {
menulist = []
}
} else {
@@ -315,6 +321,8 @@
elements: _elements,
visible: false,
actvisible: false
+ }, () => {
+ this.props.updateElement(_elements)
})
}
@@ -332,7 +340,7 @@
if (res.eleType === 'splitline' && cell.eleType !== 'splitline') {
res.style.paddingTop = '5px'
res.style.paddingBottom = '5px'
- } else if (res.eleType === 'text' || res.eleType === 'number') {
+ } else if (['text', 'number', 'formula'].includes(res.eleType)) {
let fontSize = 14
let lineHeight = 1.5
let line = res.height || null
@@ -508,6 +516,8 @@
MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
} else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
+ } else {
+ this.handleElement(item)
}
} else {
if (btn.link === 'page') {
@@ -571,12 +581,11 @@
btn.eleType = 'button'
let _elements = [...this.state.elements, btn]
- let _action = cards.action.filter(item => item.uuid !== id)
this.setState({
elements: _elements
}, () => {
- this.props.updateElement(_elements, _action)
+ this.props.updateElement(_elements, btn)
})
}
--
Gitblit v1.8.0