github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11676 from dataease/pr@dev-v2@perf_threshold_new_chart

Browse Source 
perf(X-Pack): 新增视图未保存情况下设置阈值告警错误
This commit is contained in:
fit2cloud-chenyw 2024-08-21 19:00:08 +08:00 committed by GitHub
commit c4ccd5954b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
View File

@ -252,6 +252,7 @@ public class ChartViewManege {
public ChartBaseVO chartBaseInfo(Long id) { public ChartBaseVO chartBaseInfo(Long id) {
ChartBasePO po = extChartViewMapper.queryChart(id); ChartBasePO po = extChartViewMapper.queryChart(id);
if (ObjectUtils.isEmpty(po)) return null;
ChartBaseVO vo = BeanUtils.copyBean(new ChartBaseVO(), po); ChartBaseVO vo = BeanUtils.copyBean(new ChartBaseVO(), po);
TypeReference<List<ChartViewFieldDTO>> tokenType = new TypeReference<>() {}; TypeReference<List<ChartViewFieldDTO>> tokenType = new TypeReference<>() {};
vo.setXAxis(JsonUtil.parseList(po.getXAxis(), tokenType)); vo.setXAxis(JsonUtil.parseList(po.getXAxis(), tokenType));

2
de-xpack

@ -1 +1 @@
Subproject commit 8bd2d1244e9e2a41e7e37ac2840220af70167de5 Subproject commit 43b6ff1f0d11c1920e79ce082f35182a73fa17c2