From 17c59e6efc7c1d7dcc13231b08af03f0ae8b0acd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 13:43:24 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/double-data-card/index.scss | 1 -
src/tabviews/custom/components/card/double-data-card/index.jsx | 7 ++++++-
src/tabviews/custom/components/card/data-card/index.scss | 1 -
src/tabviews/custom/components/card/data-card/index.jsx | 9 ++++++++-
src/tabviews/custom/components/card/table-card/index.scss | 7 +++++++
5 files changed, 21 insertions(+), 4 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>
diff --git a/src/tabviews/custom/components/card/data-card/index.scss b/src/tabviews/custom/components/card/data-card/index.scss
index 34a81cf..bb71f96 100644
--- a/src/tabviews/custom/components/card/data-card/index.scss
+++ b/src/tabviews/custom/components/card/data-card/index.scss
@@ -104,7 +104,6 @@
}
.ant-empty {
- width: 100%;
min-height: 100px;
padding-top: 15px;
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 33637fa..ddf5d2d 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -79,6 +79,7 @@
}
_config.$extend = false
+ _config.$empty = true
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
@@ -96,9 +97,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)
}
})
@@ -1056,8 +1061,8 @@
</Col>
))}
</Row>
- {!config.$extend && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
+ {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
{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}
diff --git a/src/tabviews/custom/components/card/double-data-card/index.scss b/src/tabviews/custom/components/card/double-data-card/index.scss
index b3a5b8a..0ee2e47 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -76,7 +76,6 @@
}
.ant-empty {
- width: 100%;
min-height: 100px;
padding-top: 15px;
diff --git a/src/tabviews/custom/components/card/table-card/index.scss b/src/tabviews/custom/components/card/table-card/index.scss
index c7b6fc8..088083a 100644
--- a/src/tabviews/custom/components/card/table-card/index.scss
+++ b/src/tabviews/custom/components/card/table-card/index.scss
@@ -105,6 +105,13 @@
cursor: not-allowed;
color: #bcbcbc;
}
+ .ant-empty {
+ min-height: 100px;
+ padding-top: 15px;
+ .ant-empty-image {
+ height: 60px;
+ }
+ }
}
.custom-card-box::after {
--
Gitblit v1.8.0