From bcef9a2845e6800704fecb3eb60c204f80854a07 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 九月 2020 09:17:24 +0800
Subject: [PATCH] 2020-09-24
---
src/menu/menushell/card.jsx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index 3d5ac73..2a3ec44 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -1,6 +1,5 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -39,18 +38,17 @@
const getCardComponent = () => {
if (card.type === 'bar' || card.type === 'line') {
- return (<AntvBar card={card} updateConfig={updateConfig} />)
+ return (<AntvBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'tabs') {
- return (<AntvTabs tabs={card} updateConfig={updateConfig} deleteTabs={delCard} />)
- } else if (card.type === 'card') {
- return (<DataCard card={card} updateConfig={updateConfig} />)
+ return (<AntvTabs tabs={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'card' && card.subtype === 'datacard') {
+ return (<DataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
return (
- <div className={'ant-col mk-component-card ant-col-' + (card.setting ? card.setting.span : 12)} ref={node => drag(drop(node))} style={style}>
+ <div className={'ant-col mk-component-card ant-col-' + (card.width || 24)} ref={node => drag(drop(node))} style={style}>
{getCardComponent()}
- {card.type !== 'tabs' ? <Icon className="remove-component" title="delete" type="delete" onClick={() => delCard(id)} /> : null}
</div>
)
}
--
Gitblit v1.8.0