From 8fffb3d78a7c463f710b580fb67b279e7b2a6715 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 30 Sep 2021 16:28:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E3=80=91=E6=B7=BB=E5=8A=A0=20Excel=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=EF=BC=8C=E5=8A=A0=E5=85=A5=E4=B8=8A=E4=BC=A0=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                     |  5 ++++-
 frontend/src/lang/tw.js                     |  5 ++++-
 frontend/src/lang/zh.js                     |  5 ++++-
 frontend/src/views/dataset/add/AddExcel.vue | 10 ++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a221fedaf1..897ee08bd9 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1100,7 +1100,10 @@ export default {
     no_merge: 'Dont Merge',
     merge_msg: 'If the fields in the data table are consistent, merge them into one data set?',
     merge_title: 'Merge data',
-    field_name_less_50: 'Field name can not more 50 chars.'
+    field_name_less_50: 'Field name can not more 50 chars.',
+    excel_info_1: '1、Merged cells cannot exist in the file；',
+    excel_info_2: '2、The first line of the file is the title line, which cannot be empty or date；',
+    excel_info_3: '3、The file size shall not exceed 500m。'
   },
   datasource: {
     datasource: 'Data Source',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index e732859e5c..17b8758368 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1101,7 +1101,10 @@ export default {
     no_merge: '不合並',
     merge_msg: '數據表中存在字段一致的情況，是否合並到一個數據集中?',
     merge_title: '合並數據',
-    field_name_less_50: '字段名不能超過50個字符'
+    field_name_less_50: '字段名不能超過50個字符',
+    excel_info_1: '1、文件終不能存在合併單元格；',
+    excel_info_2: '2、文件的第一行為標題行，不能為空，不能為日期；',
+    excel_info_3: '3、文件不超過500M。'
   },
   datasource: {
     datasource: '數據源',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 75e407dc8b..db5e84b5ce 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1101,7 +1101,10 @@ export default {
     no_merge: '不合并',
     merge_msg: '数据表中存在字段一致的情况，是否合并到一个数据集中?',
     merge_title: '合并数据',
-    field_name_less_50: '字段名不能超过50个字符'
+    field_name_less_50: '字段名不能超过50个字符',
+    excel_info_1: '1、文件中不能存在合并单元格；',
+    excel_info_2: '2、文件的第一行为标题行，不能为空，不能为日期型；',
+    excel_info_3: '3、Excel文件大小请确保在500M以内。'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index b7f71b5c76..97de738753 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -5,6 +5,16 @@
         <span style="line-height: 26px;">
           {{ param.tableId?$t('dataset.edit_excel_table'):$t('dataset.add_excel_table') }}
         </span>
+        <span style="line-height: 26px;">
+          <el-tooltip class="item" effect="dark" content="Right Bottom 提示文字" placement="bottom">
+            <div slot="content">
+              {{$t('dataset.excel_info_1')}}<br/>
+              {{$t('dataset.excel_info_2')}}<br/>
+              {{$t('dataset.excel_info_3')}}
+            </div>
+            <i class="el-icon-info" style="cursor: pointer;"></i>
+          </el-tooltip>
+        </span>
         <el-row style="float: right">
           <el-button size="mini" @click="cancel">
             {{ $t('dataset.cancel') }}