From f6626b05f1275cc2f8ca77f773d4f6a6af1b0a89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:11:55 +0800
Subject: [PATCH] 2022-11-21
---
src/mob/mobshell/card.jsx | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index c289560..b0c4f65 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -30,6 +30,7 @@
const Balcony = asyncComponent(() => import('@/menu/components/card/balcony'))
const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
const OfficialAccount = asyncComponent(() => import('@/mob/components/official'))
+const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -63,6 +64,10 @@
let style = { opacity: 1}
if (isDragging) {
style = { opacity: 0.3}
+ }
+
+ if (card.style && card.style.clear === 'left') {
+ style.clear = 'left'
}
let col = 'ant-col-' + (card.width || 24)
@@ -109,7 +114,7 @@
return (<CarouselDataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'carousel' && card.subtype === 'propcard') {
return (<CarouselPropCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
- } else if (card.type === 'table' && card.subtype === 'tablecard') {
+ } else if (card.type === 'card' && card.subtype === 'tablecard') {
return (<TableCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'table' && card.subtype === 'normaltable') {
return (<NormalTable card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
@@ -135,6 +140,8 @@
return (<Timeline card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'officialAccount') {
return (<OfficialAccount card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'iframe') {
+ return (<Iframe card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
--
Gitblit v1.8.0