From fc407145f632e12f257a8cd67107f8f8b4ccdedd Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 5 Jan 2024 15:32:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A9=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E4=BA=86=E8=BE=93=E5=87=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=E7=9A=84?=
 =?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  | 27 ++++++++++++-------
 .../src/OriginalEditForm.vue                  | 15 ++++++-----
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index 2325e580..86a97c84 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -240,7 +240,10 @@
                 :options="cOptions"
                 style="margin-top: 2px"
               />
-              <div class="bs-codemirror-bottom-text" v-if="dataForm.syntaxType === 'mybatis'">
+              <div
+                v-if="dataForm.syntaxType === 'mybatis'"
+                class="bs-codemirror-bottom-text"
+              >
                 示例：
                 <strong><br>
                   1、常规使用
@@ -265,7 +268,10 @@
                   >${参数名称}</span> <span style="color: #2F67A7;">&lt;/if&gt;</span>
                 </strong>
               </div>
-              <div class="bs-codemirror-bottom-text" v-else>
+              <div
+                v-else
+                class="bs-codemirror-bottom-text"
+              >
                 示例：
                 <strong><br>
                   1、常规使用 select * from table where table_field = <span style="color: #CC7832;">${参数名称}</span><br>
@@ -1220,7 +1226,7 @@ export default {
             paramsList: this.dataForm.paramsList,
             fieldList: this.dataForm.fieldList,
             fieldDesc: this.dataForm.fieldDesc,
-            syntaxType: this.dataForm.syntaxType,
+            syntaxType: this.dataForm.syntaxType
           }
         }
         datasetSave(datasetParams).then(res => {
@@ -1245,7 +1251,7 @@ export default {
       this.isTest = true
       // 匹配 ${}
       const reg = /\${(.*?)}/g
-      let paramNames = [...new Set([...this.dataForm.sqlProcess.matchAll(reg)].map(item => item[1]))]
+      const paramNames = [...new Set([...this.dataForm.sqlProcess.matchAll(reg)].map(item => item[1]))]
       // 匹配 #{}
       const reg2 = /#{(.*?)}/g
       const paramNames2 = [...new Set([...this.dataForm.sqlProcess.matchAll(reg2)].map(item => item[1]))]
@@ -1315,12 +1321,15 @@ 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 = 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 => {
diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index 816c3249..b43782f5 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -867,7 +867,7 @@ export default {
      * 选中原始表
      * @param value
      */
-    async setTable(value) {
+    async setTable (value) {
       this.fieldList = []
       if (!this.dataForm.tableName) {
         this.dataForm.fieldInfo = []
@@ -883,7 +883,7 @@ export default {
     /**
      * 获取原始表字段列表
      */
-    queryAllField() {
+    queryAllField () {
       return new Promise((resolve, reject) => {
         getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName)
           .then((data) => {
@@ -984,10 +984,13 @@ export default {
               }
               this.$set(item, 'fieldDesc', fieldDesc)
               // this.structurePreviewList 和 this.oldStructurePreviewList 比较，如果旧的数据里fieldDesc有值则重新赋值给新的数据
-              this.structurePreviewList.forEach(item => {
-                const oldItem = this.oldStructurePreviewList.find(oldItem => oldItem.fieldName === item.fieldName)
-                if (oldItem && oldItem.fieldDesc) {
-                  item.fieldDesc = oldItem.fieldDesc
+              this.structurePreviewList = this.oldStructurePreviewList.map(oldItem => {
+                const data = this.structurePreviewList.find(item => oldItem.fieldName === item.fieldName)
+                if (data) {
+                  return {
+                    ...oldItem,
+                    fieldDesc: oldItem.fieldDesc
+                  }
                 }
               })
             }