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

fix: 过滤器多条件异常问题；编辑数据集切换到添加数据集界面异常问题

Browse Source
This commit is contained in:
junjie 2021-07-28 11:41:06 +08:00
parent 62301c881d
commit 89a7d4b311
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -138,14 +138,16 @@ public class ChartViewService {
}.getType()); }.getType());
List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() { List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
}.getType()); }.getType());
List<ChartCustomFilterDTO> customFilter = fieldCustomFilter.stream().map(ele -> { List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
ChartCustomFilterDTO dto = new ChartCustomFilterDTO(); for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
ele.getFilter().forEach(f -> { List<ChartCustomFilterDTO> collect = ele.getFilter().stream().map(f -> {
ChartCustomFilterDTO dto = new ChartCustomFilterDTO();
BeanUtils.copyBean(dto, f); BeanUtils.copyBean(dto, f);
dto.setField(dataSetTableFieldsService.get(f.getFieldId())); dto.setField(dataSetTableFieldsService.get(f.getFieldId()));
}); return dto;
return dto; }).collect(Collectors.toList());
}).collect(Collectors.toList()); customFilter.addAll(collect);
}
if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) { if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
xAxis = new ArrayList<>(); xAxis = new ArrayList<>();

2
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -284,7 +284,7 @@ export default {
cancel() { cancel() {
// this.dataReset() // this.dataReset()
if (this.param.tableId) { if (this.param.tableId) {
this.$emit('switchComponent', { name: 'ViewTable', param: this.param.table}) this.$emit('switchComponent', { name: 'ViewTable', param: this.param.table })
} else { } else {
this.$emit('switchComponent', { name: '' }) this.$emit('switchComponent', { name: '' })
} }