diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index c31669dc..07874418 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -1277,8 +1277,7 @@ export default { item.sourceTable = this.tableNameList[0] }) } - this.structurePreviewListCopy = cloneDeep(this.structurePreviewList) - this.structurePreviewListCopy = this.structurePreviewListCopy.sort((a, b) => { + this.structurePreviewListCopy = cloneDeep(this.structurePreviewList).sort((a, b) => { return a.orderNum - b.orderNum }) let paramsNameCheck = false diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index 47382a62..2497efcc 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -319,7 +319,7 @@
@@ -609,6 +609,21 @@ export default { tableColumnObject[item.fieldName] = '' }) return tableColumnObject + }, + 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 + }, + sortedStructurePreviewList () { + const list = this.structurePreviewList + list.sort((a, b) => { + return a.orderNum - b.orderNum + }) + return list } }, watch: { @@ -630,8 +645,10 @@ export default { }, deep: true, immediate: true + }, + sortedStructurePreviewList (val) { + this.structurePreviewListCopy = cloneDeep(val) } - }, mounted () { this.init() @@ -718,7 +735,7 @@ export default { if (this.dataForm.fieldList == null) { this.dataForm.fieldList = cloneDeep(data.structure) } - this.dataPreviewList = data.data.list + this.dataPreviewList = cloneDeep(data.data.list) this.totalCount = data.data.totalCount this.tableLoading = false }).catch(() => { @@ -958,7 +975,9 @@ export default { }) } - this.structurePreviewListCopy = cloneDeep(this.structurePreviewList) + this.structurePreviewListCopy = cloneDeep(this.structurePreviewList).sort((a, b) => { + return a.orderNum - b.orderNum + }) this.totalCount = data.data.totalCount this.currentCount = data.data.currentCount this.tableLoading = false