From 602e375071d0eed44295c5103aacb5b4b1903d7d Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 12 May 2021 14:45:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):=E7=BC=96=E8=BE=91=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A9=E6=95=B0=E6=8D=AE=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/zh.js                       |  4 +-
 frontend/src/views/dataset/add/AddCustom.vue  | 49 ++++++++++++++-----
 frontend/src/views/dataset/add/AddExcel.vue   |  2 +-
 frontend/src/views/dataset/data/ViewTable.vue |  8 ++-
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index bc118254a5..23897aa5a3 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -815,7 +815,9 @@ export default {
     invalid_dataset: 'Kettle未运行，无效数据集',
     check_all: '全选',
     can_not_union_self: '被关联表不能与关联表相同',
-    float: '小数'
+    float: '小数',
+    edit_custom_table: '编辑自助数据集',
+    edit_field: '编辑字段'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index 2633e4c420..ddc55358fb 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -2,7 +2,7 @@
   <el-col>
     <el-row style="height: 26px;">
       <span style="line-height: 26px;">
-        {{ $t('dataset.add_custom_table') }}
+        {{ param.tableId?$t('dataset.edit_custom_table'):$t('dataset.add_custom_table') }}
       </span>
       <el-row style="float: right">
         <el-button size="mini" @click="cancel">
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { post } from '@/api/dataset/dataset'
+import { post, getTable } from '@/api/dataset/dataset'
 import DatasetGroupSelector from '../common/DatasetGroupSelector'
 import DatasetCustomField from '../common/DatasetCustomField'
 
@@ -89,15 +89,7 @@ export default {
   watch: {
     'checkedList': function() {
       // console.log(this.checkedList)
-      if (this.checkedList && this.checkedList.length > 0) {
-        // 根据第一个选择的数据集找到关联视图
-        post('dataset/union/listByTableId/' + this.checkedList[0].tableId, {}).then(response => {
-          // console.log(response)
-          this.unionData = response.data
-        })
-      } else {
-        this.unionData = []
-      }
+      this.getUnionData()
     }
   },
   mounted() {
@@ -105,6 +97,11 @@ export default {
       this.calHeight()
     }
     this.calHeight()
+
+    if (this.param && this.param.id && this.param.tableId) {
+      this.getCustomTable()
+      this.getUnionData()
+    }
   },
   methods: {
     calHeight() {
@@ -144,6 +141,9 @@ export default {
         }
       }
       // console.log(this.checkedList)
+      this.getData()
+    },
+    getData() {
       // request to get data
       if (this.checkedList.length > 0) {
         const table = {
@@ -169,6 +169,17 @@ export default {
         this.$refs.plxTable.reloadData(datas)
       }
     },
+    getUnionData() {
+      if (this.checkedList && this.checkedList.length > 0) {
+        // 根据第一个选择的数据集找到关联视图
+        post('dataset/union/listByTableId/' + this.checkedList[0].tableId, {}).then(response => {
+          // console.log(response)
+          this.unionData = response.data
+        })
+      } else {
+        this.unionData = []
+      }
+    },
     save() {
       const table = {
         id: this.param.tableId,
@@ -185,6 +196,22 @@ export default {
       })
     },
 
+    getCustomTable() {
+      getTable(this.param.tableId).then(response => {
+        const table = response.data
+        this.name = table.name
+        this.checkedList = JSON.parse(table.info).list
+
+        this.getCheckTable(this.checkedList[0].tableId)
+        this.getData()
+      })
+    },
+    getCheckTable(tableId) {
+      getTable(tableId).then(response => {
+        this.table = response.data
+      })
+    },
+
     cancel() {
       this.dataReset()
       this.$emit('switchComponent', { name: '' })
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index 7e860a5178..bb9799fd27 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -28,7 +28,7 @@
                   :multiple="false"
                   :show-file-list="false"
                   :file-list="fileList"
-                  accept=".xls,.xlsx,.csv"
+                  accept=".xls,.xlsx,"
                   :before-upload="beforeUpload"
                   :on-success="uploadSuccess"
                   :on-error="uploadFail"
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index f7f45a95d7..9244ff36a1 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -14,11 +14,14 @@
         </span>
       </el-popover>
       <el-row style="float: right">
+        <el-button v-if="table.type ==='custom'" size="mini" @click="editCustom">
+          {{ $t('dataset.edit_custom_table') }}
+        </el-button>
         <el-button v-if="table.type ==='sql'" size="mini" @click="editSql">
           {{ $t('dataset.edit_sql') }}
         </el-button>
         <el-button size="mini" @click="edit">
-          {{ $t('dataset.edit') }}
+          {{ $t('dataset.edit_field') }}
         </el-button>
         <!--        <el-button size="mini" type="primary" @click="createChart">-->
         <!--          {{$t('dataset.create_view')}}-->
@@ -116,6 +119,9 @@ export default {
     editSql() {
       this.$emit('switchComponent', { name: 'AddSQL', param: { id: this.table.sceneId, tableId: this.table.id }})
     },
+    editCustom() {
+      this.$emit('switchComponent', { name: 'AddCustom', param: { id: this.table.sceneId, tableId: this.table.id }})
+    },
 
     reSearch(val) {
       this.tableViewRowForm = val.form