From 75f3fd6e67851b9079e0b82c8cd94bf7649fe8bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 三月 2021 18:53:44 +0800
Subject: [PATCH] 2021-03-08
---
src/menu/components/card/cardcellcomponent/index.jsx | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index fcb32ec..286bed6 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -176,7 +176,7 @@
let fontSize = 14
let lineHeight = 1.5
- let line = _card.height || 1
+ let line = _card.height || null
if (_card.style.fontSize) {
fontSize = parseInt(_card.style.fontSize)
@@ -185,7 +185,9 @@
lineHeight = parseFloat(_card.style.lineHeight)
}
- _card.innerHeight = fontSize * lineHeight * line
+ if (line) {
+ _card.innerHeight = fontSize * lineHeight * line
+ }
} else if (_card.eleType === 'barcode') {
_card.style = style
@@ -351,7 +353,7 @@
} else if (res.eleType === 'text' || res.eleType === 'number') {
let fontSize = 14
let lineHeight = 1.5
- let line = res.height || 1
+ let line = res.height || null
if (res.style && res.style.fontSize) {
fontSize = parseInt(res.style.fontSize)
@@ -359,7 +361,10 @@
if (res.style && res.style.lineHeight) {
lineHeight = parseFloat(res.style.lineHeight)
}
- res.innerHeight = fontSize * lineHeight * line
+
+ if (line) {
+ res.innerHeight = fontSize * lineHeight * line
+ }
if (res.eleType === 'text' && res.link && !res.style.color) {
res.style.color = '#2440B3'
@@ -498,21 +503,33 @@
const { cards } = this.props
let btn = fromJS(item).toJS()
- if (btn.eleType !== 'button' || (sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') !== 'false')) return
+ if ((sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') !== 'false')) return
- if (btn.OpenType === 'pop') {
- if (!btn.modal) {
- btn.modal = {
- setting: { title: btn.label, width: 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
- tables: [],
- groups: [],
- fields: []
+ if (btn.eleType === 'button') {
+ if (btn.OpenType === 'pop') {
+ if (!btn.modal) {
+ btn.modal = {
+ setting: { title: btn.label, width: 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
+ tables: [],
+ groups: [],
+ fields: []
+ }
}
+
+ MKEmitter.emit('changeModal', cards, btn)
+ } else if (btn.OpenType === 'popview') {
+ MKEmitter.emit('changePopview', cards, btn)
+ } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'page') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
+ } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
}
-
- MKEmitter.emit('changeModal', cards, btn)
- } else if (btn.OpenType === 'popview') {
- MKEmitter.emit('changePopview', cards, btn)
+ } else {
+ if (btn.link === 'page') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
+ } else if (btn.link === 'linkpage') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
+ }
}
}
--
Gitblit v1.8.0