From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/tabviews/custom/components/table/normal-table/index.jsx | 320 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 251 insertions(+), 69 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 136a42c..fd31261 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { notification, Collapse, Modal } from 'antd'
+import { Collapse } from 'antd'
+import moment from 'moment'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
@@ -43,6 +44,7 @@
}
loaded = false
+ supModules = []
/**
* @description 鍒濆鍖栧鐞�
@@ -151,6 +153,11 @@
_config.colsCtrls = null
}
+ let columns = _config.cols
+ if (_config.hasExtend) {
+ columns = this.getCols(_config.cols, BData, _config.setting.extendTime)
+ }
+
this.setState({
pageSize: setting.pageSize || 10,
BID: BID || '',
@@ -160,7 +167,7 @@
config: _config,
setting: setting,
actions: _config.action,
- columns: _config.cols,
+ columns: columns,
search: _config.$searches,
allSearch
})
@@ -199,6 +206,8 @@
}
this.initExec()
+
+ this.autoExec()
}
/**
@@ -301,6 +310,25 @@
}
}
+ autoExec = (times) => {
+ const { config } = this.state
+
+ if (!config.wrap.autoExec) return
+
+ let btn = document.getElementById('button' + config.wrap.autoExec)
+
+ this.autoTimer && clearTimeout(this.autoTimer)
+
+ if (btn) {
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [])
+ } else if (!times || times < 20) {
+ times = times ? times + 1 : 1
+ this.autoTimer = setTimeout(() => {
+ this.autoExec(times)
+ }, 1000)
+ }
+ }
+
transferSyncData = (syncId) => {
const { config } = this.state
@@ -357,6 +385,130 @@
MKEmitter.removeListener('transferSyncData', this.transferSyncData)
}
+ getCols = (cols, BData, time) => {
+ let _cols = []
+ let weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+
+ let excols = (col) => {
+ let _s = []
+ let _marks = col.marks || []
+ let names = []
+ let fields = []
+
+ for (let i = 0; i < col.quota; i++) {
+ fields.push(col.field + (i === 0 ? '' : i))
+
+ if (col.colUnit === 'day') {
+ let hasweek = col.dayFormat.indexOf('week') > -1
+ let format = col.dayFormat.replace(/\sweek/, '')
+ let day = moment().add(col.shift + i, 'days').format(format)
+
+ if (hasweek) {
+ let _w = moment().add(col.shift + i, 'days').weekday()
+ day = day + ' ' + weeks[_w]
+ }
+
+ names.push(day)
+ } else {
+ let format = col.hourFormat
+ if (format === 'H point') {
+ format = 'H鐐�'
+ }
+
+ let hour = moment(time).add(col.shift + i, 'hours').format(format)
+
+ if (format === 'h:00') {
+ if (hour === '12:00') {
+ hour = hour + ' pm'
+ } else if (hour === moment(time).add(col.shift + i, 'hours').format('H:00')) {
+ hour = hour + ' am'
+ } else {
+ hour = hour + ' pm'
+ }
+ }
+ names.push(hour)
+ }
+ }
+
+ if (col.supField) {
+ names = []
+ let val = ''
+ if (BData) {
+ let field = col.supField.toLowerCase()
+ Object.keys(BData).forEach(key => {
+ if (key.toLowerCase() === field) {
+ val = BData[key] + ''
+ }
+ })
+ }
+
+ if (val) {
+ names = val.split(',')
+
+ if (names.length > fields.length) {
+ names.length = fields.length
+ } else if (fields.length > names.length) {
+ fields.length = names.length
+ }
+ }
+ }
+
+ if (names.length === 0) return _s
+
+ _s = fields.map((f, i) => {
+ return {
+ type: 'text',
+ Align: col.Align,
+ Width: col.Width,
+ field: f,
+ label: names[i],
+ uuid: col.uuid + i,
+ marks: _marks.filter(mark => mark.field[0] === f || !fields.includes(mark.field[0]))
+ }
+ })
+
+ return _s
+ }
+
+ cols.forEach(col => {
+ if (col.type === 'extend') {
+ let exs = excols(col)
+ _cols.push(...exs)
+ } else if (col.type === 'colspan') {
+ let subs = []
+ col.subcols.forEach(subcol => {
+ if (subcol.type === 'extend') {
+ let exs = excols(subcol)
+ subs.push(...exs)
+ } else {
+ subs.push(col)
+ }
+ })
+
+ if (subs.length) {
+ _cols.push({...col, subcols: subs})
+ }
+ } else {
+ _cols.push(col)
+ }
+ })
+
+ return _cols
+ }
+
+ resetCols = (BData) => {
+ const { config } = this.state
+
+ let columns = this.getCols(config.cols, BData, config.setting.extendTime)
+
+ this.setState({
+ columns: columns,
+ data: [],
+ selectedData: [],
+ total: 0
+ })
+ }
+
/**
* @description 涓昏〃鏁版嵁鍔犺浇
* @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
@@ -369,6 +521,7 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
@@ -379,6 +532,7 @@
}
this.loaded = true
+ this.requestId = ''
return
}
@@ -406,8 +560,12 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, searches, _orderBy, pageIndex, pageSize, BID)
- let result = await Api.genericInterface(param)
+ this.requestId = config.uuid + new Date().getTime()
+
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
this.loaded = true
if (config.$cache && type === 'init') {
Api.writeCacheConfig(config.uuid, result.data || [], BID)
@@ -502,37 +660,14 @@
}
}
- 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
- })
- }
- }
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
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
- })
- }
+ UtilsDM.queryFail(result)
}
}
@@ -658,11 +793,8 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
}
@@ -753,18 +885,44 @@
}
resetParentParam = (MenuID, id, data) => {
- const { setting } = this.state
+ const { config, setting } = this.state
- if (!setting.supModule || setting.supModule !== MenuID) return
+ if (config.supNodes) {
+ if (!config.supNodes.includes(MenuID)) return
+ this.supModules = this.supModules.filter(item => item.key !== MenuID)
+ let bid = ''
+ let _data = null
- if (id !== this.state.BID || id !== '') {
- this.setState({
- pageIndex: 1,
- BID: id,
- BData: data
- }, () => {
- this.loadmaindata(true, 'true')
- })
+ if (id) {
+ this.supModules.push({key: MenuID, value: id, data})
+ }
+ if (this.supModules.length > 0) {
+ bid = this.supModules[this.supModules.length - 1].value
+ _data = this.supModules[this.supModules.length - 1].data
+ }
+
+ if (bid !== this.state.BID || bid !== '') {
+ this.setState({ BID: bid, BData: _data, pageIndex: 1 }, () => {
+ this.loadmaindata(true, 'true')
+ })
+ }
+ } else {
+ if (!setting.supModule || setting.supModule !== MenuID) return
+
+ if (id !== this.state.BID || id !== '') {
+ if (config.parCtrl) {
+ this.resetCols(data)
+ }
+ this.setState({
+ pageIndex: 1,
+ BID: id,
+ BData: data
+ }, () => {
+ if (!setting.checkBid) {
+ this.loadmaindata(true, 'true')
+ }
+ })
+ }
}
}
@@ -779,16 +937,41 @@
if (config.uuid !== menuId) return
- if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid, position)
+ if (config.supNodes) {
+ if (['mainline', 'maingrid', 'popclose'].includes(position)) {
+ let supNode = this.supModules[this.supModules.length - 1]
+ config.supNodes.forEach((item, i) => {
+ setTimeout(() => {
+ if (supNode && supNode.key === item) {
+ MKEmitter.emit('reloadData', item, supNode.value)
+ } else {
+ MKEmitter.emit('reloadData', item)
+ }
+ }, i * 10)
+ })
+ } else {
+ if (position === 'line' || position === 'line_grid') {
+ if (lines && lines.length === 1) {
+ this.loadLinedata(lines[0].$$uuid, position)
+ } else {
+ this.reloadtable(btn, id)
+ }
+ } else {
+ this.reloadtable(btn, id)
+ }
+ }
+ } else {
+ if (position === 'line' || position === 'line_grid') {
+ if (lines && lines.length === 1) {
+ this.loadLinedata(lines[0].$$uuid, position)
+ } else {
+ this.reloadtable(btn, id)
+ }
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} 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, id)
}
}
@@ -835,7 +1018,7 @@
}
let content = <>
- {config.search && config.search.length ?
+ {config.search.length ?
<MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
{actions.length > 0 ? <MainAction
@@ -845,24 +1028,23 @@
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}
- 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})}
- />
- </div>
+ /> : (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}
+ parCtrl={config.parCtrl}
+ colsCtrls={config.colsCtrls}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ statFValue={this.state.statFValue}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ />
</>
return (
--
Gitblit v1.8.0