From 32502591df607c120f25b8fbfbfd21360b69b241 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 24 Feb 2021 18:06:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8A=BD=E8=B1=A1=EF=BC=8C=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E3=80=81=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 20 +++++++++++++++++--
 .../components/dataset/data/ViewTable.vue     |  4 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 67b66df352..470b532180 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -13,6 +13,7 @@ import io.dataease.base.mapper.DatasourceMapper;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.SessionUtils;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
+import io.dataease.datasource.constants.DatasourceTypes;
 import io.dataease.datasource.dto.TableFiled;
 import io.dataease.datasource.provider.DatasourceProvider;
 import io.dataease.datasource.provider.ProviderFactory;
@@ -21,9 +22,11 @@ import io.dataease.dto.dataset.DataTableInfoDTO;
 import jnr.ffi.Struct;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.python.apache.xerces.xs.StringList;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -99,7 +102,7 @@ public class DataSetTableService {
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
         String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable();
-        datasourceRequest.setQuery("SELECT * FROM " + table + ";");
+        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, new String[]{"*"}));
         return datasourceProvider.getData(datasourceRequest);
     }
 
@@ -117,7 +120,8 @@ public class DataSetTableService {
         List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
 
         String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new);
-        datasourceRequest.setQuery("SELECT " + StringUtils.join(fieldArray, ",") + " FROM " + table + " LIMIT 0,10;");
+//        datasourceRequest.setQuery("SELECT " + StringUtils.join(fieldArray, ",") + " FROM " + table + " LIMIT 0,10;");
+        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10;");
 
         List<String[]> data = new ArrayList<>();
         try {
@@ -163,4 +167,16 @@ public class DataSetTableService {
             }
         }
     }
+
+    public String createQuerySQL(String type, String table, String[] fields) {
+        DatasourceTypes datasourceType = DatasourceTypes.valueOf(type);
+        switch (datasourceType) {
+            case mysql:
+                return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(fields, ","), table);
+            case sqlServer:
+                return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(fields, ","), table);
+            default:
+                return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(fields, ","), table);
+        }
+    }
 }
diff --git a/frontend/src/business/components/dataset/data/ViewTable.vue b/frontend/src/business/components/dataset/data/ViewTable.vue
index 728f8d6a22..716273a406 100644
--- a/frontend/src/business/components/dataset/data/ViewTable.vue
+++ b/frontend/src/business/components/dataset/data/ViewTable.vue
@@ -36,12 +36,12 @@
       <el-table :data="tableFields" size="mini" max-height="600px">
         <el-table-column property="type" :label="$t('dataset.field_type')" width="100">
         </el-table-column>
-        <el-table-column property="name" :label="$t('dataset.field_name')" width="160">
+        <el-table-column property="name" :label="$t('dataset.field_name')" width="180">
           <template slot-scope="scope">
           <el-input v-model="scope.row.name" size="mini"></el-input>
           </template>
         </el-table-column>
-        <el-table-column property="originName" :label="$t('dataset.field_origin_name')" width="160">
+        <el-table-column property="originName" :label="$t('dataset.field_origin_name')" width="180">
         </el-table-column>
         <el-table-column property="checked" :label="$t('dataset.field_check')" width="80">
           <template slot-scope="scope">