From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/index.jsx | 843 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 553 insertions(+), 290 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 2075ffd..7f9b250 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { notification } from 'antd'
+import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -19,20 +19,15 @@
class EditableTable extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
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 鏃剁殑鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -42,8 +37,7 @@
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
- statFValue: [], // 鍚堣鍊�
- lock: false
+ allSearch: null
}
/**
@@ -51,96 +45,174 @@
* 1銆� initdata 涓烘墦鍗版椂浣跨敤鐨勬暟鎹泦
*/
UNSAFE_componentWillMount () {
- const { BID, BData } = this.props
let _config = fromJS(this.props.config).toJS()
- let _cols = new Map()
let setting = {..._config.setting, ..._config.wrap}
- setting.tableId = Utils.getuuid()
+ let BID = ''
+ let BData = ''
+
+ setting.tableId = Utils.getuuid().substr(-6).toUpperCase()
+
+ 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 || ''
+ }
_config.submit.style = _config.submit.style || {}
_config.submit.wrapStyle = {}
- _config.submit.hasAction = _config.action.length > 0
- if (!_config.submit.hasAction) {
- if (_config.submit.style.marginTop) {
- _config.submit.wrapStyle.paddingTop = _config.submit.style.marginTop
- }
- if (_config.submit.style.marginBottom) {
- _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
- }
- } else {
- _config.submit.wrapStyle.paddingTop = '15px'
- }
+ setting.hasAction = _config.action.length > 0
- if (setting.height) {
- setting.operType = 'btnMode'
- }
-
- _config.columns.forEach(item => {
- if (item.type !== 'number') return
- _cols.set(item.field, item)
+ _config.action.forEach(btn => {
+ if (btn.funcType === 'addline') {
+ setting.addable = true
+ }
+ btn.$tableId = setting.tableId
+ if (!btn.controlField) {
+ btn.controlField = '$lock'
+ btn.controlVals = []
+ }
})
- let _columns = []
- let signAdd = false
- _config.cols.forEach(column => {
- if (column.Hide === 'true') return
- if (column.type === 'index') {
- column.field = '$Index'
- column.type = 'text'
- }
+ let initId = ''
- if (setting.addable === 'true' && setting.operType === 'buoyMode' && column.type !== 'action' && !signAdd) {
- column.addable = true
- signAdd = true
- }
+ setting.hasSubmit = false
+ if (setting.commit === 'change' || setting.commit === 'simple') {
+ setting.commit = 'change'
+ }
- if (column.marks && column.marks.length === 0) {
- column.marks = ''
- }
+ let index = 0
+ let getColumns = (cols) => {
+ return cols.filter(item => {
+ if (item.Hide === 'true') return false
- column.tableId = setting.tableId
+ item.tableId = setting.tableId
- if (column.type === 'text' && column.editable === 'true' && column.editType === 'select') {
- column.options = column.options || []
- column.options = column.options.filter(cell => {
- cell.value = cell.Value
- cell.label = cell.Text
-
- return !cell.Hide
- })
- }
+ if (item.type === 'colspan') {
+ item.subcols = getColumns(item.subcols)
- 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
+ if (item.subcols.length === 0) {
+ return false
}
- return item
- })
- } else if (column.type === 'action') {
- column.operations = column.elements
- }
+ } else if (item.type === 'custom') {
+ item.config = {setting: _config.setting, columns: _config.columns}
- _columns.push(column)
- })
+ item.elements.forEach(btn => {
+ if (btn.eleType !== 'button') return
+ if (btn.funcType === 'addline') {
+ setting.addable = true
+ }
+ btn.$tableId = setting.tableId
+ if (!btn.controlField) {
+ btn.controlField = '$lock'
+ btn.controlVals = []
+ }
+ })
+ } else {
+ if (item.editable === 'true') {
+ item.$sort = index
+ index++
- if (setting.delable !== 'false' && setting.operType === 'buoyMode') {
- if (_columns[_columns.length - 1] && _columns[_columns.length - 1].type !== 'action') {
- _columns[_columns.length - 1].delable = true
- } else if (_columns[_columns.length - 2] && _columns[_columns.length - 2].type !== 'action') {
- _columns[_columns.length - 2].delable = true
- }
+ setting.hasSubmit = setting.commit !== 'change'
+ item.$ctrl = setting.commit === 'change'
+
+ if (item.ctrlField) {
+ item.ctrlValue = item.ctrlValue.split(',')
+ }
+ if (!initId) {
+ initId = item.uuid
+ }
+ if (item.enter === '$sub') {
+ item.enter = '$noAct'
+ } else if (item.enter === '$next') {
+ item.enter = '$next_' + initId
+ }
+
+ if (item.linkSubField && item.linkSubField.length === 0) {
+ item.linkSubField = null
+ }
+
+ if (item.type === 'number') {
+ if (item.clearField) {
+ _config.columns.forEach(cell => {
+ if (cell.field === item.clearField) {
+ item.clearName = cell.label
+ }
+ })
+ }
+ } else if (item.editType === 'date') {
+ item.format = 'YYYY-MM-DD'
+
+ if (item.precision === 'hour') {
+ item.format = 'YYYY-MM-DD HH'
+ } else if (item.precision === 'minute') {
+ item.format = 'YYYY-MM-DD HH:mm'
+ } else if (item.precision === 'second') {
+ item.format = 'YYYY-MM-DD HH:mm:ss'
+ }
+ } else if (item.editType === 'select') {
+ item.map = new Map()
+
+ item.options = item.options || []
+ item.options = item.options.filter(cell => {
+ cell.value = cell.Value
+ cell.label = cell.Text
+
+ return !cell.Hide
+ })
+
+ if (item.resourceType !== '1') {
+ item.options.forEach(cell => {
+ item.map.set(cell.value, cell.label)
+ })
+ }
+ } else if (item.editType === 'popSelect') {
+ if (item.pops) {
+ item.pops.forEach(cell => {
+ cell.linkSubField = item.linkSubField
+ this.resetPop(cell)
+ cell.tabName = cell.initval.replace(/^tab:/, '')
+ })
+ } else {
+ this.resetPop(item)
+ }
+ }
+ }
+ }
+
+ return true
+ })
}
- // if (setting.color) {
- // setting.style.color = setting.color
- // }
- // if (setting.fontSize) {
- // setting.style.fontSize = setting.fontSize
- // }
+ _config.cols = getColumns(_config.cols)
+
+ let _columns = _config.cols
+ if (_config.hasExtend) {
+ _columns = this.getCols(_config.cols, BData, _config.setting.extendTime)
+ }
+
+ setting.initId = initId
if (!_config.lineMarks || _config.lineMarks.length === 0) {
_config.lineMarks = null
+ }
+
+ 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
+ }
+
+ if (_config.setting.supModule && !BID) {
+ _config.setting.onload = 'false'
}
this.setState({
@@ -150,52 +222,239 @@
title: _config.wrap.title,
config: _config,
setting: setting,
- searchlist: _config.search,
actions: _config.action,
columns: _columns,
- arr_field: _config.columns.map(col => col.field).join(','),
- search: Utils.initMainSearch(_config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: _config.$searches,
+ allSearch
}, () => {
if (_config.setting.onload === 'true') {
setTimeout(() => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ this.loadData()
}, _config.setting.delay || 0)
}
})
}
+ resetPop = (config) => {
+ let arrfield = config.columns.map(f => f.field)
+
+ if (config.linkSubField && config.linkSubField.length > 0) {
+ config.linkSubField.forEach(n => {
+ if (!arrfield.includes(n)) {
+ arrfield.push(n)
+ }
+ })
+ }
+
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ config.dataSource = config.dataSource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ config.dataSource = config.dataSource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
+ config.dataSource = config.dataSource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
+ config.dataSource = config.dataSource.replace(/@SessionUid@/ig, `'${localStorage.getItem('SessionUid') || ''}'`)
+ config.dataSource = config.dataSource.replace(/@UserID@/ig, `'${sessionStorage.getItem('UserID') || ''}'`)
+ config.dataSource = config.dataSource.replace(/@Appkey@/ig, `'${window.GLOB.appkey || ''}'`)
+ config.dataSource = config.dataSource.replace(/@lang@/ig, `'${sessionStorage.getItem('lang')}'`)
+
+ if (/\s/.test(config.dataSource)) { // 鎷兼帴鍒悕
+ config.dataSource = '(' + config.dataSource + ') tb'
+ }
+
+ let labels = {}
+ config.cols = []
+ config.columns.forEach(col => {
+ labels[col.field] = col.label
+
+ if (col.Hide === 'true') return
+
+ config.cols.push({
+ dataIndex: col.field,
+ title: col.label,
+ sorter: col.IsSort === 'true',
+ width: col.Width || 120
+ })
+ })
+
+ let placeholder = ''
+ if (!config.searchKey) {
+ config.onload = 'true'
+ } else {
+ placeholder = []
+ config.searchKey.split(',').forEach(key => {
+ if (!labels[key]) {
+ placeholder = ''
+ } else if (placeholder) {
+ placeholder.push(labels[key])
+ }
+ })
+
+ placeholder = placeholder ? placeholder.join('銆�') : ''
+ }
+
+ config.placeholder = placeholder
+ config.arr_field = arrfield.join(',')
+ }
+
+ 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, setting } = this.state
+
+ MKEmitter.emit('transferData' + setting.tableId, [], 'clear')
+
+ let columns = this.getCols(config.cols, BData, config.setting.extendTime)
+
+ this.setState({
+ columns: columns,
+ data: [],
+ selectedData: [],
+ total: 0
+ })
+ }
+
/**
* @description 涓昏〃鏁版嵁鍔犺浇
- * @param { Boolean } reset 琛ㄦ牸鏄惁閲嶇疆
- * @param { String } repage 琛ㄦ牸鏄惁閲嶇疆椤电爜
*/
- async loadmaindata (reset, repage) {
- const { mainSearch } = this.props
- const { setting, config, arr_field, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
+ async loadData (reset, repage) {
+ const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
if (setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
- reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
+ reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
+ MKEmitter.emit('transferData' + setting.tableId, [])
+
+ this.requestId = ''
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
}
@@ -204,10 +463,14 @@
})
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, 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
+
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
let start = 1
@@ -222,43 +485,63 @@
item.$Index = start + index + ''
item.$type = 'upt'
item.$origin = true
+
+ if (config.absFields) {
+ config.absFields.forEach(f => {
+ if (!isNaN(item[f])) {
+ item[f] = Math.abs(item[f])
+ }
+ })
+ }
+
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
})
- MKEmitter.emit('transferData', config.uuid, data)
+ MKEmitter.emit('transferData' + setting.tableId, data)
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
}
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadmainLinedata (id, line) {
- 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
+
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)
})
}
@@ -267,48 +550,68 @@
})
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, 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.reloadIndex()
+ return
+ }
+
+ if (!result.data || !result.data[0]) {
+ let data = fromJS(this.state.data).toJS()
+ let selectedData = fromJS(this.state.selectedData).toJS()
+
+ data = data.filter(item => item.$$uuid !== id)
+ selectedData = selectedData.filter(item => item.$$uuid !== id)
+
+ MKEmitter.emit('transferData' + setting.tableId, id, 'delete')
+
+ this.setState({
+ data,
+ selectedData,
+ loading: false
+ })
+ return
+ }
+
let data = fromJS(this.state.data).toJS()
let selectedData = fromJS(this.state.selectedData).toJS()
- let _data = result.data[0] || {}
+ let _data = result.data[0]
_data.$$uuid = _data[setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
_data.$type = 'upt'
_data.$origin = true
- try {
- data = data.map(item => {
- if (item.$$uuid === _data.$$uuid) {
- _data.key = item.key
- _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
- }
- return item
- })
- } catch (e) {
- console.warn('鏁版嵁鏌ヨ閿欒')
}
- if (line) {
- if (line.$type === 'del' && !result.data[0]) {
- data = data.filter(m => m.$$uuid === line.$$uuid)
+ data = data.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ _data.key = item.key
+ _data.$Index = item.$Index
+ return _data
+ } else {
+ return item
}
- MKEmitter.emit('transferData', config.uuid, _data, 'line')
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
- }
+ })
+ selectedData = selectedData.map(item => {
+ if (_data.$$uuid === item.$$uuid) {
+ return _data
+ }
+ return item
+ })
+
+ MKEmitter.emit('transferData' + setting.tableId, _data, 'line')
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
this.setState({
data,
@@ -319,78 +622,9 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
- }
-
- /**
- * @description 鑾峰彇鍚堣瀛楁鍊�
- */
- getStatFieldsValue = () => {
- const { mainSearch } = this.props
- const { setting, config, search, BID, orderBy } = this.state
-
- if (setting.supModule && !BID) { // 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, this.props.menuType)
-
- 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
- })
- }
- })
}
/**
@@ -398,26 +632,26 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- const { setting } = this.state
+ const { setting, BID } = this.state
- if (setting.onload === 'false') {
- this.setState({
- pageIndex: 1,
- search: searches,
- setting: {...setting, onload: 'true'}
- }, () => {
- this.loadmaindata()
- this.getStatFieldsValue()
+ if (setting.supModule && !BID) {
+ notification.warning({
+ top: 92,
+ message: setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
})
- } else {
this.setState({
- pageIndex: 1,
search: searches
- }, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
})
+ return
}
+
+ this.setState({
+ pageIndex: 1,
+ search: searches
+ }, () => {
+ this.loadData(true, 'true')
+ })
}
/**
@@ -437,78 +671,79 @@
pageSize: pagination.pageSize,
orderBy: (sorter.field && sorter.order) ? `${sorter.field} ${sorter.order}` : ''
}, () => {
- this.loadmaindata()
+ this.loadData()
})
}
/**
* @description 琛ㄦ牸鍒锋柊
*/
- reloadtable = (btn) => {
- if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
- })
- } else {
- this.loadmaindata(true, 'false')
- this.getStatFieldsValue()
- }
+ reloadIndex = () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData(true, 'true')
+ })
}
/**
* @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
})
}
- reloadData = (menuId, id, item) => {
+ reloadData = (menuId, id) => {
const { config } = this.state
if (config.uuid !== menuId) return
if (!id) {
- this.reloadtable()
+ this.reloadIndex()
+ } else if (config.forbidLine) {
+ this.loadData(true, 'false')
} else {
- this.loadmainLinedata(id, item)
+ this.loadLinedata(id)
}
}
resetParentParam = (MenuID, id, data) => {
- const { setting } = this.state
+ const { setting, config } = this.state
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
}, () => {
- this.loadmaindata(true, 'true')
- this.getStatFieldsValue()
+ if (!setting.checkBid) {
+ setTimeout(() => {
+ this.loadData(true, 'true')
+ }, setting.delay || 0)
+ }
})
}
}
@@ -524,31 +759,55 @@
if (config.uuid !== menuId) return
- if (position === 'line') {
+ if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadmainLinedata(lines[0].$$uuid)
+ if (config.forbidLine) {
+ this.loadData(true, 'false')
+ } else {
+ this.loadLinedata(lines[0].$$uuid, position)
+ }
} else {
- this.reloadtable(btn)
+ this.loadData(true, 'false')
}
- } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
+ } else if (btn.resetPageIndex !== 'false') {
+ this.reloadIndex()
} else {
- this.reloadtable(btn)
- }
-
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
+ this.loadData(true, 'false')
}
}
- UNSAFE_componentWillReceiveProps(nextProps) {
+ refreshLineData = (menuId, btn, uuid, count) => {
const { config } = this.state
- if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({pageIndex: 1}, () => {
- this.reloadtable()
- })
- }
+ 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({
+ data: _data,
+ selectedData: _selectedData
+ })
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.reloadIndex()
}
shouldComponentUpdate (nextProps, nextState) {
@@ -556,10 +815,17 @@
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshLineData', this.refreshLineData)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
}
/**
@@ -570,57 +836,54 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+ MKEmitter.removeListener('refreshLineData', this.refreshLineData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
render() {
- const { BID, setting, searchlist, actions, config, columns, BData, selectedData, lock } = this.state
+ const { BID, setting, actions, config, columns, BData, data, selectedData, allSearch } = this.state
+
+ let style = {...config.style}
+ if (config.wrap.empty === 'hidden' && data.length === 0) {
+ style.display = 'none'
+ }
return (
- <div className="custom-edit-table" id={'anchor' + config.uuid} style={config.style}>
+ <div className={'custom-edit-table' + (setting.hasSubmit ? '' : ' withnot-submit')} id={'anchor' + config.uuid} style={style}>
<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
+ {actions.length > 0 ? <MainAction
BID={BID}
setting={setting}
actions={actions}
BData={BData}
- lock={lock}
columns={config.columns}
selectedData={selectedData}
- />
+ /> : null}
<MainTable
BID={BID}
setting={setting}
columns={columns}
MenuID={config.uuid}
+ allSearch={allSearch}
submit={config.submit}
fields={config.columns}
total={this.state.total}
+ parCtrl={config.parCtrl}
+ colsCtrls={config.colsCtrls}
lineMarks={config.lineMarks}
loading={this.state.loading}
refreshdata={this.refreshbytable}
chgSelectData={(selects) => this.setState({selectedData: selects})}
- changeLock={(lock) => this.setState({lock: lock})}
- statFValue={this.state.statFValue}
/>
</div>
)
}
}
-const mapStateToProps = (state) => {
- return {
- menuType: state.editLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(EditableTable)
\ No newline at end of file
+export default EditableTable
\ No newline at end of file
--
Gitblit v1.8.0