From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/pc/menushell/card.jsx | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index 843c8c5..c3311f6 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -7,9 +7,12 @@
const AntvBar = asyncComponent(() => import('@/menu/components/chart/antv-bar'))
const MainSearch = asyncComponent(() => import('@/menu/components/search/main-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'))
const AntvTabs = asyncComponent(() => import('@/menu/components/tabs/antv-tabs'))
const DataCard = asyncComponent(() => import('@/menu/components/card/data-card'))
const PropCard = asyncComponent(() => import('@/menu/components/card/prop-card'))
+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 NormalGroup = asyncComponent(() => import('@/menu/components/group/normal-group'))
@@ -17,8 +20,10 @@
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 Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -53,8 +58,20 @@
style = { opacity: 0.3}
}
let col = ' ant-col ant-col-' + (card.width || 24)
- if (card.type === 'navbar') {
- col = ''
+ 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) * (window.GLOB.winWidth || 420) / 100 + 'px'
+ // return parseFloat(word) * 350 / 100 + 'px'
+ }).replace(/\d+vh/ig, (word) => {
+ return parseFloat(word) * (window.GLOB.winHeight || 738) / 100 + 'px'
+ // return parseFloat(word) * 615 / 100 + 'px'
+ })
+ }
+
+ style.minHeight = height
}
const getCardComponent = () => {
@@ -68,6 +85,12 @@
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 === 'tree') {
+ 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 === 'tabs') {
return (<AntvTabs tabs={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'card' && card.subtype === 'datacard') {
@@ -88,12 +111,21 @@
return (<BraftEditor card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'code') {
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}/>)
}
}
- return (
- <div className={`mk-component-card ${col}`} ref={node => drag(drop(node))} style={style}>
- {getCardComponent()}
- </div>
- )
+
+ if (card.type === 'navbar') {
+ return getCardComponent()
+ } else {
+ return (
+ <div className={`mk-component-card ${col}`} ref={node => drag(drop(node))} style={style}>
+ {getCardComponent()}
+ </div>
+ )
+ }
}
export default Card
--
Gitblit v1.8.0