From 26d0fa42ea8c63a87e8ef93d0915f75f46fb1f9c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 11:09:53 +0800
Subject: [PATCH] 2022-03-24
---
src/pc/menushell/card.jsx | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index da9e868..bd25267 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -15,19 +15,24 @@
const NormalTree = asyncComponent(() => import('@/menu/components/tree/antd-tree'))
const TableCard = asyncComponent(() => import('@/menu/components/card/table-card'))
const NormalTable = asyncComponent(() => import('@/menu/components/table/normal-table'))
+const EditTable = asyncComponent(() => import('@/menu/components/table/edit-table'))
const NormalGroup = asyncComponent(() => import('@/menu/components/group/normal-group'))
const NormalForm = asyncComponent(() => import('@/menu/components/form/normal-form'))
+const TabForm = asyncComponent(() => import('@/menu/components/form/tab-form'))
const BraftEditor = asyncComponent(() => import('@/menu/components/editor/braft-editor'))
const CodeSandbox = asyncComponent(() => import('@/menu/components/code/sandbox'))
const NormalNavbar = asyncComponent(() => import('@/pc/components/navbar/normal-navbar'))
const NormalLogin = asyncComponent(() => import('@/pc/components/login/normal-login'))
const CarouselDataCard = asyncComponent(() => import('@/menu/components/carousel/data-card'))
const CarouselPropCard = asyncComponent(() => import('@/menu/components/carousel/prop-card'))
+const Balcony = asyncComponent(() => import('@/menu/components/card/balcony'))
+const CustomChart = asyncComponent(() => import('@/menu/components/chart/chart-custom'))
+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(),
}),
@@ -36,10 +41,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)
@@ -62,10 +68,10 @@
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'
})
}
@@ -78,8 +84,10 @@
return (<AntvBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'navbar') {
return (<NormalNavbar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
- } else if (card.type === 'form') {
+ } 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 === 'search') {
return (<MainSearch card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'pie') {
@@ -104,6 +112,8 @@
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 === 'table' && card.subtype === 'editable') {
+ return (<EditTable card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'group' && card.subtype === 'normalgroup') {
return (<NormalGroup group={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'editor') {
@@ -112,6 +122,12 @@
return (<CodeSandbox card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'login') {
return (<NormalLogin 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}/>)
+ } else if (card.type === 'chart') {
+ return (<CustomChart card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
--
Gitblit v1.8.0