|
|
|
@ -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 => {
|
|
|
|
|