From 8137ac074ce6370e4b46295e7acf9c7870ef82d2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 二月 2023 22:19:23 +0800
Subject: [PATCH] 2023-02-17
---
src/mob/mobshell/card.jsx | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index f7965f6..fdca2fd 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -32,6 +32,7 @@
const OfficialAccount = asyncComponent(() => import('@/mob/components/official'))
const ShareCode = asyncComponent(() => import('@/mob/components/sharecode'))
const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
+const DoubleDataCard = asyncComponent(() => import('@/menu/components/card/double-data-card'))
const Card = ({ id, card, moveCard, findCard, delCard, unGroup, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -72,21 +73,21 @@
}
let col = 'ant-col-' + (card.width || 24)
- 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) * (window.GLOB.winWidth || 420) / 100 + 'px'
- // return parseFloat(word) * 350 / 100 + 'px'
- }).replace(/\d+vh/ig, (word) => {
- return parseFloat(word) * (window.GLOB.winHeight || 738) / 100 + 'px'
- // return parseFloat(word) * 615 / 100 + 'px'
- })
- }
+ // 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) * (window.GLOB.winWidth || 420) / 100 + 'px'
+ // // return parseFloat(word) * 350 / 100 + 'px'
+ // }).replace(/\d+vh/ig, (word) => {
+ // return parseFloat(word) * (window.GLOB.winHeight || 738) / 100 + 'px'
+ // // return parseFloat(word) * 615 / 100 + 'px'
+ // })
+ // }
- style.minHeight = height
- }
+ // style.minHeight = height
+ // }
const getCardComponent = () => {
if (card.type === 'bar' || card.type === 'line') {
@@ -111,6 +112,8 @@
return (<DataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'card' && card.subtype === 'propcard') {
return (<PropCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'card' && card.subtype === 'dualdatacard') {
+ return (<DoubleDataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'carousel' && card.subtype === 'datacard') {
return (<CarouselDataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'carousel' && card.subtype === 'propcard') {
--
Gitblit v1.8.0