fix: 修复自助数据集输出字段排序没有按照排序来进行

main
wu.jian2 1 year ago
parent ec041a76b5
commit 8ce44b3798

@ -289,7 +289,7 @@
</div> </div>
<div class="field-wrap bs-field-wrap bs-scrollbar"> <div class="field-wrap bs-field-wrap bs-scrollbar">
<div <div
v-for="field in structurePreviewList" v-for="field in sortedStructurePreviewList"
:key="field.fieldName" :key="field.fieldName"
class="field-item" class="field-item"
@click="fieldsetVisible = true" @click="fieldsetVisible = true"
@ -329,15 +329,15 @@
class="bs-el-table bs-scrollbar" class="bs-el-table bs-scrollbar"
> >
<el-table-column <el-table-column
v-for="(value, key) in dataPreviewList[0] ? dataPreviewList[0] : noDataTableDisplayFields" v-for="(value, key) in sortedTablePreviewList"
:key="key" :key="key"
:label="key" :label="value"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
:render-header="renderHeader" :render-header="renderHeader"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row[key] }}</span> <span>{{ scope.row[value] }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -907,6 +907,22 @@ export default {
tableColumnObject[item.fieldName] = '' tableColumnObject[item.fieldName] = ''
}) })
return tableColumnObject return tableColumnObject
},
// orderNum
sortedStructurePreviewList () {
const list = this.structurePreviewList
list.sort((a, b) => {
return a.orderNum - b.orderNum
})
return list
},
sortedTablePreviewList () {
const tableList = this.dataPreviewList[0] ? this.dataPreviewList[0] : this.noDataTableDisplayFields
const list = Object.keys(tableList)
list.sort((a, b) => {
return this.structurePreviewListCopy.findIndex(item => item.fieldName === a) - this.structurePreviewListCopy.findIndex(item => item.fieldName === b)
})
return list
} }
}, },
watch: { watch: {
@ -1262,6 +1278,9 @@ export default {
}) })
} }
this.structurePreviewListCopy = cloneDeep(this.structurePreviewList) this.structurePreviewListCopy = cloneDeep(this.structurePreviewList)
this.structurePreviewListCopy = this.structurePreviewListCopy.sort((a, b) => {
return a.orderNum - b.orderNum
})
let paramsNameCheck = false let paramsNameCheck = false
this.dataForm.paramsList.forEach(param => { this.dataForm.paramsList.forEach(param => {
const checkList = this.structurePreviewList.filter(item => item.fieldName === param.name) const checkList = this.structurePreviewList.filter(item => item.fieldName === param.name)
@ -1467,6 +1486,7 @@ export default {
::v-deep .el-table__row { ::v-deep .el-table__row {
height: 58px; height: 58px;
.cell { .cell {
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;

Loading…
Cancel
Save