From 7f5e4d8d9680973a86effde5e35d52e197cd65d6 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Sat, 6 Jan 2024 15:24:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E4=BA=86=E8=BE=93=E5=87=BA=E5=AD=97=E6=AE=B5=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/StoredProcedureEditForm.vue           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
index 7dd958ef..16aa9edf 100644
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@@ -1013,12 +1013,23 @@ 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)
+        // 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)
           if (fieldInfo) {
-            field.fieldDesc = fieldInfo.fieldDesc
-            field.orderNum = fieldInfo.orderNum
-            field.sourceTable = fieldInfo.sourceTable
+            return {
+              ...field,
+              fieldDesc: fieldInfo.fieldDesc,
+              orderNum: fieldInfo.orderNum,
+              sourceTable: fieldInfo.sourceTable
+            }
           }
         })
         this.structurePreviewList.forEach(item => {