From 4751cbd63d9f24ab2aaa5c5930a7aca0263471c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 四月 2021 23:36:51 +0800
Subject: [PATCH] 2021-04-19
---
src/pc/menushell/card.jsx | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index 2074191..fc878d3 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -58,6 +58,20 @@
let col = ' ant-col ant-col-' + (card.width || 24)
if (card.type === 'navbar') {
col = ''
+ } else 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
}
const getCardComponent = () => {
@@ -96,10 +110,7 @@
} else if (card.type === 'code') {
return (<CodeSandbox card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'login') {
- return (<>
- <NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>
- <div style={{float: 'right', height: card.wrap ? card.wrap.height : ''}}></div>
- </>)
+ return (<NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
return (
--
Gitblit v1.8.0