From a9b02f6862522b54d0824152017bf2acfec2af7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 三月 2024 10:29:50 +0800
Subject: [PATCH] 2024-03-21
---
src/tabviews/custom/components/table/edit-table/index.jsx | 108 ++++++++++++++++++++++++++++++------------------------
1 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 4f2d6c0..14776ec 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -46,10 +46,10 @@
UNSAFE_componentWillMount () {
let _config = fromJS(this.props.config).toJS()
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)
@@ -76,9 +76,12 @@
})
let _columns = []
- setting.initId = ''
- let triMap = new Map()
+ let initId = ''
+
setting.hasSubmit = false
+ if (setting.commit === 'change' || setting.commit === 'simple') {
+ setting.commit = 'change'
+ }
let getColumns = (cols) => {
return cols.filter(item => {
@@ -110,19 +113,26 @@
item.type = 'text'
}
- if (item.marks && item.marks.length === 0) {
- item.marks = ''
- }
-
if (item.editable === 'true') {
- setting.hasSubmit = true
- if (!setting.initId) {
- setting.initId = item.uuid
+ setting.hasSubmit = setting.commit !== 'change'
+ item.$ctrl = setting.commit === 'change'
+
+ if (!initId) {
+ initId = item.uuid
}
- if (item.type === 'text' && (item.editType === 'switch' || item.editType === 'select')) {
- triMap.set(item.uuid, item.editType)
+ if (item.enter === '$sub') {
+ item.enter = '$noAct'
+ } else if (item.enter === '$next') {
+ item.enter = '$next_' + initId
}
- if (item.type === 'text' && item.editType === 'select') {
+
+ if (item.linkSubField && item.linkSubField.length === 0) {
+ item.linkSubField = null
+ }
+
+ if (item.type === 'number') {
+
+ } else if (item.editType === 'select') {
item.options = item.options || []
item.options = item.options.filter(cell => {
cell.value = cell.Value
@@ -133,6 +143,7 @@
} 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:/, '')
})
@@ -149,25 +160,7 @@
_columns = getColumns(_config.cols)
- if (triMap.size > 0) {
- let setColumns = (cols) => {
- return cols.map(item => {
- if (item.type === 'colspan') {
- item.subcols = setColumns(item.subcols)
- } else if (item.editable === 'true' && triMap.has(item.enter)) {
- item.triType = 'click'
- }
-
- return item
- })
- }
-
- _columns = setColumns(_columns)
-
- if (setting.initId && triMap.has(setting.initId)) {
- setting.triType = 'click'
- }
- }
+ setting.initId = initId
if (!_config.lineMarks || _config.lineMarks.length === 0) {
_config.lineMarks = null
@@ -183,10 +176,6 @@
}
} else {
_config.colsCtrls = null
- }
-
- if (setting.commit === 'blur') {
- setting.hasSubmit = false
}
this.setState({
@@ -282,9 +271,12 @@
this.setState({
data: [],
selectedData: [],
+ loading: false,
total: 0
})
reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
+
+ this.requestId = ''
return
}
@@ -310,8 +302,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
+
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
let start = 1
@@ -357,7 +353,7 @@
loading: false
})
- MKEmitter.emit('transferData', config.uuid, data)
+ MKEmitter.emit('transferData' + setting.tableId, data)
if (result.message) {
if (result.ErrCode === 'Y') {
@@ -395,7 +391,7 @@
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadmainLinedata (id) {
+ async loadLinedata (id, position) {
const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state
if (config.forbidLine) {
@@ -423,11 +419,25 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ if (position === 'line_grid' && (!result.data || !result.data[0])) {
+ this.loadmaindata(true, 'false')
+ 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
}
@@ -465,7 +475,7 @@
return item
})
- MKEmitter.emit('transferData', config.uuid, _data, 'line')
+ MKEmitter.emit('transferData' + setting.tableId, _data, 'line')
MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
this.setState({
@@ -567,7 +577,7 @@
if (!id) {
this.reloadtable()
} else {
- this.loadmainLinedata(id)
+ this.loadLinedata(id)
}
}
@@ -581,9 +591,11 @@
BID: id,
BData: data
}, () => {
- setTimeout(() => {
- this.loadmaindata(true, 'true')
- }, setting.delay || 0)
+ if (!setting.checkBid) {
+ setTimeout(() => {
+ this.loadmaindata(true, 'true')
+ }, setting.delay || 0)
+ }
})
}
}
@@ -599,9 +611,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)
}
--
Gitblit v1.8.0