From cc1a76df575c18f0d0ee96e8658461efdce3a918 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:01 +0800
Subject: [PATCH] 2023-01-17
---
src/tabviews/custom/components/table/normal-table/index.jsx | 169 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 144 insertions(+), 25 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index cf98e01..0ffafaa 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -1,13 +1,14 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { notification, Collapse } from 'antd'
+import { notification, Collapse, Modal } from 'antd'
import Api from '@/api'
import Utils from '@/utils/utils.js'
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'
// 閫氱敤缁勪欢
@@ -44,6 +45,8 @@
statFValue: [] // 鍚堣鍊�
}
+ loaded = false
+
/**
* @description 鍒濆鍖栧鐞�
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
@@ -77,21 +80,22 @@
let setting = {..._config.setting, ..._config.wrap}
- if (setting.selected !== 'always' && setting.selected !== 'init') {
+ if (setting.selected !== 'always' && setting.selected !== 'init' && setting.selected !== 'sign') {
setting.selected = 'false'
} else {
setting.orisel = true
}
- if (_config.setting.sync === 'true' && data) {
+ if (_sync && data) {
_data = data[_config.dataName] || []
_sync = false
- } else if (_config.setting.sync === 'true' && initdata) {
+ } else if (_sync && initdata) {
_data = initdata || []
_sync = false
}
if (_data) {
+ this.loaded = true
_data = _data.map((item, index) => {
item.key = index
item.$$uuid = item[_config.setting.primaryKey] || ''
@@ -99,6 +103,14 @@
item.$$BID = BID || ''
item.$$BData = BData || ''
item.$Index = index + 1 + ''
+
+ if (_config.absFields) {
+ _config.absFields.forEach(f => {
+ if (!isNaN(item[f])) {
+ item[f] = Math.abs(item[f])
+ }
+ })
+ }
if (setting.controlField) {
if (setting.controlVal.includes(item[setting.controlField])) {
@@ -111,7 +123,7 @@
if (setting.selected !== 'false' && _data && _data.length > 0) {
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', _config.uuid)
+ MKEmitter.emit('mkCheckTopLine', _config.uuid, '', setting.selected)
}, 200)
if (setting.selected === 'init') {
setting.selected = 'false'
@@ -180,7 +192,7 @@
* @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
- async loadmaindata (reset, repage, id) {
+ async loadmaindata (reset, repage, id, type) {
const { mainSearch } = this.props
const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
@@ -192,10 +204,12 @@
})
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
- reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+ reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
if (setting.$hasSyncModule) {
MKEmitter.emit('syncBalconyData', config.uuid, [], false)
}
+
+ this.loaded = true
return
}
@@ -214,18 +228,42 @@
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)
let result = await Api.genericInterface(param)
if (result.status) {
+ this.loaded = true
+ if (config.$cache && pageIndex === 1) {
+ Api.writeCacheConfig(config.uuid, result.data || '')
+ }
+
+ if (repage === 'false' && result.data && result.data.length === 0 && result.total > 0 && pageIndex > 1) {
+ let _pageIndex = Math.ceil(result.total / pageSize)
+
+ if (_pageIndex < pageIndex) {
+ MKEmitter.emit('resetTable', config.uuid, 'repage', _pageIndex)
+ this.setState({
+ pageIndex: _pageIndex,
+ data: [],
+ selectedData: [],
+ total: result.total
+ }, () => {
+ this.loadmaindata()
+ })
+ return
+ }
+ }
+
if ((setting.selected !== 'false' || (setting.orisel && id)) && result.data && result.data.length > 0) {
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid, id)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected)
}, 200)
if (setting.selected === 'init') {
this.setState({setting: {...setting, selected: 'false'}})
@@ -253,6 +291,14 @@
item.$$BData = BData || ''
item.$Index = start + index + ''
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(item[f])) {
+ item[f] = Math.abs(item[f])
+ }
+ })
+ }
+
if (setting.controlField) {
if (setting.controlVal.includes(item[setting.controlField])) {
item.$disabled = true
@@ -269,11 +315,19 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+ this.timer && this.timer.stop()
+
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -310,6 +364,15 @@
_data.$$uuid = _data[setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
+
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(_data[f])) {
+ _data[f] = Math.abs(_data[f])
+ }
+ })
+ }
+
try {
data = data.map(item => {
if (item.$$uuid === _data.$$uuid) {
@@ -485,7 +548,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, orderBy, search, setting} = this.state
@@ -501,7 +564,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: orderBy || setting.order,
search: searches,
@@ -525,6 +588,7 @@
const { setting } = this.state
if (!setting.supModule || setting.supModule !== MenuID) return
+
if (id !== this.state.BID || id !== '') {
this.setState({
pageIndex: 1,
@@ -580,6 +644,14 @@
item.$$BData = BData || ''
item.$Index = index + 1 + ''
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(item[f])) {
+ item[f] = Math.abs(item[f])
+ }
+ })
+ }
+
if (setting.controlField) {
if (setting.controlVal.includes(item[setting.controlField])) {
item.$disabled = true
@@ -591,7 +663,7 @@
if (setting.selected !== 'false' && _data && _data.length > 0) {
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, '', setting.selected)
}, 200)
if (setting.selected === 'init') {
this.setState({setting: {...setting, selected: 'false'}})
@@ -599,8 +671,10 @@
}
}
+ this.loaded = true
+
this.setState({sync: false, data: _data})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({pageIndex: 1}, () => {
this.reloadtable()
})
@@ -612,10 +686,53 @@
}
componentDidMount () {
+ const { config, setting } = 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()
+ })
+ })
+ }
+
+ if (config.$cache && !this.loaded) {
+ Api.getLCacheConfig(config.uuid).then(res => {
+ if (!res || this.loaded) return
+
+ this.setState({data: res.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$$key = '' + item.key + item.$$uuid
+ item.$Index = index + 1 + ''
+
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(item[f])) {
+ item[f] = Math.abs(item[f])
+ }
+ })
+ }
+
+ if (setting.controlField) {
+ if (setting.controlVal.includes(item[setting.controlField])) {
+ item.$disabled = true
+ }
+ }
+
+ return item
+ })})
+ })
+ }
}
/**
@@ -629,6 +746,8 @@
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ this.timer && this.timer.stop()
}
render() {
@@ -646,15 +765,15 @@
{config.search && config.search.length ?
<MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
- <MainAction
+ {actions.length > 0 ? <MainAction
BID={BID}
setting={setting}
actions={actions}
BData={BData}
columns={config.columns}
selectedData={selectedData}
- />
- <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
+ /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
+ <div className="main-table-box">
<MainTable
setting={setting}
columns={columns}
@@ -675,14 +794,14 @@
{config.search && config.search.length ?
<MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
- <MainAction
+ {actions.length > 0 ? <MainAction
BID={BID}
setting={setting}
actions={actions}
BData={BData}
columns={config.columns}
selectedData={selectedData}
- />
+ /> : <div className="mk-action-space" style={{height: '25px'}}></div>}
<div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
<MainTable
setting={setting}
--
Gitblit v1.8.0