From 21753d1bb5996ca00b4f4beba532aa803c43adb1 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Tue, 9 Jan 2024 14:23:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A9?=
 =?UTF-8?q?=E3=80=81=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E8=BE=93=E5=87=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E5=90=88=E5=B9=B6=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=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  | 19 +++++++------
 .../src/OriginalEditForm.vue                  | 15 ++++++-----
 .../src/StoredProcedureEditForm.vue           | 27 ++++++++-----------
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index b8936f46..fdec9c42 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -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 => {
diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index b43782f5..8f4f1297 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -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])
+                  })
                 }
               })
             }
diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
index ca0bece2..9f8fe242 100644
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@@ -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 => {