From 0a775d67b17400de3bbac4767d5ea25e6f0d14f9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 二月 2023 15:15:00 +0800
Subject: [PATCH] 2023-02-06
---
src/mob/components/tabs/tabcomponents/card.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/mob/components/tabs/tabcomponents/card.jsx b/src/mob/components/tabs/tabcomponents/card.jsx
index bbd5724..76430f6 100644
--- a/src/mob/components/tabs/tabcomponents/card.jsx
+++ b/src/mob/components/tabs/tabcomponents/card.jsx
@@ -16,7 +16,8 @@
const CarouselDataCard = asyncComponent(() => import('@/menu/components/carousel/data-card'))
const CarouselPropCard = asyncComponent(() => import('@/menu/components/carousel/prop-card'))
const TableCard = asyncComponent(() => import('@/menu/components/card/table-card'))
-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 NormalTable = asyncComponent(() => import('@/menu/components/table/normal-table'))
const NormalGroup = asyncComponent(() => import('@/menu/components/group/normal-group'))
@@ -26,7 +27,7 @@
const CodeSandbox = asyncComponent(() => import('@/menu/components/code/sandbox'))
const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
-const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
+const Card = ({ id, card, moveCard, findCard, delCard, unGroup, updateConfig }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'menu', id, originalIndex },
@@ -59,6 +60,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} />)
@@ -72,8 +77,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') {
@@ -86,12 +93,12 @@
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}/>)
} else if (card.type === 'group' && card.subtype === 'normalgroup') {
- return (<NormalGroup group={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ return (<NormalGroup group={card} updateConfig={updateConfig} unGroup={unGroup} deletecomponent={delCard}/>)
} else if (card.type === 'editor') {
return (<BraftEditor card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'menubar') {
--
Gitblit v1.8.0