From dc02f06ee655d1033757e4808eae0e772af9d4a8 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 4 Aug 2023 16:39:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A9=E3=80=81=E8=84=9A=E6=9C=AC=E3=80=81?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E5=9C=A8=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=89=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5=E6=97=B6=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BE=9D=E6=97=A7=E5=B1=95=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=BE=93=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/CustomEditForm.vue  | 10 ++++++++-
 .../src/OriginalEditForm.vue                  | 22 +++++++++++++++----
 .../DataSetManagement/src/ScriptEditForm.vue  | 12 +++++++++-
 .../src/StoredProcedureEditForm.vue           | 10 ++++++++-
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index e233f588..c8de2633 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -300,7 +300,7 @@
             class="bs-el-table bs-scrollbar"
           >
             <el-table-column
-              v-for="(value, key) in dataPreviewList[0]"
+              v-for="(value, key) in dataPreviewList[0] ? dataPreviewList[0] : noDataTableDisplayFields"
               :key="key"
               :label="key"
               align="center"
@@ -852,6 +852,14 @@ export default {
         script: this.dataForm.script,
         paramsList: this.dataForm.paramsList
       }
+    },
+    noDataTableDisplayFields () {
+      // 表格列对象
+      const tableColumnObject = {}
+      this.structurePreviewList.forEach(item => {
+        tableColumnObject[item.fieldName] = ''
+      })
+      return tableColumnObject
     }
   },
   watch: {
diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index eb8d88f6..273775c7 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -297,8 +297,9 @@
                 <span>{{ field.fieldName }}</span>&nbsp;<span
                   v-show="field.fieldDesc"
                   style="color: #909399;"
-                >({{
-                  field.fieldDesc }})</span>
+                >
+                  ({{ field.fieldDesc }})
+                </span>
                 <el-button
                   class="edit_field"
                   type="text"
@@ -332,7 +333,7 @@
             class="bs-el-table bs-scrollbar"
           >
             <el-table-column
-              v-for="(value, key) in dataPreviewList[0]"
+              v-for="(value, key) in dataPreviewList[0] ? dataPreviewList[0] : noDataTableDisplayFields"
               :key="key"
               :label="key"
               align="center"
@@ -568,6 +569,16 @@ export default {
       isInit: false
     }
   },
+  computed: {
+    noDataTableDisplayFields () {
+      // 表格列对象
+      const tableColumnObject = {}
+      this.structurePreviewList.forEach(item => {
+        tableColumnObject[item.fieldName] = ''
+      })
+      return tableColumnObject
+    }
+  },
   watch: {
     'dataForm.fieldInfo': {
       handler (value) {
@@ -588,6 +599,7 @@ export default {
       deep: true,
       immediate: true
     }
+
   },
   mounted () {
     this.init()
@@ -671,9 +683,10 @@ export default {
       this.tableLoading = true
       datasetExecuteTest(executeParams).then((data) => {
         if (this.dataForm.fieldList == null) {
-          this.dataForm.fieldList = _.cloneDeep(res.structure)
+          this.dataForm.fieldList = _.cloneDeep(data.structure)
         }
         this.dataPreviewList = data.data.list
+        console.log(this.dataPreviewList)
         this.totalCount = data.data.totalCount
         this.tableLoading = false
       }).catch(() => {
@@ -810,6 +823,7 @@ export default {
      */
     queryAllField () {
       getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => {
+        console.log('data', data)
         const fieldDescMap = {}
         this.fieldList = data.map(field => {
           fieldDescMap[field.columnName] = field.columnComment
diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
index 7fd7ec4d..6610adb5 100644
--- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue
@@ -260,7 +260,7 @@
             class="bs-el-table bs-scrollbar"
           >
             <el-table-column
-              v-for="(value, key) in dataPreviewList[0]"
+              v-for="(value, key) in dataPreviewList[0] ? dataPreviewList[0] : noDataTableDisplayFields"
               :key="key"
               :label="key"
               align="center"
@@ -612,6 +612,16 @@ export default {
       fieldDesc: null // 字段描述
     }
   },
+  computed: {
+    noDataTableDisplayFields () {
+      // 表格列对象
+      const tableColumnObject = {}
+      this.structurePreviewList.forEach(item => {
+        tableColumnObject[item.fieldName] = ''
+      })
+      return tableColumnObject
+    }
+  },
   watch: {
     'dataForm.script' () {
       this.passTest = false
diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
index 76ed8272..d40cfbdf 100644
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@@ -288,7 +288,7 @@
             class="bs-el-table bs-scrollbar"
           >
             <el-table-column
-              v-for="(value, key) in dataPreviewList[0]"
+              v-for="(value, key) in dataPreviewList[0] ? dataPreviewList[0] : noDataTableDisplayFields"
               :key="key"
               :label="key"
               align="center"
@@ -673,6 +673,14 @@ export default {
         script: this.dataForm.script,
         paramsList: this.dataForm.paramsList
       }
+    },
+    noDataTableDisplayFields () {
+      // 表格列对象
+      const tableColumnObject = {}
+      this.structurePreviewList.forEach(item => {
+        tableColumnObject[item.fieldName] = ''
+      })
+      return tableColumnObject
     }
   },
   watch: {