From dcc522dc051c20f148edd9caf8f51d23f3f0db83 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 25 Feb 2021 09:59:18 +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     |  2 +-
 .../db/migration/V9__dataset_tables.sql          |  4 ++--
 .../components/dataset/data/ViewTable.vue        | 16 ++++++++--------
 frontend/src/i18n/en-US.js                       |  3 ++-
 frontend/src/i18n/zh-CN.js                       |  3 ++-
 frontend/src/i18n/zh-TW.js                       |  3 ++-
 6 files changed, 17 insertions(+), 14 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 470b532180..e36ce10a5b 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -121,7 +121,7 @@ public class DataSetTableService {
 
         String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new);
 //        datasourceRequest.setQuery("SELECT " + StringUtils.join(fieldArray, ",") + " FROM " + table + " LIMIT 0,10;");
-        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10;");
+        datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10");
 
         List<String[]> data = new ArrayList<>();
         try {
diff --git a/backend/src/main/resources/db/migration/V9__dataset_tables.sql b/backend/src/main/resources/db/migration/V9__dataset_tables.sql
index dfee9fea2f..42a58909cc 100644
--- a/backend/src/main/resources/db/migration/V9__dataset_tables.sql
+++ b/backend/src/main/resources/db/migration/V9__dataset_tables.sql
@@ -22,8 +22,8 @@ CREATE TABLE IF NOT EXISTS `dataset_table_field`
     `checked`        tinyint(1)   NOT NULL DEFAULT true COMMENT '是否选中',
     `column_index`   int(10)      NOT NULL COMMENT '列位置',
     `last_sync_time` bigint(13) COMMENT '同步时间',
-    PRIMARY KEY (`id`)
+    PRIMARY KEY (`id`),
+    KEY `IDX_TABLE_ID` (`table_id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4;
 
-ALTER TABLE `dataset_table_field` ADD INDEX IDX_TABLE_ID (`table_id`);
diff --git a/frontend/src/business/components/dataset/data/ViewTable.vue b/frontend/src/business/components/dataset/data/ViewTable.vue
index b9582cebc5..25d584c806 100644
--- a/frontend/src/business/components/dataset/data/ViewTable.vue
+++ b/frontend/src/business/components/dataset/data/ViewTable.vue
@@ -21,15 +21,15 @@
       <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="更新信息" name="updateInfo">
-        更新信息
+      <el-tab-pane :label="$t('dataset.update_info')" name="updateInfo">
+        更新信息TODO
       </el-tab-pane>
-<!--      <el-tab-pane label="tab3" name="tab3">-->
-<!--        tab3-->
-<!--      </el-tab-pane>-->
-<!--      <el-tab-pane label="tab4" name="tab4">-->
-<!--        tab4-->
-<!--      </el-tab-pane>-->
+      <!--      <el-tab-pane label="tab3" name="tab3">-->
+      <!--        tab3-->
+      <!--      </el-tab-pane>-->
+      <!--      <el-tab-pane label="tab4" name="tab4">-->
+      <!--        tab4-->
+      <!--      </el-tab-pane>-->
     </el-tabs>
 
     <el-dialog :title="table.name" :visible.sync="editField" :fullscreen="true" :show-close="false">
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 9c6a6c9670..d277e46652 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1553,6 +1553,7 @@ export default {
     field_type:'Field Type',
     field_name:'Field Name',
     field_origin_name:'Origin Name',
-    field_check:'Checked'
+    field_check:'Checked',
+    update_info:'Update Info'
   }
 };
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index d6f96bb22c..e162feca94 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1564,7 +1564,8 @@ export default {
     field_type:'字段类型',
     field_name:'字段名',
     field_origin_name:'原始名',
-    field_check:'选中'
+    field_check:'选中',
+    update_info:'更新信息'
   },
   datasource: {
     create: '新建数据连接',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 92f4343768..84727b20bd 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -1554,6 +1554,7 @@ export default {
     field_type:'字段類型',
     field_name:'字段名',
     field_origin_name:'原始名',
-    field_check:'選中'
+    field_check:'選中',
+    update_info:'更新信息'
   }
 };