From f9bbcd42a98cb7afeac32609b8ee6dac3392c89d Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sat, 14 Oct 2023 14:19:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E8=BE=93=E5=87=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/CustomEditForm.vue  |  3 +-
 .../src/OriginalEditForm.vue                  | 33 +++++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

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 @@
             </div>
             <div class="field-wrap bs-field-wrap bs-scrollbar">
               <div
-                v-for="field in structurePreviewList"
+                v-for="field in sortedStructurePreviewList"
                 :key="field.fieldName"
                 class="field-item"
                 @click="fieldsetVisible = true"
@@ -363,15 +363,15 @@
             class="bs-el-table bs-scrollbar"
           >
             <el-table-column
-              v-for="(value, key) in dataPreviewList[0] ? dataPreviewList[0] : noDataTableDisplayFields"
+              v-for="(value, key) in sortedTablePreviewList"
               :key="key"
-              :label="key"
+              :label="value"
               align="center"
               show-overflow-tooltip
               :render-header="renderHeader"
             >
               <template slot-scope="scope">
-                <span>{{ scope.row[key] }}</span>
+                <span>{{ scope.row[value] }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -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