From 9c09d8f8fcdf8fd6956ef7567a01b7a423f35364 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 30 Apr 2021 16:18:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A1=A8=E6=90=9C=E7=B4=A2fix=EF=BC=9B=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0excel=E5=A2=9E=E5=8A=A0=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/zh.js                     |  3 ++-
 frontend/src/views/dataset/add/AddDB.vue    |  2 +-
 frontend/src/views/dataset/add/AddExcel.vue | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index e2b6d45c54..277dfd4516 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -797,7 +797,8 @@ export default {
     preview_total: '共',
     pls_input_less_9: '请输入9位以内的正整数',
     field_edit: '编辑字段',
-    table_already_add_to: '该表已添加至'
+    table_already_add_to: '该表已添加至',
+    uploading: '上传中...'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index 9ca2ea01f6..1d3fa828ae 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -90,7 +90,7 @@ export default {
     },
     searchTable(val) {
       if (val && val !== '') {
-        this.tableData = JSON.parse(JSON.stringify(this.tables.filter(ele => { return ele.includes(val) })))
+        this.tableData = JSON.parse(JSON.stringify(this.tables.filter(ele => { return ele.name.includes(val) })))
       } else {
         this.tableData = JSON.parse(JSON.stringify(this.tables))
       }
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index d75af82b90..7e860a5178 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -29,11 +29,16 @@
                   :show-file-list="false"
                   :file-list="fileList"
                   accept=".xls,.xlsx,.csv"
+                  :before-upload="beforeUpload"
                   :on-success="uploadSuccess"
+                  :on-error="uploadFail"
                   name="file"
                   :headers="headers"
                 >
-                  <el-button size="mini" type="primary">{{ $t('dataset.upload_file') }}</el-button>
+                  <el-button size="mini" type="primary" :disabled="uploading">
+                    <span v-if="!uploading" style="font-size: 12px;">{{ $t('dataset.upload_file') }}</span>
+                    <span v-if="uploading" style="font-size: 12px;"><i class="el-icon-loading" /> {{ $t('dataset.uploading') }}</span>
+                  </el-button>
                 </el-upload>
               </el-form-item>
             </el-form>
@@ -96,7 +101,8 @@ export default {
       fileList: [],
       headers: { Authorization: token },
       baseUrl: process.env.VUE_APP_BASE_API,
-      path: ''
+      path: '',
+      uploading: false
     }
   },
   watch: {
@@ -121,6 +127,12 @@ export default {
         that.height = currentHeight - 56 - 30 - 26 - 25 - 35 - 10 - 37 - 20 - 10
       }, 10)
     },
+    beforeUpload(file) {
+      this.uploading = true
+    },
+    uploadFail(response, file, fileList) {
+      this.uploading = false
+    },
     uploadSuccess(response, file, fileList) {
       // console.log(response)
       // console.log(file)
@@ -135,6 +147,7 @@ export default {
         this.name = file.name.substring(0, file.name.lastIndexOf('.'))
       }
       this.fileList = fileList
+      this.uploading = false
     },
 
     save() {