From e4da07b71dddb3b01b58ecaf21ae5b7052e98b7d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 26 八月 2020 16:01:01 +0800
Subject: [PATCH] 2020-08-26

---
 src/menu/menushell/card.jsx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index cc2146d..ac08014 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -7,7 +7,7 @@
 
 const AntvBar = asyncComponent(() => import('@/menu/components/chart/antv-bar'))
 
-const Card = ({ id, card, moveCard, findCard, editId, editCard, delCard, hasDrop, doubleClickCard, updateConfig }) => {
+const Card = ({ id, config, card, moveCard, findCard, editId, editCard, delCard, hasDrop, doubleClickCard, updateConfig }) => {
   const originalIndex = findCard(id).index
   const [{ isDragging }, drag] = useDrag({
     item: { type: 'menu', id, originalIndex },
@@ -39,12 +39,12 @@
 
   const getCardComponent = () => {
     if (card.type === 'bar') {
-      return (<AntvBar card={card} triggerEdit={editCard} editId={editId} onDoubleClick={doubleClickCard} updateConfig={updateConfig} />)
+      return (<AntvBar config={config} card={card} triggerEdit={editCard} editId={editId} updateConfig={updateConfig} />)
     }
   }
 
   return (
-    <div className="mk-component-card" ref={node => drag(drop(node))} style={style}>
+    <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)} />
     </div>

--
Gitblit v1.8.0