From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/mobshell/card.jsx | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index 797d51a..263391c 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -5,7 +5,7 @@
import './index.scss'
const AntvBar = asyncComponent(() => import('@/menu/components/chart/antv-bar'))
-// const MainSearch = asyncComponent(() => import('@/menu/components/search/main-search'))
+const MainSearch = asyncComponent(() => import('@/mob/components/search/single-search'))
const AntvPie = asyncComponent(() => import('@/menu/components/chart/antv-pie'))
const AntvDashboard = asyncComponent(() => import('@/menu/components/chart/antv-dashboard'))
const AntvScatter = asyncComponent(() => import('@/menu/components/chart/antv-scatter'))
@@ -16,7 +16,9 @@
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'))
const BraftEditor = asyncComponent(() => import('@/menu/components/editor/braft-editor'))
@@ -24,12 +26,14 @@
const NormalNavbar = asyncComponent(() => import('@/mob/components/navbar/normal-navbar'))
const NormalTopbar = asyncComponent(() => import('@/mob/components/topbar/normal-navbar'))
const NormalMenuBar = asyncComponent(() => import('@/mob/components/menubar/normal-menubar'))
+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 Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
- item: { type: 'menu', id, originalIndex, floor: card.floor },
+ item: { type: 'menu', id, originalIndex },
collect: monitor => ({
isDragging: monitor.isDragging(),
}),
@@ -38,10 +42,11 @@
accept: 'menu',
canDrop: () => true,
drop: (item) => {
- const { id: draggedId, originalIndex, floor } = item
+ const { id: draggedId, originalIndex } = item
+
if (originalIndex === undefined) {
item.dropTargetId = id
- } else if (draggedId && floor === card.floor) {
+ } else if (draggedId) {
if (draggedId === id) return
const { index: originIndex } = findCard(draggedId)
@@ -79,16 +84,20 @@
const getCardComponent = () => {
if (card.type === 'bar' || card.type === 'line') {
return (<AntvBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
- // } else if (card.type === 'search') {
- // return (<MainSearch card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'search') {
+ return (<MainSearch card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'pie') {
return (<AntvPie card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'dashboard') {
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') {
- return (<NormalForm 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 (<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') {
return (<AntvTabs tabs={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'card' && card.subtype === 'datacard') {
@@ -115,10 +124,14 @@
return (<NormalNavbar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'topbar') {
return (<NormalTopbar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
- } else if (card.type === 'menubar') {
+ } else if (card.type === 'menubar' && card.subtype === 'menubar') {
return (<NormalMenuBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'menubar' && card.subtype === 'commonbar') {
+ return (<CommonMenuBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'balcony') {
return (<Balcony card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'timeline') {
+ return (<Timeline card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
--
Gitblit v1.8.0