From 53b9fb93d0376eb02bb996935f1720b4e95cd897 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 十月 2022 14:41:06 +0800
Subject: [PATCH] 2022-10-12
---
src/tabviews/custom/components/table/normal-table/index.jsx | 145 ++++++++++++++++++++++++++++--------------------
1 files changed, 84 insertions(+), 61 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 72585ec..8f7ea2a 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -1,6 +1,5 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
import { notification, Collapse } from 'antd'
@@ -9,6 +8,7 @@
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
+import TimerTask from '@/utils/timer-task.js'
import './index.scss'
// 閫氱敤缁勪欢
@@ -21,21 +21,18 @@
class NormalTable extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
BID: '', // 涓婄骇ID
BData: '', // 涓婄骇缁勪欢琛屾暟鎹�
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
- searchlist: null, // 鎼滅储鏉′欢
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
+ arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -53,11 +50,23 @@
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
*/
UNSAFE_componentWillMount () {
- const { data, initdata, BID, BData } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
let _data = null
let _sync = _config.setting.sync === 'true'
+
+ 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 || ''
+ }
if (_config.wrap.controlField) {
if (_config.wrap.controlVal) {
@@ -67,10 +76,12 @@
}
}
- let setting = {..._config.setting, ..._config.wrap, style: {}}
+ let setting = {..._config.setting, ..._config.wrap}
if (setting.selected !== 'always' && setting.selected !== 'init') {
setting.selected = 'false'
+ } else {
+ setting.orisel = true
}
if (_config.setting.sync === 'true' && data) {
@@ -110,14 +121,15 @@
}
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
_config.cols.forEach(column => {
if (column.type === 'custom') {
column.elements = column.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
@@ -126,12 +138,12 @@
}
})
- if (setting.color) {
- setting.style.color = setting.color
- }
- if (setting.fontSize) {
- setting.style.fontSize = setting.fontSize
- }
+ // if (setting.color) {
+ // setting.style.color = setting.color
+ // }
+ // if (setting.fontSize) {
+ // setting.style.fontSize = setting.fontSize
+ // }
if (_config.wrap.collapse === 'true') {
_config.wrap.title = _config.wrap.title || ' '
@@ -148,15 +160,16 @@
data: _data,
config: _config,
setting: setting,
- searchlist: _config.search,
actions: _config.action,
columns: _config.cols,
arr_field: _config.columns.map(col => col.field).join(','),
search: Utils.initMainSearch(_config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
}, () => {
if (_config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadmaindata()
- this.getStatFieldsValue()
+ setTimeout(() => {
+ this.loadmaindata()
+ this.getStatFieldsValue()
+ }, _config.setting.delay || 0)
} else if (_config.setting.onload === 'true') {
this.getStatFieldsValue()
}
@@ -168,7 +181,7 @@
* @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
- async loadmaindata (reset, repage) {
+ async loadmaindata (reset, repage, id, type) {
const { mainSearch } = this.props
const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
@@ -178,6 +191,7 @@
selectedData: [],
total: 0
})
+
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
if (setting.$hasSyncModule) {
@@ -201,18 +215,20 @@
return
}
- this.setState({
- loading: true
- })
+ if (type !== 'timer') {
+ this.setState({
+ loading: true
+ })
+ }
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
- if (setting.selected !== 'false' && result.data && result.data.length > 0) {
+ if ((setting.selected !== 'false' || (setting.orisel && id)) && result.data && result.data.length > 0) {
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id)
}, 200)
if (setting.selected === 'init') {
this.setState({setting: {...setting, selected: 'false'}})
@@ -256,6 +272,7 @@
this.setState({
loading: false
})
+ this.timer && this.timer.stop()
notification.error({
top: 92,
message: result.message,
@@ -286,7 +303,7 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, this.props.menuType, id)
+ let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -317,6 +334,8 @@
} catch (e) {
console.warn('鏁版嵁鏌ヨ閿欒')
}
+
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
}
this.setState({
@@ -367,7 +386,7 @@
}
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID, this.props.menuType)
+ let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID)
Api.genericInterface(param).then(res => {
if (res.status) {
@@ -453,16 +472,16 @@
/**
* @description 琛ㄦ牸鍒锋柊
*/
- reloadtable = (btn) => {
+ reloadtable = (btn, id) => {
if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
}, () => {
- this.loadmaindata(true, 'true')
+ this.loadmaindata(true, 'true', id)
this.getStatFieldsValue()
})
} else {
- this.loadmaindata(true, 'false')
+ this.loadmaindata(true, 'false', id)
this.getStatFieldsValue()
}
}
@@ -470,7 +489,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, orderBy, search, setting} = this.state
@@ -486,7 +505,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: searches,
@@ -498,7 +517,6 @@
const { config } = this.state
if (config.uuid !== menuId) return
- if (id === 'empty') return
if (!id) {
this.reloadtable()
@@ -534,20 +552,19 @@
if (config.uuid !== menuId) return
- if (position === 'line' && lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ if (position === 'line') {
+ if (lines && lines.length === 1) {
+ this.loadmainLinedata(lines[0].$$uuid)
+ } else {
+ this.reloadtable(btn, id)
+ }
+ } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
- this.reloadtable(btn) // 鏁版嵁鍒锋柊
+ this.reloadtable(btn, id)
}
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
- }
-
- if (position === 'mainline' && config.setting.supModule) { // 涓昏〃琛屽埛鏂�
- MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
- } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊
- config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -599,10 +616,24 @@
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.timer) {
+ this.timer = new TimerTask()
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadmaindata(true, 'true', '', 'timer')
+ this.getStatFieldsValue()
+ })
+ })
+ }
}
/**
@@ -616,10 +647,12 @@
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ this.timer && this.timer.stop()
}
render() {
- const { BID, setting, searchlist, actions, config, columns, selectedData, BData, data } = this.state
+ const { BID, setting, actions, config, columns, selectedData, BData, data } = this.state
let style = {...config.style}
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) {
@@ -627,11 +660,11 @@
}
return (
- <div className="custom-normal-table" style={style}>
+ <div className="custom-normal-table" id={'anchor' + config.uuid} style={style}>
{config.wrap.collapse === 'true' ? <Collapse bordered={false} defaultActiveKey="1" expandIconPosition="right">
<Panel forceRender={true} header={<NormalHeader config={config}/>} key="1">
- {searchlist && searchlist.length ?
- <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ {config.search && config.search.length ?
+ <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
<MainAction
BID={BID}
@@ -659,8 +692,8 @@
</Panel>
</Collapse> : <>
<NormalHeader config={config}/>
- {searchlist && searchlist.length ?
- <MainSearch BID={BID} setting={config.wrap} searchlist={searchlist} menuType={this.props.menuType} refreshdata={this.refreshbysearch}/> : null
+ {config.search && config.search.length ?
+ <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
<MainAction
BID={BID}
@@ -691,14 +724,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menuType: state.editLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
+export default NormalTable
\ No newline at end of file
--
Gitblit v1.8.0