From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09
---
src/menu/menushell/card.jsx | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index 2331154..3af7dc8 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -19,7 +19,8 @@
const TableCard = asyncComponent(() => import('@/menu/components/card/table-card'))
const NormalTable = asyncComponent(() => import('@/menu/components/table/normal-table'))
const EditTable = asyncComponent(() => import('@/menu/components/table/edit-table'))
-const NormalForm = asyncComponent(() => import('@/menu/components/form/normal-form'))
+const SimpleForm = asyncComponent(() => import('@/menu/components/form/simple-form'))
+const StepForm = asyncComponent(() => import('@/menu/components/form/step-form'))
const TabForm = asyncComponent(() => import('@/menu/components/form/tab-form'))
const NormalGroup = asyncComponent(() => import('@/menu/components/group/normal-group'))
const BraftEditor = asyncComponent(() => import('@/menu/components/editor/braft-editor'))
@@ -27,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
@@ -61,6 +64,10 @@
style = { opacity: 0.3}
}
+ if (card.style && card.style.clear === 'left') {
+ style.clear = 'left'
+ }
+
const getCardComponent = () => {
if (card.type === 'card' && card.subtype === 'datacard') {
return (<DataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
@@ -78,8 +85,10 @@
return (<NormalTree card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'scatter') {
return (<AntvScatter card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'form' && card.subtype === 'simpleform') {
+ return (<SimpleForm card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'form' && card.subtype === 'stepform') {
- return (<NormalForm card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ return (<StepForm card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'form' && card.subtype === 'tabform') {
return (<TabForm card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'tabs') {
@@ -88,7 +97,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}/>)
@@ -106,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