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

Merge pull request #9457 from dataease/pr@dev@fix_filter_empty_tree_node

Browse Source 
fix(过滤组件): 树形过滤器过滤掉所有节点为空的子树
This commit is contained in:
fit2cloud-chenyw 2024-04-29 17:29:29 +08:00 committed by GitHub
commit cd701f1c4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
View File

@ -226,10 +226,19 @@ public class DirectFieldService implements DataSetFieldService {
if (CollectionUtils.isNotEmpty(rows) && existExtSortField && originSize > 0) {
rows = rows.stream().map(row -> ArrayUtils.subarray(row, 0, originSize)).collect(Collectors.toList());
}
rows = rows.stream().filter(row -> {
int length = row.length;
boolean allEmpty = true;
for (String s : row) {
if (StringUtils.isNotBlank(s)) {
allEmpty = false;
}
}
return !allEmpty;
}).collect(Collectors.toList());
List<BaseTreeNode> treeNodes = rows.stream().map(row -> buildTreeNode(row, pkSet)).flatMap(Collection::stream).collect(Collectors.toList());
List tree = TreeUtils.mergeDuplicateTree(treeNodes, TreeUtils.DEFAULT_ROOT);
return tree;
}
private List<BaseTreeNode> buildTreeNode(String[] row, Set<String> pkSet) {
@ -239,12 +248,12 @@ public class DirectFieldService implements DataSetFieldService {
String text = row[i];
parentPkList.add(text);
String val = parentPkList.stream().collect(Collectors.joining(TreeUtils.SEPARATOR));
String val = String.join(TreeUtils.SEPARATOR, parentPkList);
String parentVal = i == 0 ? TreeUtils.DEFAULT_ROOT : row[i - 1];
String pk = parentPkList.stream().collect(Collectors.joining(TreeUtils.SEPARATOR));
String pk = String.join(TreeUtils.SEPARATOR, parentPkList);
if (pkSet.contains(pk)) continue;
pkSet.add(pk);
BaseTreeNode node = new BaseTreeNode(val, parentVal, text, pk + TreeUtils.SEPARATOR + i);
BaseTreeNode node = new BaseTreeNode(val, parentVal, StringUtils.isNotBlank(text) ? text.trim() : text, pk + TreeUtils.SEPARATOR + i);
nodes.add(node);
}
return nodes;