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 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 @@ - + {{ $t('chart.change_chart_type') }} @@ -210,7 +210,7 @@ {{ $t('chart.result_mode_all') }} - +