From a5f41b5d98f23d618dc7519c605ce943b114dfd5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 13 十一月 2023 18:07:51 +0800
Subject: [PATCH] 2023-11-13
---
src/tabviews/custom/components/table/normal-table/index.jsx | 919 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 552 insertions(+), 367 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 62cefcd..a1492a3 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -1,13 +1,13 @@
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'
// 閫氱敤缁勪欢
@@ -20,10 +20,7 @@
class NormalTable extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
+ config: PropTypes.object
}
state = {
@@ -32,7 +29,6 @@
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -42,19 +38,32 @@
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
- statFValue: [] // 鍚堣鍊�
+ statFValue: [], // 鍚堣鍊�
+ allSearch: null
}
+
+ loaded = false
/**
* @description 鍒濆鍖栧鐞�
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
*/
UNSAFE_componentWillMount () {
- const { data, initdata, BID, BData } = this.props
- let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
+ const { config } = this.props
+
+ let _config = fromJS(config).toJS()
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) {
@@ -66,102 +75,286 @@
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) {
- _data = data[_config.dataName] || []
- _sync = false
- } else if (_config.setting.sync === 'true' && initdata) {
- _data = initdata || []
- _sync = false
- }
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
- if (_data) {
- _data = _data.map((item, index) => {
- item.key = index
- item.$$uuid = item[_config.setting.primaryKey] || ''
- item.$$key = '' + item.key + item.$$uuid
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
-
- if (setting.controlField) {
- if (setting.controlVal.includes(item[setting.controlField])) {
- item.$disabled = true
- }
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ _data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
}
-
- return item
- })
-
- if (setting.selected !== 'false' && _data && _data.length > 0) {
- setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', _config.uuid)
- }, 200)
- if (setting.selected === 'init') {
- setting.selected = 'false'
- }
- }
- }
-
- _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.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
- item.decimal = _cols.get(item.field).decimal || 0
+
+ _config.setting.sync = 'false'
+
+ _data = _data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[_config.setting.primaryKey] || ''
+ item.$$key = '' + item.key + item.$$uuid
+ 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] + '')) {
+ item.$disabled = true
+ }
+ }
+
return item
})
- } else if (column.type === 'action') {
- column.operations = column.elements
+
+ if (setting.selected !== 'false' && _data.length > 0) {
+ setTimeout(() => {
+ MKEmitter.emit('mkCheckTopLine', _config.uuid, '', setting.selected)
+ }, 200)
+ if (setting.selected === 'init') {
+ setting.selected = 'false'
+ }
+ }
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
}
- })
-
- // 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 || ' '
}
_config.style = _config.style || {}
+ let allSearch = null
+ if (_config.colsCtrls && _config.colsCtrls.length > 0) {
+ allSearch = [{key: 'BID', value: BID || ''}]
+ allSearch.push(..._config.$searches)
+ if (_config.setting.useMSearch) {
+ let mainSearch = window.GLOB.SearchBox.get(_config.$searchId) || []
+ allSearch.push(...mainSearch)
+ }
+ } else {
+ _config.colsCtrls = null
+ }
+
this.setState({
pageSize: setting.pageSize || 10,
BID: BID || '',
BData: BData || '',
title: _config.wrap.title,
- sync: _sync,
data: _data,
config: _config,
setting: setting,
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') {
- setTimeout(() => {
- this.loadmaindata()
- this.getStatFieldsValue()
- }, _config.setting.delay || 0)
- } else if (_config.setting.onload === 'true') {
- this.getStatFieldsValue()
- }
+ search: _config.$searches,
+ allSearch
})
+ }
+
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ componentDidMount () {
+ const { config } = this.state
+
+ MKEmitter.addListener('reloadData', this.reloadData)
+ 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()
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadmaindata(true, 'true', '', 'timer')
+ })
+ })
+ }
+
+ this.initExec()
+ }
+
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+ */
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('reloadData', this.reloadData)
+ 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, setting, BID } = this.state
+
+ if (config.$cache) {
+ if (config.$time && !setting.laypage) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadmaindata(false, 'true', '', 'init')
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ this.setState({data: res.data.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
+ })})
+ })
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ this.setState({data: res.data.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
+ })})
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadmaindata(false, 'true', '', 'init')
+ }, config.setting.delay || 0)
+ }
+ }
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadmaindata()
+ }, config.setting.delay || 0)
+ }
+ }
+
+ transferSyncData = (syncId) => {
+ const { config } = this.state
+
+ if (config.$syncId !== syncId) return
+
+ const { setting, BID, BData } = this.state
+
+ let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+ if (config.$cache) {
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
+ }
+
+ _data = _data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[config.setting.primaryKey] || ''
+ item.$$key = '' + item.key + item.$$uuid
+ 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] + '')) {
+ item.$disabled = true
+ }
+ }
+
+ return item
+ })
+
+ if (setting.selected !== 'false' && _data.length > 0) {
+ setTimeout(() => {
+ MKEmitter.emit('mkCheckTopLine', config.uuid, '', setting.selected)
+ }, 200)
+ if (setting.selected === 'init') {
+ this.setState({setting: {...setting, selected: 'false'}})
+ }
+ }
+
+ this.loaded = true
+
+ this.setState({data: _data})
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
}
/**
@@ -169,9 +362,8 @@
* @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
* @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
- async loadmaindata (reset, repage, id) {
- const { mainSearch } = this.props
- const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+ async loadmaindata (reset, repage, id, type) {
+ const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
if (setting.supModule && !BID && setting.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
@@ -181,40 +373,66 @@
})
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
}
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
}
- 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 param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
+ this.loaded = true
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
+ }
+
+ 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'}})
@@ -233,53 +451,110 @@
start = pageSize * (pageIndex - 1) + 1
}
- this.setState({
- data: result.data.map((item, index) => {
- item.key = index
- item.$$uuid = item[setting.primaryKey] || ''
- item.$$key = '' + item.key + item.$$uuid
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = start + index + ''
+ let data = result.data.map((item, index) => {
+ item.key = index
+ item.$$uuid = item[setting.primaryKey] || ''
+ item.$$key = '' + item.key + item.$$uuid
+ item.$$BID = BID || ''
+ item.$$BData = BData || ''
+ item.$Index = start + index + ''
- if (setting.controlField) {
- if (setting.controlVal.includes(item[setting.controlField])) {
- item.$disabled = true
+ 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
- }),
+ }
+
+ return item
+ })
+
+ let total = result.total || 0
+ if (config.setting.custompage && data.length) {
+ total = data[data.length - 1].mk_total || 0
+ }
+
+ let allSearch = null
+ if (config.colsCtrls) {
+ allSearch = [{key: 'BID', value: BID || ''}]
+ allSearch.push(...searches)
+ }
+
+ this.setState({
+ data: data,
selectedData: [],
- total: result.total,
+ allSearch: allSearch,
+ total: 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
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+ this.timer && this.timer.stop()
+
+ if (!result.message) return
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else if (result.ErrCode !== '-2') {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadmainLinedata (id) {
- const { mainSearch } = this.props
- const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+ async loadLinedata (id, position) {
+ const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+
+ if (config.forbidLine) {
+ this.reloadtable()
+ return
+ }
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)
})
}
@@ -288,46 +563,97 @@
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
+ let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
+ if (position === 'line_grid' && (!result.data || !result.data[0])) {
+ this.loadmaindata(true, 'false')
+ return
+ }
+
let data = fromJS(this.state.data).toJS()
let selectedData = fromJS(this.state.selectedData).toJS()
+
if (result.data && result.data[0]) {
- let _data = result.data[0] || {}
+ let _data = result.data[0]
_data.$$uuid = _data[setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
- try {
- data = data.map(item => {
- if (item.$$uuid === _data.$$uuid) {
- _data.key = item.key
- _data.$$key = '' + item.key + item.$$uuid
- _data.$Index = item.$Index
- return _data
- } else {
- return item
+
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(_data[f])) {
+ _data[f] = Math.abs(_data[f])
}
})
- selectedData = selectedData.map(item => {
- if (_data.$$uuid === item.$$uuid) {
- return _data
- }
+ }
+
+ data = data.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ _data.key = item.key
+ _data.$$key = '' + item.key + item.$$uuid
+ _data.$Index = item.$Index
+ return _data
+ } else {
return item
+ }
+ })
+
+ if (!_data.$Index) {
+ this.setState({
+ loading: false
})
- } catch (e) {
- console.warn('鏁版嵁鏌ヨ閿欒')
+ return
}
- MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
- }
+ selectedData = selectedData.map(item => {
+ if (_data.$$uuid === item.$$uuid) {
+ return _data
+ }
+ return item
+ })
- this.setState({
- data,
- selectedData,
- loading: false
- })
+ if (selectedData.length && _data.$$uuid === selectedData[selectedData.length - 1].$$uuid) {
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+ }
+
+ this.setState({
+ data,
+ selectedData,
+ loading: false
+ })
+
+ if (config.setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', config.uuid, selectedData, data.length === selectedData.length)
+ }
+ } else {
+ let index = data.findIndex(item => item.$$uuid === id)
+
+ if (index === -1) {
+ this.setState({
+ loading: false
+ })
+ return
+ }
+
+ data = data.filter(item => item.$$uuid !== id)
+ data = data.map((item, i) => {
+ item.key = i
+ item.$$key = '' + item.key + item.$$uuid
+
+ return item
+ })
+
+ this.setState({
+ data: data,
+ loading: false
+ })
+
+ setTimeout(() => {
+ MKEmitter.emit('resetTable', config.uuid, 'delete', index)
+ }, 20)
+ }
} else {
this.setState({
loading: false
@@ -341,96 +667,16 @@
}
/**
- * @description 鑾峰彇鍚堣瀛楁鍊�
- */
- getStatFieldsValue = () => {
- const { mainSearch } = this.props
- const { setting, config, search, BID, orderBy } = this.state
-
- if (setting.supModule && !BID && setting.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
- this.setState({
- statFValue: []
- })
- return
- }
-
- if (config.statFields.length === 0 || setting.interType !== 'system' || !setting.dataresource) return
-
- let searches = fromJS(search).toJS()
- 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())) {
- searches.push(item)
- }
- })
- }
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
- return
- }
-
- let _orderBy = orderBy || setting.order
- let param = UtilsDM.getStatQueryDataParams(setting, config.statFields, searches, _orderBy, BID)
-
- Api.genericInterface(param).then(res => {
- if (res.status) {
- let _data = res.data[0]
- let values = []
-
- if (_data) {
- config.statFields.forEach(item => {
- if (_data[item.field] || _data[item.field] === 0) {
- let val = +_data[item.field]
- if (isNaN(val)) {
- val = 0
- }
- val = val.toFixed(item.decimal)
- values.push({label: item.label, value: val})
- }
- })
- }
- this.setState({
- statFValue: values
- })
- } else {
- this.setState({
- statFValue: []
- })
- notification.error({
- top: 92,
- message: res.message,
- duration: 10
- })
- }
- })
- }
-
- /**
* @description 鎼滅储鏉′欢鏀瑰彉鏃讹紝閲嶇疆琛ㄦ牸鏁版嵁
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- const { setting } = this.state
-
- if (setting.onload === 'false') {
- this.setState({
- pageIndex: 1,
- search: searches,
- setting: {...setting, onload: 'true'}
- }, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
- })
- } else {
- this.setState({
- pageIndex: 1,
- search: searches
- }, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
- })
- }
+ this.setState({
+ pageIndex: 1,
+ search: searches
+ }, () => {
+ this.loadmaindata(true, 'true')
+ })
}
/**
@@ -463,38 +709,34 @@
pageIndex: 1
}, () => {
this.loadmaindata(true, 'true', id)
- this.getStatFieldsValue()
})
} else {
this.loadmaindata(true, 'false', id)
- this.getStatFieldsValue()
}
}
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
- const { mainSearch } = this.props
- const { arr_field, config, orderBy, search, setting} = this.state
+ queryModuleParam = (menuId, callback) => {
+ const { config, orderBy, search, setting} = 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())
+ 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)
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
- arr_field: arr_field,
+ callback({
orderBy: orderBy || setting.order,
- search: searches,
- menuName: config.name
+ search: searches
})
}
@@ -506,7 +748,7 @@
if (!id) {
this.reloadtable()
} else {
- this.loadmainLinedata(id)
+ this.loadLinedata(id)
}
}
@@ -514,6 +756,7 @@
const { setting } = this.state
if (!setting.supModule || setting.supModule !== MenuID) return
+
if (id !== this.state.BID || id !== '') {
this.setState({
pageIndex: 1,
@@ -521,7 +764,6 @@
BData: data
}, () => {
this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
})
}
}
@@ -537,9 +779,9 @@
if (config.uuid !== menuId) return
- if (position === 'line') {
+ if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ this.loadLinedata(lines[0].$$uuid, position)
} else {
this.reloadtable(btn, id)
}
@@ -548,145 +790,88 @@
} else {
this.reloadtable(btn, id)
}
-
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
- }
}
- UNSAFE_componentWillReceiveProps(nextProps) {
- const { sync, config, setting, BID, BData } = this.state
+ refreshLineData = (menuId, btn, uuid, count) => {
+ const { config } = 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.$$key = '' + item.key + item.$$uuid
- item.$$BID = BID || ''
- item.$$BData = BData || ''
- item.$Index = index + 1 + ''
-
- if (setting.controlField) {
- if (setting.controlVal.includes(item[setting.controlField])) {
- item.$disabled = true
- }
- }
-
- return item
- })
-
- if (setting.selected !== 'false' && _data && _data.length > 0) {
- setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid)
- }, 200)
- if (setting.selected === 'init') {
- this.setState({setting: {...setting, selected: 'false'}})
- }
- }
+ if (config.uuid !== menuId) return
+
+ let _data = fromJS(this.state.data).toJS().map(item => {
+ if (item.$$uuid === uuid) {
+ item[btn.field] = count
}
+ return item
+ })
+ let _selectedData = fromJS(this.state.selectedData).toJS().map(item => {
+ if (item.$$uuid === uuid) {
+ item[btn.field] = count
+ }
+ return item
+ })
- this.setState({sync: false, data: _data})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({pageIndex: 1}, () => {
- this.reloadtable()
- })
- }
+ this.setState({
+ data: _data,
+ selectedData: _selectedData
+ })
}
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
- }
+ searchRefresh = (searchId) => {
+ const { config } = this.state
- componentDidMount () {
- MKEmitter.addListener('reloadData', this.reloadData)
- MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
- MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
- }
-
- /**
- * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
- */
- componentWillUnmount () {
- this.setState = () => {
- return
- }
- MKEmitter.removeListener('reloadData', this.reloadData)
- MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
- MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+ if (config.$searchId !== searchId) return
+
+ this.setState({pageIndex: 1}, () => {
+ this.reloadtable()
+ })
}
render() {
- const { BID, setting, actions, config, columns, selectedData, BData, data } = this.state
+ const { BID, setting, actions, config, columns, selectedData, BData, data, allSearch } = this.state
let style = {...config.style}
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) {
style.display = 'none'
}
+ let content = <>
+ {config.search.length ?
+ <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
+ }
+ {actions.length > 0 ? <MainAction
+ BID={BID}
+ setting={setting}
+ actions={actions}
+ BData={BData}
+ columns={config.columns}
+ selectedData={selectedData}
+ /> : (setting.tableType || config.search.length > 0 ? <div className="mk-action-space" style={{height: '25px'}}></div> : null)}
+ <MainTable
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ allSearch={allSearch}
+ data={this.state.data}
+ fields={config.columns}
+ total={this.state.total}
+ colsCtrls={config.colsCtrls}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ statFValue={this.state.statFValue}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ />
+ </>
+
return (
<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">
- {config.search && config.search.length ?
- <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
- }
- <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' : '')}>
- <MainTable
- setting={setting}
- columns={columns}
- MenuID={config.uuid}
- data={data}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- statFValue={this.state.statFValue}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
- />
- </div>
+ {content}
</Panel>
</Collapse> : <>
<NormalHeader config={config}/>
- {config.search && config.search.length ?
- <MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
- }
- <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' : '')}>
- <MainTable
- setting={setting}
- columns={columns}
- MenuID={config.uuid}
- data={this.state.data}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- statFValue={this.state.statFValue}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
- />
- </div>
+ {content}
</>}
</div>
)
--
Gitblit v1.8.0