From 07969dd2fb6bf732655e6700577b3fb4cdaca374 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 四月 2021 17:36:34 +0800
Subject: [PATCH] 2021-04-20
---
src/mob/mobshell/card.jsx | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index 5c4d174..4250b23 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -7,6 +7,8 @@
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'))
@@ -55,9 +57,7 @@
}
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
@@ -80,6 +80,10 @@
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 === 'tabs') {
@@ -109,10 +113,14 @@
}
}
- 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