From 16145059198ba7c7ff8a73f4ac207d3ba2269e5a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 四月 2021 20:25:31 +0800
Subject: [PATCH] 2021-04-13
---
src/mob/mobshell/card.jsx | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index a034fe3..3a2a1fa 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -80,21 +80,26 @@
} else if (card.type === 'code') {
return (<CodeSandbox card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'login') {
- let height = ''
- if (card.wrap && card.wrap.height) {
- height = card.wrap.height.replace(/\d+vw/ig, (word) => {
- return parseFloat(word) * 350 / 100 + 'px'
- }).replace(/\d+vh/ig, (word) => {
- return parseFloat(word) * 615 / 100 + 'px'
- })
- }
-
- return (<>
- <NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>
- <div style={{float: 'right', height}}></div>
- </>)
+ return (<NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
+
+ if (card.type === 'login') {
+ let height = ''
+ if (card.wrap && card.wrap.height) {
+ // scaleview
+ height = card.wrap.height.replace(/\d+vw/ig, (word) => {
+ return parseFloat(word) * 420 / 100 + 'px'
+ // return parseFloat(word) * 350 / 100 + 'px'
+ }).replace(/\d+vh/ig, (word) => {
+ return parseFloat(word) * 738 / 100 + 'px'
+ // return parseFloat(word) * 615 / 100 + 'px'
+ })
+ }
+
+ style.minHeight = height
+ }
+
return (
<div className={'ant-col mk-component-card ant-col-' + (card.width || 24)} ref={node => drag(drop(node))} style={style}>
{getCardComponent()}
--
Gitblit v1.8.0