From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/mob/mobshell/card.jsx | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index 5c4d174..9c18493 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -5,9 +5,11 @@
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 AntvTabs = asyncComponent(() => import('@/menu/components/tabs/antv-tabs'))
+const AntvDashboard = asyncComponent(() => import('@/menu/components/chart/antv-dashboard'))
+const AntvScatter = asyncComponent(() => import('@/menu/components/chart/antv-scatter'))
+const AntvTabs = asyncComponent(() => import('@/mob/components/tabs/antv-tabs'))
const DataCard = asyncComponent(() => import('@/menu/components/card/data-card'))
const PropCard = asyncComponent(() => import('@/menu/components/card/prop-card'))
const CarouselDataCard = asyncComponent(() => import('@/menu/components/carousel/data-card'))
@@ -15,16 +17,21 @@
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 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'))
const NormalLogin = asyncComponent(() => import('@/pc/components/login/normal-login'))
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 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(),
}),
@@ -33,10 +40,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)
@@ -55,17 +63,15 @@
}
let col = 'ant-col-' + (card.width || 24)
- if (card.type === 'navbar' || card.type === 'topbar') {
- col = ''
- } else if (card.type === 'login') {
+ if (card.type === 'login') {
let height = ''
if (card.wrap && card.wrap.height) {
// scaleview
height = card.wrap.height.replace(/\d+vw/ig, (word) => {
- return parseFloat(word) * 420 / 100 + 'px'
+ return parseFloat(word) * (window.GLOB.winWidth || 420) / 100 + 'px'
// return parseFloat(word) * 350 / 100 + 'px'
}).replace(/\d+vh/ig, (word) => {
- return parseFloat(word) * 738 / 100 + 'px'
+ return parseFloat(word) * (window.GLOB.winHeight || 738) / 100 + 'px'
// return parseFloat(word) * 615 / 100 + 'px'
})
}
@@ -80,8 +86,14 @@
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 === 'form') {
+ } 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' && card.subtype === 'stepform') {
return (<NormalForm 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') {
@@ -100,19 +112,31 @@
return (<NormalGroup group={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'code') {
return (<CodeSandbox card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'editor') {
+ return (<BraftEditor card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'login') {
return (<NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'navbar') {
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') {
+ return (<NormalMenuBar 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}/>)
}
}
- return (
- <div className={'ant-col mk-component-card ' + col} ref={node => drag(drop(node))} style={style}>
- {getCardComponent()}
- </div>
- )
+ if (card.type === 'navbar' || card.type === 'topbar') {
+ return getCardComponent()
+ } else {
+ return (
+ <div className={'ant-col mk-component-card ' + col} ref={node => drag(drop(node))} style={style}>
+ {getCardComponent()}
+ </div>
+ )
+ }
}
export default Card
--
Gitblit v1.8.0