public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 13:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13839 from dataease/pr@dev-v2@fixds

Browse Source 
fix: 过滤器查询支持换行符
This commit is contained in:
taojinlong
2024-12-04 18:10:17 +08:00
committed by GitHub
parent 6740b8ea51 296bc694e1
commit 4ea6cc20de
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/engine/utils/SQLUtils.java
View File

@@ -7,7 +7,7 @@ import java.util.Optional;
*/
public class SQLUtils {
public static String transKeyword(String value) {
return Optional.ofNullable(value).orElse("").replaceAll("'", "''").replaceAll("\\\\","\\\\\\\\");
return Optional.ofNullable(value).orElse("").replaceAll("'", "''").replaceAll("\\\\","\\\\\\\\").replace("\n", "\\n");
}
public static String buildOriginPreviewSql(String sql, int limit, int offset) {

11
sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
View File

@@ -27,15 +27,4 @@ public class ChartExtFilterDTO {
private List<String> originValue;
private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数
public List<String> getValue() {
if (CollectionUtils.isNotEmpty(value)) {
List<String> values = new ArrayList<>();
value.forEach(v -> {
values.add(v.replace("\n", "\\n"));
});
return values;
}
return value;
}
}