From 0de207ebed200dffca41b8c974d1394cf328b03e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 九月 2020 09:29:02 +0800
Subject: [PATCH] 2020-09-23
---
src/menu/menushell/card.jsx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index ddda757..3d5ac73 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -7,6 +7,7 @@
const AntvBar = asyncComponent(() => import('@/menu/components/chart/antv-bar'))
const AntvTabs = asyncComponent(() => import('@/menu/components/tabs/antv-tabs'))
+const DataCard = asyncComponent(() => import('@/menu/components/card/data-card'))
const Card = ({ id, card, moveCard, findCard, delCard, hasDrop, doubleClickCard, updateConfig }) => {
const originalIndex = findCard(id).index
@@ -40,14 +41,16 @@
if (card.type === 'bar' || card.type === 'line') {
return (<AntvBar card={card} updateConfig={updateConfig} />)
} else if (card.type === 'tabs') {
- return (<AntvTabs tabs={card} updateConfig={updateConfig} />)
+ return (<AntvTabs tabs={card} updateConfig={updateConfig} deleteTabs={delCard} />)
+ } else if (card.type === 'card') {
+ return (<DataCard card={card} updateConfig={updateConfig} />)
}
}
return (
<div className={'ant-col mk-component-card ant-col-' + (card.setting ? card.setting.span : 12)} ref={node => drag(drop(node))} style={style}>
{getCardComponent()}
- <Icon className="remove-component" title="delete" type="delete" onClick={() => delCard(id)} />
+ {card.type !== 'tabs' ? <Icon className="remove-component" title="delete" type="delete" onClick={() => delCard(id)} /> : null}
</div>
)
}
--
Gitblit v1.8.0