fix: 修复自助、存储过程数据集输出字段,字段数据合并错误问题

main
wu.jian2 1 year ago
parent 5e122dbb41
commit 21753d1bb5

@ -1321,15 +1321,18 @@ export default {
this.dataPreviewList = res.data.list
this.structurePreviewList = res.structure
//
this.structurePreviewList = this.dataForm.fieldList.map(field => {
const fieldInfo = this.structurePreviewList.find(item => item.fieldName === field.fieldName)
this.structurePreviewList.forEach(field => {
const fieldInfo = this.dataForm.fieldList.find(item => item.fieldName === field.fieldName)
if (fieldInfo) {
return {
...field,
fieldDesc: field.fieldDesc,
orderNum: field.orderNum,
sourceTable: field.sourceTable
}
const { fieldDesc, orderNum, sourceTable, ...rest } = fieldInfo
field.fieldDesc = fieldDesc
field.orderNum = orderNum
field.sourceTable = sourceTable
Object.keys(rest).forEach(key => {
if (!field.hasOwnProperty(key)) {
this.$set(field, key, rest[key])
}
})
}
})
this.structurePreviewList.forEach(item => {

@ -984,13 +984,14 @@ export default {
}
this.$set(item, 'fieldDesc', fieldDesc)
// this.structurePreviewList this.oldStructurePreviewList fieldDesc
this.structurePreviewList = this.oldStructurePreviewList.map(oldItem => {
const data = this.structurePreviewList.find(item => oldItem.fieldName === item.fieldName)
if (data) {
return {
...oldItem,
fieldDesc: oldItem.fieldDesc
}
this.structurePreviewList.forEach(item => {
const oldItem = this.oldStructurePreviewList.find(oldItem => oldItem.fieldName === item.fieldName)
if (oldItem && oldItem.fieldDesc) {
const { fieldDesc, ...rest } = oldItem
item.fieldDesc = fieldDesc
Object.keys(rest).forEach(key => {
this.$set(item, key, rest[key])
})
}
})
}

@ -1013,23 +1013,18 @@ export default {
this.dataPreviewList = res.data.list
this.structurePreviewList = res.structure
//
// this.structurePreviewList.forEach(field => {
// const fieldInfo = this.dataForm.fieldList.find(item => item.fieldName === field.fieldName)
// if (fieldInfo) {
// field.fieldDesc = fieldInfo.fieldDesc
// field.orderNum = fieldInfo.orderNum
// field.sourceTable = fieldInfo.sourceTable
// }
// })
this.structurePreviewList = this.dataForm.fieldList.map(field => {
const fieldInfo = this.structurePreviewList.find(item => item.fieldName === field.fieldName)
this.structurePreviewList.forEach(field => {
const fieldInfo = this.dataForm.fieldList.find(item => item.fieldName === field.fieldName)
if (fieldInfo) {
return {
...field,
fieldDesc: field.fieldDesc,
orderNum: field.orderNum,
sourceTable: field.sourceTable
}
const { fieldDesc, orderNum, sourceTable, ...rest } = fieldInfo
field.fieldDesc = fieldDesc
field.orderNum = orderNum
field.sourceTable = sourceTable
Object.keys(rest).forEach(key => {
if (!field.hasOwnProperty(key)) {
this.$set(field, key, rest[key])
}
})
}
})
this.structurePreviewList.forEach(item => {

Loading…
Cancel
Save