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/components/group/groupcomponents/card.jsx |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/group/groupcomponents/card.jsx b/src/menu/components/group/groupcomponents/card.jsx
index 29710b2..2c62e1e 100644
--- a/src/menu/components/group/groupcomponents/card.jsx
+++ b/src/menu/components/group/groupcomponents/card.jsx
@@ -14,7 +14,8 @@
 const EditTable = asyncComponent(() => import('@/menu/components/table/edit-table'))
 const BraftEditor = asyncComponent(() => import('@/menu/components/editor/braft-editor'))
 const AntvScatter = asyncComponent(() => import('@/menu/components/chart/antv-scatter'))
-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 AntvDashboard = asyncComponent(() => import('@/menu/components/chart/antv-dashboard'))
 const CarouselDataCard = asyncComponent(() => import('@/menu/components/carousel/data-card'))
@@ -23,6 +24,7 @@
 const CodeSandbox = asyncComponent(() => import('@/menu/components/code/sandbox'))
 const CustomChart = asyncComponent(() => import('@/menu/components/chart/chart-custom'))
 const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
+const AntvG6 = asyncComponent(() => import('@/menu/components/chart/antv-G6'))
 
 const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
   const originalIndex = findCard(id).index
@@ -57,6 +59,10 @@
     style = { opacity: 0.3}
   }
 
+  if (card.style && card.style.clear === 'left') {
+    style.clear = 'left'
+  }
+
   const getCardComponent = () => {
     if (card.type === 'bar' || card.type === 'line') {
       return (<AntvBar card={card} updateConfig={updateConfig} deletecomponent={delCard} />)
@@ -68,15 +74,17 @@
       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 === 'card' && card.subtype === 'datacard') {
       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 === '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}/>)
@@ -96,6 +104,8 @@
       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 === 'antvG6') {
+      return (<AntvG6 card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
     }
   }
 

--
Gitblit v1.8.0