From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/tabviews/custom/components/card/data-card/index.jsx | 123 ++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 31 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 95fde61..6d1c6ea 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -15,6 +15,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'))
@@ -31,6 +32,9 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
search: null, // 鎼滅储鏉′欢
pageIndex: 1, // 椤电爜
+ pageSize: 10,
+ orderBy: '',
+ pageOptions: [],
activeKey: '', // 閫変腑鍗�
selectKeys: [], // 澶氶�夋椂閫変腑鍗＄墖
selectedData: [], // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
@@ -76,6 +80,8 @@
}
}
+ _config.$extend = false
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -91,8 +97,10 @@
if (item.$cardType !== 'extendCard') {
_card = item
} else if (!_card) {
+ _config.$extend = true
precards.push(item)
} else {
+ _config.$extend = true
nextcards.push(item)
}
})
@@ -126,7 +134,7 @@
item.$Index = index + 1 + ''
if (_config.wrap.controlField) {
- if (_config.wrap.controlVal.includes(item[_config.wrap.controlField])) {
+ if (_config.wrap.controlVal.includes(item[_config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -157,7 +165,23 @@
this.loaded = _data !== null
+ 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) + ''
+ if (!pageOptions.includes(size)) {
+ pageOptions.push(size)
+ pageOptions = pageOptions.sort((a, b) => a - b)
+ }
+ }
+
this.setState({
+ pageSize: _config.setting.pageSize || 10,
+ pageOptions,
supComs,
selected,
precards,
@@ -208,7 +232,7 @@
item.$Index = index + 1 + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -240,7 +264,7 @@
item.$Index = index + 1 + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -472,6 +496,7 @@
checkAll = () => {
const { config, data, selectedData } = this.state
+ if (config.wrap.cardType !== 'checkbox') return
if (!data || data.length === 0) return
if (selectedData.length === 0 || selectedData.length < data.length) {
@@ -564,7 +589,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
@@ -580,7 +605,7 @@
callback({
arr_field: arr_field,
- orderBy: config.setting.order || '',
+ orderBy: orderBy ||config.setting.order || '',
search: searches,
menuName: config.name
})
@@ -588,7 +613,7 @@
async loadData (id, type) {
const { mainSearch } = this.props
- const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state
+ const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, orderBy } = this.state
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.loaded = true
@@ -640,14 +665,14 @@
})
}
- let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
+ 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)
if (result.status) {
let start = 1
if (config.setting.laypage) {
- start = config.setting.pageSize * (pageIndex - 1) + 1
+ start = pageSize * (pageIndex - 1) + 1
}
this.loaded = true
@@ -681,7 +706,7 @@
item.$Index = index + 1 + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -696,7 +721,7 @@
item.$Index = index + start + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -712,6 +737,13 @@
total: result.total,
loading: false
})
+
+ if (config.timer && config.clearField && result.data && result.data[0]) {
+ let vals = (config.clearValue || '').split(',')
+ if (vals.includes(result.data[0][config.clearField])) {
+ this.timer && this.timer.stop()
+ }
+ }
} else {
this.setState({
loading: false
@@ -736,7 +768,7 @@
*/
async loadLinedata (id) {
const { mainSearch } = this.props
- const { config, arr_field, pageIndex, 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) { // 涓昏〃鎼滅储鏉′欢
@@ -752,8 +784,8 @@
loading: true
})
- let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, id)
+ 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)
if (result.status) {
@@ -798,9 +830,9 @@
}
loadMore = () => {
- const { total, pageIndex, loading, config } = this.state
+ const { total, pageIndex, pageSize, loading } = this.state
- if (loading || config.setting.pageSize * pageIndex >= total) {
+ if (loading || pageSize * pageIndex >= total) {
return
}
@@ -824,8 +856,8 @@
}
nextPage = () => {
- const { config, pageIndex, total } = this.state
- let _total = config.setting.pageSize * pageIndex
+ const { pageIndex, pageSize, total } = this.state
+ let _total = pageSize * pageIndex
if (_total >= total) return
@@ -848,6 +880,15 @@
this.setState({
search: list,
pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ }
+
+ pageSizeChange = (current, size) => {
+ this.setState({
+ pageIndex: current,
+ pageSize: size
}, () => {
this.loadData()
})
@@ -898,22 +939,38 @@
}
}
+ refreshByHeader = (sorter) => {
+ this.setState({
+ orderBy: sorter || ''
+ }, () => {
+ this.loadData()
+ })
+ }
+
render() {
- const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
+ const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
let _total = 0
let switchable = false
- if (config.wrap.pagestyle === 'switch' && config.pageable && config.setting.laypage && total > config.setting.pageSize && data) {
- _total = config.setting.pageSize * pageIndex
+ if (config.wrap.pagestyle === 'switch' && total > pageSize && data) {
+ _total = pageSize * pageIndex
switchable = true
}
- 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 = ''
@@ -947,9 +1004,11 @@
<Row className={'card-row-list ' + config.wrap.layout}>
{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) => {
@@ -977,17 +1036,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>
{switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
- {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>
- {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={t => `鍏� ${t} 鏉} pageSize={config.setting.pageSize} onChange={this.changePageIndex} current={pageIndex}/> : null}
- {config.wrap.pagestyle === 'more' && config.setting.laypage && data && data.length > 0 ? <div className={'mk-more' + (config.setting.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