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/tabviews/custom/components/card/data-card/index.jsx |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 373bcd7..0e5a924 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -319,12 +319,21 @@
       _total = config.setting.pageSize * pageIndex
       switchable = true
     }
+    let offset = 0
+    if (config.wrap.cardFloat && config.wrap.cardFloat !== 'left') {
+      if (data && card.setting.width * data.length < 24) {
+        offset = 24 - card.setting.width * data.length
+        if (config.wrap.cardFloat === 'center') {
+          offset = Math.floor(offset / 2)
+        }
+      }
+    }
 
     return (
       <div className="custom-data-card-box" style={{...config.style, minHeight: config.wrap.minHeight}}>
         {loading ?
           <div className="loading-mask">
-            <div className="ant-spin-blur"></div>
+            {data ? <div className="ant-spin-blur"></div> : null}
             <Spin />
           </div> : null
         }
@@ -340,11 +349,11 @@
             getexceloutparam={this.getexceloutparam}
           /> : null
         }
-        <div className="data-zoom">
+        <div className={`data-zoom ${config.wrap.cardType} ${config.wrap.scale}`}>
           {switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
           {data && data.length > 0 ? <div className="card-row-list">
             {data.map((item, index) => (
-              <Col className={activeKey === index ? 'active' : (selectKeys.indexOf(index) > -1 ? 'selected' : '')} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}>
+              <Col className={activeKey === index ? 'active' : (selectKeys.indexOf(index) > -1 ? 'selected' : '')} key={index} span={card.setting.width} offset={!index ? offset : 0} onClick={() => {this.changeCard(index, item)}}>
                 <CardItem card={card} cards={config} data={item} updateStatus={this.updateStatus}/>
               </Col>
             ))}

--
Gitblit v1.8.0