From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/menushell/card.jsx | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index 6fd55a3..3af7dc8 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -28,6 +28,8 @@
const CustomChart = asyncComponent(() => import('@/menu/components/chart/chart-custom'))
const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
const Voucher = asyncComponent(() => import('@/menu/components/module/voucher'))
+const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
+const AntvG6 = asyncComponent(() => import('@/menu/components/chart/antv-G6'))
const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -60,6 +62,10 @@
let style = { opacity: 1}
if (isDragging) {
style = { opacity: 0.3}
+ }
+
+ if (card.style && card.style.clear === 'left') {
+ style.clear = 'left'
}
const getCardComponent = () => {
@@ -109,6 +115,10 @@
return (<Timeline card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'chart') {
return (<CustomChart card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'iframe') {
+ return (<Iframe card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'antvG6') {
+ return (<AntvG6 card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'module' && card.subtype === 'voucher') {
return (<Voucher card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
--
Gitblit v1.8.0