From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01
---
src/tabviews/custom/components/card/data-card/index.jsx | 134 ++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 43 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 90e0085..5ec9396 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { connect } from 'react-redux'
-import { Spin, Empty, notification, Row, Col, Pagination } from 'antd'
+import { Spin, Empty, notification, message, Row, Col, Pagination } from 'antd'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -40,14 +40,20 @@
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
card: null, // 鍗＄墖璁剧疆
data: null, // 鏁版嵁
- total: null
+ total: null,
+ precards: [],
+ nextcards: [],
}
UNSAFE_componentWillMount () {
const { data, initdata, BID } = this.props
let _config = fromJS(this.props.config).toJS()
- _config.subcards = _config.subcards.map(item => {
+ let _card = null
+ let precards = []
+ let nextcards = []
+
+ _config.subcards.forEach(item => {
item.setting.$click = ''
if (item.setting.click === 'button') {
if (item.elements.filter(ele => ele.eleType === 'button').length < 2) {
@@ -55,10 +61,18 @@
}
item.setting.click = ''
}
- return item
+
+ if (item.$cardType !== 'extendCard') {
+ _card = item
+ } else if (!_card) {
+ precards.push(item)
+ } else {
+ nextcards.push(item)
+ }
})
- let _card = _config.subcards.shift()
+ _config.subcards = null
+
let _cols = new Map()
let _data = null
@@ -74,11 +88,16 @@
if (_config.wrap.cardFloat && _config.wrap.cardFloat !== 'left') {
let _width = 0
- _config.subcards.forEach(card => {
+ precards.forEach(card => {
+ _width += card.setting.width
+ })
+ nextcards.forEach(card => {
_width += card.setting.width
})
_config.$offset = _width
+ } else {
+ _config.wrap.cardFloat = null
}
if (_data) {
@@ -109,6 +128,8 @@
})
this.setState({
+ precards,
+ nextcards,
sync: _sync,
data: _data,
BID: BID || '',
@@ -125,6 +146,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -152,12 +174,10 @@
})
this.setState({sync: false, data: _data})
- } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- if (config.setting.syncRefresh === 'true') {
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
- }
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({pageIndex: 1}, () => {
+ this.loadData()
+ })
}
}
@@ -166,6 +186,7 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('mkCheckAll', this.mkCheckAll)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
@@ -204,17 +225,32 @@
}
}
- reloadData = (btn) => {
- if (!btn || btn.resetPageIndex !== 'false') {
+ mkCheckAll = (menuId, checked) => {
+ const { config, data } = this.state
+
+ if (config.uuid !== menuId) return
+
+ if (checked) {
this.setState({
- pageIndex: 1
- }, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
+ activeKey: '',
+ selectKeys: data.map((item, index) => index),
+ selectedData: data
})
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+ MKEmitter.emit('syncBalconyData', config.uuid, data, data.length > 0)
+ if (data.length === 0) {
+ message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+ }
} else {
- this.loadmaindata(true, 'false')
- this.getStatFieldsValue()
+ this.setState({
+ activeKey: '',
+ selectKeys: [],
+ selectedData: []
+ })
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+ MKEmitter.emit('syncBalconyData', config.uuid, [], false)
}
}
@@ -252,7 +288,7 @@
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key.toLowerCase())
mainSearch.forEach(item => {
if (!keys.includes(item.key.toLowerCase())) {
@@ -271,7 +307,7 @@
async loadData () {
const { mainSearch, menuType } = this.props
- const { config, arr_field, pageIndex, search, BID } = this.state
+ const { config, arr_field, pageIndex, search, BID, BData } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -283,11 +319,15 @@
total: 0,
loading: false
})
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+ }
return
}
let searches = fromJS(search).toJS()
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key.toLowerCase())
mainSearch.forEach(item => {
if (!keys.includes(item.key.toLowerCase())) {
@@ -296,11 +336,8 @@
})
}
- let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+ let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
- this.setState({
- loading: false
- })
return
}
@@ -326,12 +363,17 @@
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
item.$$BID = BID || ''
+ item.$$BData = BData || ''
item.$Index = index + start + ''
return item
}),
total: result.total,
loading: false
})
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+ }
} else {
this.setState({
loading: false
@@ -349,10 +391,10 @@
*/
async loadLinedata (id) {
const { mainSearch, menuType } = this.props
- const { config, arr_field, pageIndex, search, BID } = this.state
+ const { config, arr_field, pageIndex, search, BID, BData } = this.state
let searches = fromJS(search).toJS()
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key.toLowerCase())
mainSearch.forEach(item => {
if (!keys.includes(item.key.toLowerCase())) {
@@ -368,10 +410,6 @@
let _orderBy = config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, menuType, id)
- if (param.func === 'sPC_Get_TableData') {
- param.menuname = config.name || ''
- }
-
let result = await Api.genericInterface(param)
if (result.status) {
let data = fromJS(this.state.data).toJS()
@@ -384,13 +422,14 @@
_data.key = item.key
_data.$$uuid = _data[config.setting.primaryKey] || ''
_data.$$BID = BID || ''
+ item.$$BData = BData || ''
_data.$Index = item.$Index
return _data
} else {
return item
}
})
- } catch {
+ } catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
}
@@ -454,7 +493,7 @@
}
changeCard = (index, item) => {
- const { config, selectKeys, selectedData, activeKey } = this.state
+ const { config, selectKeys, selectedData, activeKey, data } = this.state
this.openView(item)
@@ -494,6 +533,9 @@
})
MKEmitter.emit('resetSelectLine', config.uuid, (_item ? _item.$$uuid : ''), _item)
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, _selectedData, data.length === _selectedData.length)
+ }
}
openView = (item) => {
@@ -526,7 +568,7 @@
newtab.param.$BID = item.$$uuid
}
- if (['linkage_navigation', 'linkage'].includes(window.GLOB.navBar)) {
+ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
this.props.modifyTabview([newtab])
} else {
let tabs = this.props.tabviews.filter((tab, i) => {
@@ -556,7 +598,7 @@
_param.User_Name = sessionStorage.getItem('User_Name')
_param.param = { BID: item.$$uuid }
src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
- } catch {
+ } catch (e) {
console.warn('鑿滃崟鍙傛暟瑙ｆ瀽閿欒锛�')
}
} else if (card.setting.joint === 'true') {
@@ -574,7 +616,7 @@
}
render() {
- const { config, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
+ const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys } = this.state
let _total = 0
let switchable = false
@@ -584,7 +626,7 @@
}
let offset = 0
- if (config.wrap.cardFloat && config.wrap.cardFloat !== 'left') {
+ 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
@@ -616,19 +658,25 @@
<div className={`data-zoom ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>
{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">
+ {offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null}
+ {precards.map((item, index) => (
+ <Col key={'pre' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
+ <CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
+ </Col>
+ ))}
{data && data.map((item, index) => (
- <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.$click ? ' pointer' : '') + card.setting.$click} key={index} span={card.setting.width} offset={!index ? offset : 0} onClick={() => {this.changeCard(index, item)}}>
+ <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.$click ? ' pointer' : '') + card.setting.$click} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}>
<CardItem card={card} cards={config} data={item}/>
</Col>
))}
- {config.subcards.map((item, index) => (
- <Col key={'mk' + index} className={item.setting.$click} span={item.setting.width || 6} offset={(!data || data.length === 0) ? offset : 0}>
+ {nextcards.map((item, index) => (
+ <Col key={'next' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
<CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
</Col>
))}
</Row>
{switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
- {config.subcards.length === 0 && (!data || data.length === 0) ? <Empty description={false}/> : 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}
</div>
--
Gitblit v1.8.0