From 95afd40fc2741ac0ce59c2091f6cfce1f98877d4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 六月 2021 09:15:45 +0800
Subject: [PATCH] 2021-06-24
---
src/menu/components/card/cardcellcomponent/index.jsx | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index cfa8777..3f1b073 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -138,7 +138,7 @@
let options = ['font', 'border', 'padding', 'margin', 'backgroundColor']
if (element.eleType === 'button') {
-
+ options.push('width')
} else if (element.eleType === 'picture') {
options = ['border', 'margin']
} else if (element.eleType === 'slider') {
@@ -194,6 +194,17 @@
if (line) {
_card.innerHeight = fontSize * lineHeight * line
}
+ } else if (_card.eleType === 'sequence') {
+ _card.style = style
+
+ let fontSize = 14
+ let lineHeight = 1.5
+
+ if (_card.style.fontSize) {
+ fontSize = parseInt(_card.style.fontSize)
+ }
+
+ _card.innerHeight = fontSize * lineHeight
} else if (_card.eleType === 'barcode') {
_card.style = style
@@ -226,7 +237,7 @@
* @description 鍏冪礌缂栬緫锛岃幏鍙栧厓绱犺〃鍗曚俊鎭�
*/
handleElement = (card) => {
- const { cards } = this.props
+ const { cards, cardCell } = this.props
if (card.eleType === 'button') {
this.handleAction(card)
@@ -234,7 +245,7 @@
this.setState({
visible: true,
card: card,
- formlist: getCardCellForm(card, cards.type, cards.subtype)
+ formlist: getCardCellForm(card, cards.type, cards.subtype, cardCell)
})
}
}
@@ -469,7 +480,7 @@
const { cards } = this.props
let btn = fromJS(item).toJS()
- if ((sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') !== 'false')) return
+ if ((sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') === 'true')) return
if (btn.eleType === 'button') {
if (btn.OpenType === 'pop') {
--
Gitblit v1.8.0