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/mob/mobshell/card.jsx |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index 7095000..517db7f 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -16,7 +16,8 @@
 const CarouselPropCard = asyncComponent(() => import('@/menu/components/carousel/prop-card'))
 const TableCard = asyncComponent(() => import('@/menu/components/card/table-card'))
 const NormalTable = asyncComponent(() => import('@/menu/components/table/normal-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 CodeSandbox = asyncComponent(() => import('@/menu/components/code/sandbox'))
@@ -28,6 +29,9 @@
 const CommonMenuBar = asyncComponent(() => import('@/mob/components/menubar/common-menubar'))
 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 ShareCode = asyncComponent(() => import('@/mob/components/sharecode'))
+const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
 
 const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
   const originalIndex = findCard(id).index
@@ -63,6 +67,10 @@
     style = { opacity: 0.3}
   }
 
+  if (card.style && card.style.clear === 'left') {
+    style.clear = 'left'
+  }
+
   let col = 'ant-col-' + (card.width || 24)
   if (card.type === 'login') {
     let height = ''
@@ -91,8 +99,10 @@
       return (<AntvDashboard 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') {
@@ -105,7 +115,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}/>)
@@ -129,6 +139,12 @@
       return (<Balcony card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
     } else if (card.type === 'timeline') {
       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}/>)
+    } else if (card.type === 'sharecode') {
+      return (<ShareCode card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
     }
   }
 

--
Gitblit v1.8.0