From 05710c4cad60e615ff03a32e4bb20fbe51a7dc9e Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 9 Nov 2021 11:16:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=86=E5=9B=BE=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E7=B1=BB=E5=9E=8B=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableController.java        | 18 ++++++++++++------
 .../service/dataset/DataSetTableService.java   |  6 ++++++
 frontend/src/views/chart/view/ChartEdit.vue    |  4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 58add3eb9d..9c2dcbfebc 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -41,9 +41,9 @@ public class DataSetTableController {
     @ApiOperation("更新")
     @PostMapping("update")
     public void save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
-        if(datasetTable.getType().equalsIgnoreCase("excel")){
+        if (datasetTable.getType().equalsIgnoreCase("excel")) {
             dataSetTableService.saveExcel(datasetTable);
-        }else {
+        } else {
             dataSetTableService.save(datasetTable);
         }
     }
@@ -53,10 +53,10 @@ public class DataSetTableController {
     public void alter(@RequestBody DataSetTableRequest request) throws Exception {
         dataSetTableService.alter(request);
     }
-    
+
     @ApiOperation("删除")
     @PostMapping("delete/{id}")
-    public void delete( @ApiParam(name = "id", value = "数据集ID", required = true)  @PathVariable String id) throws Exception {
+    public void delete(@ApiParam(name = "id", value = "数据集ID", required = true) @PathVariable String id) throws Exception {
         dataSetTableService.delete(id);
     }
 
@@ -132,9 +132,9 @@ public class DataSetTableController {
         return dataSetTableService.getDatasetDetail(id);
     }
 
-//    @ApiOperation("excel上传")
+    //    @ApiOperation("excel上传")
     @PostMapping("excel/upload")
-    public ExcelFileData excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId, @RequestParam("editType") Integer editType ) throws Exception {
+    public ExcelFileData excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId, @RequestParam("editType") Integer editType) throws Exception {
         return dataSetTableService.excelSaveAndParse(file, tableId, editType);
     }
 
@@ -149,4 +149,10 @@ public class DataSetTableController {
     public List<DataSetTableDTO> search(@RequestBody DataSetTableRequest dataSetTableRequest) {
         return dataSetTableService.search(dataSetTableRequest);
     }
+
+    @ApiOperation("数据集同步表结构")
+    @PostMapping("syncField/{id}")
+    public DatasetTable syncDatasetTableField(@PathVariable String id) throws Exception {
+        return dataSetTableService.syncDatasetTableField(id);
+    }
 }
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 77f125170f..44cda67e50 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1659,4 +1659,10 @@ public class DataSetTableService {
             return true;
         }
     }
+
+    public DatasetTable syncDatasetTableField(String id) throws Exception {
+        DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(id);
+        saveTableField(datasetTable);
+        return datasetTable;
+    }
 }
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9ae0236e1c..96d3e7e7a1 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -150,7 +150,7 @@
                           <!--                            </span>-->
                           <!--                          </el-row>-->
                         </div>
-                        <el-button slot="reference" size="mini" style="padding: 6px;">
+                        <el-button slot="reference" size="mini" style="padding: 6px;" :disabled="!hasDataPermission('manage',param.privileges)">
                           {{ $t('chart.change_chart_type') }}
                           <i class="el-icon-caret-bottom" />
                         </el-button>
@@ -210,7 +210,7 @@
                       <el-radio-group v-model="view.resultMode" class="radio-span" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" @change="save">
                         <el-radio label="all"><span>{{ $t('chart.result_mode_all') }}</span></el-radio>
                         <el-radio label="custom">
-                          <el-input v-model="view.resultCount" class="result-count" size="mini" @change="save" />
+                          <el-input v-model="view.resultCount" class="result-count" size="mini" :disabled="!hasDataPermission('manage',param.privileges)" @change="save" />
                         </el-radio>
                       </el-radio-group>
                     </el-row>