From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02
---
src/pc/menushell/card.jsx | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index cd6aa65..da9e868 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'))
@@ -54,8 +57,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) * 420 / 100 + 'px'
+ // return parseFloat(word) * 350 / 100 + 'px'
+ }).replace(/\d+vh/ig, (word) => {
+ return parseFloat(word) * 738 / 100 + 'px'
+ // return parseFloat(word) * 615 / 100 + 'px'
+ })
+ }
+
+ style.minHeight = height
}
const getCardComponent = () => {
@@ -69,6 +84,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') {
@@ -93,10 +114,15 @@
return (<NormalLogin 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