From b59a321435b48626ab268d48df841923f86f1451 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 17:51:40 +0800
Subject: [PATCH] 2022-08-19
---
src/tabviews/custom/components/card/data-card/index.jsx | 204 ++++++++++++++++++++++++++++----------------------
1 files changed, 115 insertions(+), 89 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 1e248d6..0d24ab6 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -2,6 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Spin, Empty, notification, message, Row, Col, Pagination } from 'antd'
+import { DownOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -18,11 +19,9 @@
class DataCard extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -47,8 +46,20 @@
}
UNSAFE_componentWillMount () {
- const { data, initdata, BID, BData } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
+
+ let BID = ''
+ let BData = ''
+
+ if (_config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(_config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(_config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
let _card = null
let precards = []
@@ -98,23 +109,11 @@
_sync = false
}
- if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left') {
- let _width = 0
- precards.forEach(card => {
- _width += card.setting.width
- })
- nextcards.forEach(card => {
- _width += card.setting.width
- })
-
- _config.$offset = _width
- } else {
- _config.wrap.cardFloat = null
- }
-
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init') {
selected = _config.wrap.selected
+ } else {
+ _config.wrap.selected = 'false'
}
if (_data) {
@@ -167,8 +166,9 @@
}
_config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
_config.wrap.scale = _config.wrap.scale === 'true' ? 'scale' : ''
- _config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout'
+ _config.wrap.layout = (_config.wrap.layout || 'grid') + '-layout float-' + (_config.wrap.cardFloat || 'left')
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale}`
@@ -264,19 +264,15 @@
* @param {*} position // 鍒锋柊浣嶇疆
* @param {*} btn // 鎵ц鐨勬寜閽�
*/
- refreshByButtonResult = (menuId, position, btn, id, lines) => {
+ refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
const { config, BID, supComs, supNodes } = this.state
if (config.uuid !== menuId) return
if (supComs) {
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
if (position === 'mainline' || position === 'popclose') { // 涓昏〃鍒锋柊锛屽幓闄ゅ悓姝ュ埛鏂扮粍浠�
let supNode = supNodes[supNodes.length - 1]
supComs.forEach((item, i) => {
- if (item === btn.syncComponentId) return
-
setTimeout(() => {
if (supNode && supNode.key === item) {
MKEmitter.emit('reloadData', item, supNode.value)
@@ -285,50 +281,42 @@
}
}, i * 10)
})
- } else if (!btn.syncComponentId || !supComs.includes(btn.syncComponentId)) {
+ } else {
if (position === 'line') {
if (lines && lines.length === 1) {
this.loadLinedata(lines[0].$$uuid)
} else {
- this.loadData()
+ this.loadData(id)
}
} else if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
}, () => {
- this.loadData()
+ this.loadData(id)
})
} else {
- this.loadData()
+ this.loadData(id)
}
}
} else {
let supModule = config.setting.supModule
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
- if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
- if (position === 'line') {
- if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid)
- } else {
- this.loadData()
- }
- } else if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- if (supModule && BID) {
- MKEmitter.emit('reloadData', supModule, BID)
- } else {
- this.loadData()
- }
- } else if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData()
- })
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadLinedata(lines[0].$$uuid)
} else {
- this.loadData()
+ this.loadData(id)
}
+ } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', supModule, BID)
+ } else if (!btn || btn.resetPageIndex !== 'false') {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData(id)
+ })
+ } else {
+ this.loadData(id)
}
}
@@ -337,10 +325,18 @@
}
}
- checkTopLine = () => {
+ checkTopLine = (id) => {
const { config, data } = this.state
- if (!data || data.length === 0 || data[0].$disabled) {
+ let index = 0
+ if (id && data) {
+ index = data.findIndex(item => item.$$uuid === id)
+ if (index === -1) {
+ index = 0
+ }
+ }
+
+ if (!data || data.length === 0 || data[index].$disabled) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -355,14 +351,14 @@
}
this.setState({
- activeKey: 0,
- selectKeys: [0],
- selectedData: [data[0]]
+ activeKey: index,
+ selectKeys: [index],
+ selectedData: [data[index]]
})
- MKEmitter.emit('resetSelectLine', config.uuid, data[0].$$uuid, data[0])
+ MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
if (config.setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [data[0]], data.length === 1)
+ MKEmitter.emit('syncBalconyData', config.uuid, [data[index]], data.length === 1)
}
}
@@ -444,7 +440,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, search } = this.state
@@ -460,7 +456,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
@@ -468,8 +464,8 @@
})
}
- async loadData () {
- const { mainSearch, menuType } = this.props
+ async loadData (id, type) {
+ const { mainSearch } = this.props
const { config, arr_field, pageIndex, search, BID, BData, selected } = this.state
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -483,9 +479,9 @@
loading: false
})
- if (selected !== 'false') {
+ if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
setTimeout(() => {
- this.checkTopLine()
+ this.checkTopLine(id)
}, 200)
if (selected === 'init') {
this.setState({selected: 'false'})
@@ -519,7 +515,7 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -528,9 +524,9 @@
start = config.setting.pageSize * (pageIndex - 1) + 1
}
- if (selected !== 'false') {
+ if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
setTimeout(() => {
- this.checkTopLine()
+ this.checkTopLine(id)
}, 200)
if (selected === 'init') {
this.setState({selected: 'false'})
@@ -542,11 +538,26 @@
}
}
- this.setState({
- activeKey: '',
- selectKeys: [],
- selectedData: [],
- data: result.data.map((item, index) => {
+ let data = []
+
+ if (type === 'plus') {
+ let _data = (this.state.data || []).concat(result.data || [])
+ data = _data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$$BID = BID || ''
+ item.$$BData = BData || ''
+ item.$Index = index + 1 + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ item.$disabled = true
+ }
+ }
+ return item
+ })
+ } else {
+ data = result.data.map((item, index) => {
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
item.$$BID = BID || ''
@@ -558,9 +569,15 @@
item.$disabled = true
}
}
-
return item
- }),
+ })
+ }
+
+ this.setState({
+ activeKey: '',
+ selectKeys: [],
+ selectedData: [],
+ data: data,
total: result.total,
loading: false
})
@@ -580,7 +597,7 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadLinedata (id) {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, pageIndex, search, BID, BData } = this.state
let searches = fromJS(search).toJS()
@@ -598,7 +615,7 @@
})
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, menuType, id)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -640,6 +657,20 @@
duration: 10
})
}
+ }
+
+ loadMore = () => {
+ const { total, pageIndex, loading, config } = this.state
+
+ if (loading || config.setting.pageSize * pageIndex >= total) {
+ return
+ }
+
+ this.setState({
+ pageIndex: pageIndex + 1
+ }, () => {
+ this.loadData('', 'plus')
+ })
}
prevPage = () => {
@@ -740,27 +771,22 @@
_total = config.setting.pageSize * pageIndex
switchable = true
}
- let offset = 0
- if (config.wrap.cardFloat) {
- let length = data ? data.length : 0
- if (card.setting.width * length + config.$offset < 24) {
- offset = 24 - card.setting.width * length - config.$offset
- if (config.wrap.cardFloat === 'center') {
- offset = Math.floor(offset / 2)
- }
- }
+ let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+
+ if (data && data[0]) {
+ extendData = {...extendData, ...data[0]}
}
return (
- <div className="custom-data-card-box" style={config.style}>
+ <div className="custom-data-card-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
{data ? <div className="ant-spin-blur"></div> : null}
<Spin />
</div> : null
}
- <NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
+ <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
{config.action && config.action.length > 0 ?
<MainAction
BID={BID}
@@ -774,10 +800,9 @@
<div className={`data-zoom ${config.wrap.wrapClass}`}>
{switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
<Row className={'card-row-list ' + config.wrap.layout}>
- {offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null}
{precards.map((item, index) => (
<Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}}/>
+ <CardItem card={item} cards={config} data={extendData}/>
</Col>
))}
{data && data.map((item, index) => {
@@ -798,14 +823,15 @@
})}
{nextcards.map((item, index) => (
<Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={{$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}}/>
+ <CardItem card={item} cards={config} data={extendData}/>
</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}
</div>
- {config.wrap.pagestyle !== 'switch' && 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 === '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}
</div>
)
}
--
Gitblit v1.8.0