From 30068b0366757b6cae3cd6dda25e0622afcae795 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 13 四月 2023 11:17:05 +0800
Subject: [PATCH] 2023-04-13
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
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 917346e..b3fc0da 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -78,6 +78,8 @@
}
}
+ _config.$extend = false
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -93,8 +95,10 @@
if (item.$cardType !== 'extendCard') {
_card = item
} else if (!_card) {
+ _config.$extend = true
precards.push(item)
} else {
+ _config.$extend = true
nextcards.push(item)
}
})
@@ -139,6 +143,10 @@
_config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
let pageOptions = ['10', '25', '50', '100', '500', '1000']
+
+ if (!_config.setting.laypage) {
+ _config.wrap.pagestyle = 'none'
+ }
if (_config.wrap.pagestyle === 'page') {
let size = (_config.setting.pageSize || 10) + ''
@@ -889,10 +897,18 @@
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
- let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+ let extendData = null
- if (data && data[0]) {
- extendData = {...extendData, ...data[0]}
+ if (config.$extend) {
+ extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+
+ if (data && data[0]) {
+ if (selectedData[0]) {
+ extendData = {...extendData, ...selectedData[0]}
+ } else {
+ extendData = {...extendData, ...data[0]}
+ }
+ }
}
let checkAll = ''
@@ -989,11 +1005,11 @@
</Col>
))}
</Row>
- {precards.length === 0 && nextcards.length === 0 && (!data || data.length === 0) ? <Empty description={false}/> : null}
+ {!config.$extend && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
</div>
- {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={(t, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
- {config.wrap.pagestyle === 'more' && config.setting.laypage && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : 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