From d40875bf602423f9aabfa4eb854ad7ade09c2e7d Mon Sep 17 00:00:00 2001
From: "liu.tao3" <liu.tao3@ustcinfo.com>
Date: Fri, 28 Jul 2023 09:15:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9sql=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/OriginalEditForm.vue                  | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index 98324d1b..6b6d83d4 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -655,7 +655,7 @@ export default {
     getData () {
       const executeParams = {
         dataSourceId: this.dataForm.sourceId,
-        script: this.getSql(),
+        script: this.dataForm.fieldInfo.join(','),
         // 原始表数据集没有数据集参数
         params: [],
         dataSetType: 'original',
@@ -673,23 +673,6 @@ export default {
         this.tableLoading = false
       })
     },
-    /**
-     * 组装sql
-     * @returns {string}
-     */
-    getSql () {
-      let sql = 'SELECT '
-      if (this.dataForm.repeatStatus === 1) {
-        sql += ' DISTINCT '
-      }
-      if (this.dataForm.fieldInfo.length > 0) {
-        sql += this.dataForm.fieldInfo.join(',')
-      } else {
-        sql += '*'
-      }
-      sql += ` FROM ${this.dataForm.tableName}`
-      return sql
-    },
     /**
      * 保存数据集
      * @param formName 表单名称
@@ -820,7 +803,6 @@ export default {
       getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => {
         const fieldDescMap = {}
         this.fieldList = data.map(field => {
-          field.columnName = '`' + field.columnName + '`'
           fieldDescMap[field.columnName] = field.columnComment
           field.isCheck = false
           if (this.dataForm.fieldInfo.includes(field.columnName)) {
@@ -874,7 +856,7 @@ export default {
       if (!this.dataForm.sourceId || !this.dataForm.tableName) return
       const executeParams = {
         dataSourceId: this.dataForm.sourceId,
-        script: this.getSql(),
+        script: this.dataForm.fieldInfo.join(','),
         // 原始表数据集没有数据集参数
         params: [],
         dataSetType: 'original',