From 2a3cc4e6cecfc6dab8b60adf93f7fde898ddc939 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 七月 2023 16:36:23 +0800
Subject: [PATCH] 2023-07-25
---
src/tabviews/custom/components/card/data-card/index.jsx | 555 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 346 insertions(+), 209 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 23d958a..08b1383 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -5,7 +5,6 @@
import { DownOutlined } from '@ant-design/icons'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import preImg from '@/assets/img/prev.png'
import nextImg from '@/assets/img/next.png'
@@ -15,14 +14,13 @@
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'))
class DataCard extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -31,11 +29,13 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
search: null, // 鎼滅储鏉′欢
pageIndex: 1, // 椤电爜
+ pageSize: 10,
+ orderBy: '',
+ pageOptions: [],
activeKey: '', // 閫変腑鍗�
selectKeys: [], // 澶氶�夋椂閫変腑鍗＄墖
selectedData: [], // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
loading: false, // 鏁版嵁鍔犺浇鐘舵��
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
card: null, // 鍗＄墖璁剧疆
data: null, // 鏁版嵁
total: null,
@@ -49,9 +49,9 @@
loaded = false
UNSAFE_componentWillMount () {
- const { data, initdata } = this.props
- let _config = fromJS(this.props.config).toJS()
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let BID = ''
let BData = ''
@@ -76,6 +76,9 @@
}
}
+ _config.$extend = false
+ _config.$empty = true
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -88,29 +91,30 @@
}
}
+ if (item.style.clear === 'left') {
+ item.wStyle = {clear: 'left'}
+ } else if (item.style.clear === 'right') {
+ item.wStyle = {float: 'right'}
+ }
+
+ delete item.style.clear
+
if (item.$cardType !== 'extendCard') {
_card = item
} else if (!_card) {
+ _config.$extend = true
+ if (item.setting.width !== 24) {
+ _config.$empty = false
+ }
precards.push(item)
} else {
+ _config.$extend = true
+ _config.$empty = false
nextcards.push(item)
}
})
_config.subcards = null
-
- let _cols = new Map()
-
- let _data = null
- let _sync = _config.setting.sync === 'true'
-
- if (_sync && data) {
- _data = data[_config.dataName] || []
- _sync = false
- } else if (_sync && initdata) {
- _data = initdata || []
- _sync = false
- }
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
@@ -118,50 +122,6 @@
} else {
_config.wrap.selected = 'false'
}
-
- if (_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
- })
-
- if (selected !== 'false') {
- setTimeout(() => {
- this.checkTopLine()
- }, 200)
- if (selected === 'init') {
- selected = 'false'
- }
- }
- }
-
- _config.columns.forEach(item => {
- if (item.type !== 'number') return
- _cols.set(item.field, item)
- })
-
- _card.elements = _card.elements.map(item => {
- if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
- item.decimal = _cols.get(item.field).decimal || 0
- }
- return item
- })
- _card.backElements = _card.backElements.map(item => {
- if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
- item.decimal = _cols.get(item.field).decimal || 0
- }
- return item
- })
let supComs = null
if (_config.wrap.supType === 'multi') {
@@ -175,27 +135,68 @@
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${_config.wrap.scale}`
- 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)
+ }
+ }
+
+ let _data = null
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
+
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
+ }
+
+ _config.setting.sync = 'false'
+
+ _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
+ })
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
+ }
+ }
this.setState({
+ pageSize: _config.setting.pageSize || 10,
+ pageOptions,
supComs,
selected,
precards,
nextcards,
- sync: _sync,
data: _data,
BID: BID || '',
BData: BData || '',
config: _config,
card: _card,
- search: Utils.initMainSearch(_config.search),
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ search: _config.$searches,
+ arr_field: _config.columns.map(col => col.field).join(',')
})
}
@@ -204,9 +205,18 @@
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
+ MKEmitter.addListener('refreshLineData', this.refreshLineData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
if (config.timer) {
this.timer = new TimerTask()
@@ -219,73 +229,11 @@
})
}
- if (config.$cache && !this.loaded) {
- Api.getLCacheConfig(config.uuid).then(res => {
- if (!res || this.loaded) return
- let _data = res.map((item, index) => {
- item.key = index
- item.$$uuid = item[config.setting.primaryKey] || ''
- item.$Index = index + 1 + ''
-
- if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
- item.$disabled = true
- }
- }
-
- return item
- })
-
- this.setState({data: _data})
- })
- }
+ this.initExec()
}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
- }
-
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config, BID, BData, selected } = this.state
-
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
- _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
- })
-
- if (selected !== 'false') {
- setTimeout(() => {
- this.checkTopLine()
- }, 200)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
- }
- }
-
- this.loaded = true
-
- this.setState({sync: false, data: _data})
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
- }
}
componentWillUnmount () {
@@ -294,11 +242,134 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('mkCheckAll', this.mkCheckAll)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+ MKEmitter.removeListener('refreshLineData', this.refreshLineData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
this.timer && this.timer.stop()
+ }
+
+ initExec = () => {
+ const { config } = this.state
+
+ this.loaded && this.prevCheck()
+
+ if (config.$cache) {
+ if (config.$time && !config.setting.laypage) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ if (!res && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+
+ if (!res || this.loaded) return
+
+ let _data = res.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+ item.$disabled = true
+ }
+ }
+
+ return item
+ })
+
+ this.setState({data: _data})
+ })
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0).then(res => {
+ if (!res || this.loaded) return
+
+ let _data = res.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$Index = index + 1 + ''
+
+ if (config.wrap.controlField) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
+ item.$disabled = true
+ }
+ }
+
+ return item
+ })
+
+ this.setState({data: _data})
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ }
+ }
+
+ transferSyncData = (syncId) => {
+ const { config } = this.state
+
+ if (config.$syncId !== syncId) return
+
+ const { BID, BData } = this.state
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ }
+
+ _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
+ })
+
+ this.prevCheck()
+
+ this.loaded = true
+
+ this.setState({data: _data})
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({pageIndex: 1}, () => {
+ this.loadData()
+ })
}
/**
@@ -362,9 +433,36 @@
this.loadData(id)
}
}
+ }
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
+ refreshLineData = (menuId, btn, uuid, count) => {
+ const { config, data } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let _data = fromJS(data).toJS().map(item => {
+ if (item.$$uuid === uuid) {
+ item[btn.field] = count
+ }
+ return item
+ })
+
+ this.setState({
+ data: _data
+ })
+ }
+
+ prevCheck = (id) => {
+ const { selected } = this.state
+
+ if (selected === 'false' && !id) return
+
+ setTimeout(() => {
+ this.checkTopLine(id)
+ }, 200)
+
+ if (selected === 'init') {
+ this.setState({selected: 'false'})
}
}
@@ -492,6 +590,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) {
@@ -583,32 +682,31 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
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
- let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ let searches = fromJS(search).toJS()
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
callback({
arr_field: arr_field,
- orderBy: config.setting.order || '',
+ orderBy: orderBy ||config.setting.order || '',
search: searches,
menuName: config.name
})
}
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
@@ -624,12 +722,7 @@
})
if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
- setTimeout(() => {
- this.checkTopLine(id)
- }, 200)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
+ this.prevCheck(id)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
if (config.setting.$hasSyncModule) {
@@ -640,17 +733,17 @@
}
let searches = fromJS(search).toJS()
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
@@ -660,28 +753,23 @@
})
}
- 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
- if (config.$cache && pageIndex === 1) {
- Api.writeCacheConfig(config.uuid, result.data || '')
+ if (config.$cache && pageIndex === 1 && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || [])
}
if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
- setTimeout(() => {
- this.checkTopLine(id)
- }, 200)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
+ this.prevCheck(id)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
if (config.setting.$hasSyncModule) {
@@ -701,7 +789,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
}
}
@@ -716,7 +804,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
}
}
@@ -732,16 +820,38 @@
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()
+ }
+ }
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
+
+ if (!result.message) return
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
})
- } else {
+ } else if (result.ErrCode !== '-2') {
notification.error({
top: 92,
message: result.message,
@@ -755,16 +865,16 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
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) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
@@ -772,8 +882,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) {
@@ -818,9 +928,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
}
@@ -844,8 +954,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
@@ -868,6 +978,15 @@
this.setState({
search: list,
pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ }
+
+ pageSizeChange = (current, size) => {
+ this.setState({
+ pageIndex: current,
+ pageSize: size
}, () => {
this.loadData()
})
@@ -918,26 +1037,42 @@
}
}
+ 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 = ''
- if (config.wrap.selStyle.indexOf('check') > -1) {
+ if (config.wrap.selStyle && config.wrap.selStyle.indexOf('check') > -1) {
if (selectedData.length > 0) {
checkAll = selectedData.length < data.length ? ' half' : ' whole'
}
@@ -966,10 +1101,12 @@
{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}>
{precards.map((item, index) => (
- <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={extendData}>
+ <Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
+ {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) => {
@@ -988,7 +1125,7 @@
}
return (
- <Col className={className} key={index} span={card.setting.width}>
+ <Col className={className} key={index} style={card.wStyle} span={card.setting.width}>
<CardItem card={card} cards={config} data={item} onClick={() => {this.changeCard(index, item)}}>
<span className="circle-select"></span>
</CardItem>
@@ -996,23 +1133,23 @@
)
})}
{nextcards.map((item, index) => (
- <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={extendData}>
+ <Col key={'next' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
+ {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}
</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.$empty && (!data || data.length === 0) ? <Empty description={false}/> : 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>
)
}
}
-
-
export default DataCard
\ No newline at end of file
--
Gitblit v1.8.0