提交 902ac5bb authored 作者: junjie's avatar junjie

feat(视图):视图保留实时计算与渲染功能,但不实时保存,提供保存与重置按钮

上级 a4e515c1
...@@ -3,6 +3,7 @@ package io.dataease.controller.chart; ...@@ -3,6 +3,7 @@ package io.dataease.controller.chart;
import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.base.domain.ChartViewWithBLOBs; import io.dataease.base.domain.ChartViewWithBLOBs;
import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.AuthUtils;
import io.dataease.controller.request.chart.ChartCalRequest;
import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.controller.request.chart.ChartViewRequest; import io.dataease.controller.request.chart.ChartViewRequest;
import io.dataease.controller.response.ChartDetail; import io.dataease.controller.response.ChartDetail;
...@@ -100,4 +101,10 @@ public class ChartViewController { ...@@ -100,4 +101,10 @@ public class ChartViewController {
public List<ChartViewDTO> search(@RequestBody ChartViewRequest chartViewRequest) { public List<ChartViewDTO> search(@RequestBody ChartViewRequest chartViewRequest) {
return chartViewService.search(chartViewRequest); return chartViewService.search(chartViewRequest);
} }
@ApiOperation("计算结果")
@PostMapping("/calcData")
public ChartViewDTO calcData(@RequestBody ChartCalRequest request) throws Exception {
return chartViewService.calcData(request.getView(), request.getRequestList());
}
} }
package io.dataease.controller.request.chart;
import io.dataease.base.domain.ChartViewWithBLOBs;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author gin
* @Date 2021/11/10 11:27 上午
*/
@Data
public class ChartCalRequest {
@ApiModelProperty("视图")
private ChartViewWithBLOBs view;
@ApiModelProperty("额外请求参数")
private ChartExtRequest requestList;
}
...@@ -179,6 +179,10 @@ public class ChartViewService { ...@@ -179,6 +179,10 @@ public class ChartViewService {
public ChartViewDTO getData(String id, ChartExtRequest requestList) throws Exception { public ChartViewDTO getData(String id, ChartExtRequest requestList) throws Exception {
ChartViewWithBLOBs view = chartViewMapper.selectByPrimaryKey(id); ChartViewWithBLOBs view = chartViewMapper.selectByPrimaryKey(id);
return calcData(view, requestList);
}
public ChartViewDTO calcData(ChartViewWithBLOBs view, ChartExtRequest requestList) throws Exception {
if (ObjectUtils.isEmpty(view)) { if (ObjectUtils.isEmpty(view)) {
throw new RuntimeException(Translator.get("i18n_chart_delete")); throw new RuntimeException(Translator.get("i18n_chart_delete"));
} }
...@@ -424,7 +428,7 @@ public class ChartViewService { ...@@ -424,7 +428,7 @@ public class ChartViewService {
data = datasourceProvider.getData(datasourceRequest); data = datasourceProvider.getData(datasourceRequest);
} else { } else {
try { try {
data = cacheViewData(datasourceProvider, datasourceRequest, id); data = cacheViewData(datasourceProvider, datasourceRequest, view.getId());
} catch (Exception e) { } catch (Exception e) {
LogUtil.error(e); LogUtil.error(e);
} finally { } finally {
......
...@@ -969,7 +969,8 @@ export default { ...@@ -969,7 +969,8 @@ export default {
preview: 'Preview', preview: 'Preview',
next: 'Next', next: 'Next',
select_dataset: 'Select Dataset', select_dataset: 'Select Dataset',
select_chart_type: 'Select Chart Type' select_chart_type: 'Select Chart Type',
recover: 'Reset'
}, },
dataset: { dataset: {
sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default', sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
......
...@@ -970,7 +970,8 @@ export default { ...@@ -970,7 +970,8 @@ export default {
preview: '上一步', preview: '上一步',
next: '下一步', next: '下一步',
select_dataset: '選擇數據集', select_dataset: '選擇數據集',
select_chart_type: '選擇圖表類型' select_chart_type: '選擇圖表類型',
recover: '重置'
}, },
dataset: { dataset: {
sheet_warn: '有多個 Sheet 頁,默認抽取第一個', sheet_warn: '有多個 Sheet 頁,默認抽取第一個',
......
...@@ -973,7 +973,8 @@ export default { ...@@ -973,7 +973,8 @@ export default {
preview: '上一步', preview: '上一步',
next: '下一步', next: '下一步',
select_dataset: '选择数据集', select_dataset: '选择数据集',
select_chart_type: '选择图表类型' select_chart_type: '选择图表类型',
recover: '重置'
}, },
dataset: { dataset: {
sheet_warn: '有多个 Sheet 页,默认抽取第一个', sheet_warn: '有多个 Sheet 页,默认抽取第一个',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论