From a4ef35bb323b5f8300f15a4eb604d61ff39a194a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 十二月 2020 17:35:39 +0800
Subject: [PATCH] 2020-12-17

---
 src/menu/components/card/data-card/index.jsx |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 9b07350..9180af2 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -246,6 +246,18 @@
     const { menu } = this.props
     const { card } = this.state
 
+    let offset = 0
+    if (card.wrap.cardFloat && card.wrap.cardFloat !== 'left') {
+      let _width = 0
+      card.subcards.forEach(card => {
+        _width += card.setting.width
+      })
+      offset = _width < 24 ? 24 - _width : 0
+      if (card.wrap.cardFloat === 'center') {
+        offset = Math.floor(offset / 2)
+      }
+    }
+
     return (
       <div className="menu-data-card-edit-box" style={{...card.style, minHeight: card.wrap.minHeight}}>
         <NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
@@ -262,7 +274,7 @@
           <Icon type="tool" />
         </Popover>
         <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
-        {card.subcards.map(subcard => (<CardComponent key={subcard.uuid} MenuType={menu ? menu.MenuType : ''} cards={card} card={subcard} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
+        {card.subcards.map((subcard, index) => (<CardComponent key={subcard.uuid} offset={!index ? offset : 0} MenuType={menu ? menu.MenuType : ''} cards={card} card={subcard} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
         <div style={{clear: 'both'}}></div>
         {card.wrap.pagestyle !== 'switch' && card.setting.laypage === 'true' ? <Pagination total={85} showTotal={total => `鍏� ${total} 鏉} pageSize={20} defaultCurrent={1}/> : null}
       </div>

--
Gitblit v1.8.0