From a7c92047424d58954127b38bbef7c9096994a972 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 13:42:42 +0800
Subject: [PATCH] 2023-06-14

---
 src/tabviews/custom/components/card/data-card/index.jsx |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 6d1c6ea..acc79e5 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -81,6 +81,7 @@
     }
 
     _config.$extend = false
+    _config.$empty = true
 
     _config.subcards.forEach(item => {
       if (item.setting.click === 'button' && !item.setting.linkbtn) {
@@ -98,9 +99,13 @@
         _card = item
       } else if (!_card) {
         _config.$extend = true
+        if (item.setting.width !== 24) {
+          _config.$empty = false
+        }
         precards.push(item)
       } else {
         _config.$extend = true
+        _config.$empty = false
         nextcards.push(item)
       }
     })
@@ -729,6 +734,8 @@
         })
       }
 
+      data = []
+
       this.setState({
         activeKey: '',
         selectKeys: [],
@@ -1045,8 +1052,8 @@
             ))}
           </Row>
           {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
-          {!config.$extend && (!data || data.length === 0) ? <Empty description={false}/> : null}
         </div>
+        {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
         {config.wrap.pagestyle === 'page' && data ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
         {config.wrap.pagestyle === 'more' && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
       </div>

--
Gitblit v1.8.0