From e55f539d9fcdbe4141f789cb266ef9a778e765d6 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Thu, 26 Oct 2023 14:07:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E4=BC=98=E5=8C=96=EF=BC=8C=E5=88=87=E6=8D=A2=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E8=A1=A8=E6=97=B6=E7=AD=89=E5=BE=85=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E6=89=A7=E8=A1=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/OriginalEditForm.vue                  | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index c7ab3a03..816c3249 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -717,10 +717,15 @@ export default {
      * 获取预览数据
      */
     getData () {
+      let allField = []
+      if (this.dataForm.fieldInfo.length === 0) {
+        // 从字段列表中取出所有字段
+        allField = this.fieldList.map(field => field.columnName)
+      }
       const executeParams = {
         dataSourceId: this.dataForm.sourceId,
         script: JSON.stringify({
-          fieldInfo: this.dataForm.fieldInfo, // 未选中字段就传空数组
+          fieldInfo: this.dataForm.fieldInfo.length === 0 ? allField : this.dataForm.fieldInfo,
           tableName: this.dataForm.tableName,
           repeatStatus: this.dataForm.repeatStatus
         }),
@@ -862,11 +867,15 @@ export default {
      * 选中原始表
      * @param value
      */
-    setTable (value) {
+    async setTable(value) {
       this.fieldList = []
+      if (!this.dataForm.tableName) {
+        this.dataForm.fieldInfo = []
+        return
+      }
+      await this.queryAllField()
+      // dataForm.fieldInfo的清空会触发监听事件，如果在queryAllField之前清空，会导致监听事件中的getPreViewData方法获取不到fieldList
       this.dataForm.fieldInfo = []
-      if (!this.dataForm.tableName) return
-      this.queryAllField()
     },
     repeatStatusChange () {
       this.getPreViewData()
@@ -874,20 +883,25 @@ export default {
     /**
      * 获取原始表字段列表
      */
-    queryAllField () {
-      getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => {
-        const fieldDescMap = {}
-        this.fieldList = data.map(field => {
-          fieldDescMap[field.columnName] = field.columnComment
-          field.isCheck = false
-          if (this.dataForm.fieldInfo.includes(field.columnName)) {
-            field.isCheck = true
-          }
-          return field
-        })
-        // this.getPreViewData(fieldDescMap)
-      }).catch(() => {
-        this.fieldList = []
+    queryAllField() {
+      return new Promise((resolve, reject) => {
+        getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName)
+          .then((data) => {
+            const fieldDescMap = {}
+            this.fieldList = data.map(field => {
+              fieldDescMap[field.columnName] = field.columnComment
+              field.isCheck = false
+              if (this.dataForm.fieldInfo.includes(field.columnName)) {
+                field.isCheck = true
+              }
+              return field
+            })
+            resolve()
+          })
+          .catch(() => {
+            this.fieldList = []
+            reject()
+          })
       })
     },
     /**