From 9085de668fa91d1af7fb4e3eec2ef29f2057a7b2 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 25 Feb 2021 10:42:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  |  9 +++-
 .../business/components/dataset/DataSet.vue   | 44 +++++++++----------
 .../dataset/{data => add}/AddDB.vue           |  0
 .../components/dataset/data/ViewTable.vue     |  5 ++-
 .../src/business/components/dataset/router.js |  3 +-
 frontend/src/i18n/en-US.js                    |  3 +-
 frontend/src/i18n/zh-CN.js                    | 13 +++---
 frontend/src/i18n/zh-TW.js                    |  3 +-
 8 files changed, 47 insertions(+), 33 deletions(-)
 rename frontend/src/business/components/dataset/{data => add}/AddDB.vue (100%)

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 e36ce10a5b..7ddd18503b 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -102,7 +102,14 @@ public class DataSetTableService {
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
         String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable();
-        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, new String[]{"*"}));
+
+        DatasetTableField datasetTableField = new DatasetTableField();
+        datasetTableField.setTableId(dataSetTableRequest.getId());
+        datasetTableField.setChecked(Boolean.TRUE);
+        List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
+        String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new);
+        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray));
+
         return datasourceProvider.getData(datasourceRequest);
     }
 
diff --git a/frontend/src/business/components/dataset/DataSet.vue b/frontend/src/business/components/dataset/DataSet.vue
index e0c29585ef..337fa954d5 100644
--- a/frontend/src/business/components/dataset/DataSet.vue
+++ b/frontend/src/business/components/dataset/DataSet.vue
@@ -1,33 +1,33 @@
 <template>
-  <ms-container>
+<ms-container>
 
-    <ms-aside-container>
-      <group/>
-    </ms-aside-container>
+  <ms-aside-container>
+    <group/>
+  </ms-aside-container>
 
-    <ms-main-container>
-      <keep-alive>
-        <router-view/>
-      </keep-alive>
-    </ms-main-container>
-  </ms-container>
+  <ms-main-container>
+    <keep-alive>
+      <router-view/>
+    </keep-alive>
+  </ms-main-container>
+</ms-container>
 </template>
 
 <script>
-  import MsMainContainer from "../common/components/MsMainContainer";
-  import MsContainer from "../common/components/MsContainer";
-  import MsAsideContainer from "../common/components/MsAsideContainer";
-  import MsSettingMenu from "../settings/SettingMenu";
-  import MsCurrentUser from "../settings/CurrentUser";
-  import Group from "./group/Group";
+import MsMainContainer from "../common/components/MsMainContainer";
+import MsContainer from "../common/components/MsContainer";
+import MsAsideContainer from "../common/components/MsAsideContainer";
+import MsSettingMenu from "../settings/SettingMenu";
+import MsCurrentUser from "../settings/CurrentUser";
+import Group from "./group/Group";
 
-  export default {
-    name: "DataSet",
-    components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser, Group},
-    data() {
-      return {}
-    }
+export default {
+  name: "DataSet",
+  components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser, Group},
+  data() {
+    return {}
   }
+}
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/dataset/data/AddDB.vue b/frontend/src/business/components/dataset/add/AddDB.vue
similarity index 100%
rename from frontend/src/business/components/dataset/data/AddDB.vue
rename to frontend/src/business/components/dataset/add/AddDB.vue
diff --git a/frontend/src/business/components/dataset/data/ViewTable.vue b/frontend/src/business/components/dataset/data/ViewTable.vue
index 25d584c806..8a131a9fbe 100644
--- a/frontend/src/business/components/dataset/data/ViewTable.vue
+++ b/frontend/src/business/components/dataset/data/ViewTable.vue
@@ -21,8 +21,11 @@
       <el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
         <tab-data-preview :table="table" :fields="fields" :data="data"/>
       </el-tab-pane>
+      <el-tab-pane :label="$t('dataset.join_view')" name="joinView">
+        关联视图 TODO
+      </el-tab-pane>
       <el-tab-pane :label="$t('dataset.update_info')" name="updateInfo">
-        更新信息TODO
+        更新信息 TODO
       </el-tab-pane>
       <!--      <el-tab-pane label="tab3" name="tab3">-->
       <!--        tab3-->
diff --git a/frontend/src/business/components/dataset/router.js b/frontend/src/business/components/dataset/router.js
index 1556fcc4f6..742b0619a3 100644
--- a/frontend/src/business/components/dataset/router.js
+++ b/frontend/src/business/components/dataset/router.js
@@ -1,7 +1,8 @@
 const DataSet = () => import('@/business/components/dataset/DataSet');
 const DataSetHome = () => import('@/business/components/dataset/data/DataHome');
-const DataSetAddDB = () => import('@/business/components/dataset/data/AddDB');
 const DataSetTable = () => import('@/business/components/dataset/data/ViewTable');
+
+const DataSetAddDB = () => import('@/business/components/dataset/add/AddDB');
 // const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome')
 // const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest')
 // const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList')
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d277e46652..571b5d7fc2 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1554,6 +1554,7 @@ export default {
     field_name:'Field Name',
     field_origin_name:'Origin Name',
     field_check:'Checked',
-    update_info:'Update Info'
+    update_info:'Update Info',
+    join_view: 'Relation View'
   }
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e162feca94..c564d6b346 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1560,12 +1560,13 @@ export default {
     table: '表',
     edit: '编辑',
     create_view: '创建视图',
-    data_preview:'数据预览',
-    field_type:'字段类型',
-    field_name:'字段名',
-    field_origin_name:'原始名',
-    field_check:'选中',
-    update_info:'更新信息'
+    data_preview: '数据预览',
+    field_type: '字段类型',
+    field_name: '字段名',
+    field_origin_name: '原始名',
+    field_check: '选中',
+    update_info: '更新信息',
+    join_view: '关联视图'
   },
   datasource: {
     create: '新建数据连接',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 84727b20bd..3232872ae3 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1555,6 +1555,7 @@ export default {
     field_name:'字段名',
     field_origin_name:'原始名',
     field_check:'選中',
-    update_info:'更新信息'
+    update_info:'更新信息',
+    join_view: '關聯視圖'
   }
 };