center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #10015 from dataease/pr@dev-v2_export_data

Browse Source 
Pr@dev v2 export data
This commit is contained in:
taojinlong 2024-05-31 18:13:04 +08:00 committed by GitHub
commit 761dc2818b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

@ -160,7 +160,7 @@ public class ExportCenterManage {
exportTaskMapper.updateById(exportTask);
FileUtils.deleteDirectoryRecursively(exportData_path + id);
if (exportTask.getExportFromType().equalsIgnoreCase("chart")) {
ChartExcelRequest request = JsonUtil.parse(exportTask.getParams(), ChartExcelRequest.class);
ChartExcelRequest request = JsonUtil.parseObject(exportTask.getParams(), ChartExcelRequest.class);
startViewTask(exportTask, request);
}
}

2
core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
View File

@ -426,7 +426,7 @@ defineExpose({
</div>
</el-button>
<el-tooltip effect="dark" content="重新导出" placement="top">
<el-button text @click="retry(scope.row)">
<el-button v-if="scope.row.exportStatus === 'FAILED'" text @click="retry(scope.row)">
<template #icon>
<Icon name="icon_refresh_outlined"></Icon>
</template>

4
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java
View File

@ -2,8 +2,6 @@ package io.dataease.api.permissions.dataset.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.dataease.api.permissions.dataset.dto.DataSetColumnPermissionsDTO;
import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
import io.dataease.api.permissions.dataset.dto.Item;
import io.dataease.auth.DeApiPath;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -19,7 +17,7 @@ import static io.dataease.constant.AuthResourceEnum.DATASET;
public interface ColumnPermissionsApi {
@GetMapping("/pager/{datasetId}/{goPage}/{pageSize}")
public IPage<DataSetColumnPermissionsDTO> columnPermissions(@PathVariable Long datasetId, @PathVariable int goPage, @PathVariable int pageSize);
public IPage<DataSetColumnPermissionsDTO> columnPermissions(@PathVariable("datasetId") Long datasetId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize);
@PostMapping("save")
public void save(@RequestBody DataSetColumnPermissionsDTO dataSetColumnPermissionsDTO);

4
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java
View File

@ -18,7 +18,7 @@ import static io.dataease.constant.AuthResourceEnum.DATASET;
public interface RowPermissionsApi {
@GetMapping("/pager/{datasetId}/{goPage}/{pageSize}")
public IPage<DataSetRowPermissionsTreeDTO> rowPermissions(@PathVariable Long datasetId, @PathVariable int goPage, @PathVariable int pageSize);
public IPage<DataSetRowPermissionsTreeDTO> rowPermissions(@PathVariable("datasetId") Long datasetId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize);
@PostMapping("save")
@ -30,7 +30,7 @@ public interface RowPermissionsApi {
@GetMapping("/authObjs/{datasetId}/{type}")
public List<Item> authObjs(@PathVariable Long datasetId, @PathVariable String type);
public List<Item> authObjs(@PathVariable("datasetId") Long datasetId, @PathVariable("type") String type);
@PostMapping("/dataSetRowPermissionInfo")
public DataSetRowPermissionsTreeDTO dataSetRowPermissionInfo(@RequestBody DataSetRowPermissionsTreeDTO request);

6
sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java
View File

@ -32,11 +32,11 @@ public interface SysVariablesApi {
@Operation(summary = "删除")
@GetMapping("/delete/{id}")
void delete(@PathVariable Long id);
void delete(@PathVariable("id") Long id);
@Operation(summary = "详细信息")
@GetMapping("/detail/{id}")
SysVariableDto detail(@PathVariable Long id);
SysVariableDto detail(@PathVariable("id") Long id);
@Operation(summary = "查询")
@PostMapping("/query")
@ -52,7 +52,7 @@ public interface SysVariablesApi {
@Operation(summary = "删除")
@GetMapping("/value/delete/{id}")
void deleteValue(@PathVariable String id);
void deleteValue(@PathVariable("id") String id);
@GetMapping("/value/selected/{id}")
List<SysVariableValueDto> selectVariableValue(@PathVariable("id") Long id);