From 46aa44856bcb0e262d98918e06b4f83d2c11777a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 15 四月 2023 14:32:02 +0800
Subject: [PATCH] 2023-04-15
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 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 b06a81c..b3fc0da 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -13,6 +13,7 @@
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
+const TableHeader = asyncComponent(() => import('../tableHeader'))
const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
@@ -29,6 +30,7 @@
search: null, // 鎼滅储鏉′欢
pageIndex: 1, // 椤电爜
pageSize: 10,
+ orderBy: '',
pageOptions: [],
activeKey: '', // 閫変腑鍗�
selectKeys: [], // 澶氶�夋椂閫変腑鍗＄墖
@@ -76,6 +78,8 @@
}
}
+ _config.$extend = false
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -91,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)
}
})
@@ -137,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) + ''
@@ -445,7 +455,7 @@
*/
queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
- const { arr_field, config, search } = this.state
+ const { arr_field, config, search, orderBy } = this.state
if (config.uuid !== menuId) return
@@ -461,7 +471,7 @@
callback({
arr_field: arr_field,
- orderBy: config.setting.order || '',
+ orderBy: orderBy || config.setting.order || '',
search: searches,
menuName: config.name
})
@@ -469,7 +479,7 @@
async loadData (id, type) {
const { mainSearch } = this.props
- const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, card } = this.state
+ const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, card, orderBy } = this.state
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.loaded = true
@@ -519,7 +529,7 @@
})
}
- let _orderBy = config.setting.order || ''
+ let _orderBy = orderBy || config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
@@ -674,7 +684,7 @@
*/
async loadLinedata (id) {
const { mainSearch } = this.props
- const { config, arr_field, pageIndex, pageSize, search, BID, BData } = this.state
+ const { config, arr_field, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
let searches = fromJS(search).toJS()
if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -690,7 +700,7 @@
loading: true
})
- let _orderBy = config.setting.order || ''
+ let _orderBy = orderBy || config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
@@ -874,15 +884,31 @@
}
}
+ refreshByHeader = (sorter) => {
+ this.setState({
+ orderBy: sorter || ''
+ }, () => {
+ this.loadData()
+ })
+ }
+
render() {
const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
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 = ''
@@ -922,9 +948,11 @@
<Row className={'card-row-list '}>
{precards.map((item, index) => (
<Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={extendData}>
+ {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
{item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
- </CardItem>
+ </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
+ {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+ </CardItem>}
</Col>
))}
{data && data.map((item, index) => {
@@ -969,17 +997,19 @@
})}
{nextcards.map((item, index) => (
<Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={extendData}>
+ {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
{item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
- </CardItem>
+ </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
+ {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+ </CardItem>}
</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