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

fix[数据集]: 修复api数据源中，json格式字段保存为不标准json格式，导致无法通过计算字段的函数解析 #17772

Browse Source
This commit is contained in:
taojinlong
2026-01-22 21:15:09 +08:00
committed by taojinlong
parent 4313f2beb6
commit 0fefb82a60
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/core-backend/src/main/java/io/dataease/datasource/provider/ApiUtils.java
View File

@@ -610,6 +610,13 @@ public class ApiUtils {
}
for (Map<String, Object> field : fields) {
JSONArray array = new JSONArray();
String value = Optional.ofNullable(data.get(field.get("originName"))).orElse("").toString();
if (value.startsWith("{") && value.endsWith("}")) {
try {
value = objectMapper.writeValueAsString(data.get(field.get("originName")));
} catch (Exception e) {
}
}
if (field.get("value") != null) {
try {
TypeReference<JSONArray> listTypeReference = new TypeReference<JSONArray>() {
@@ -618,9 +625,9 @@ public class ApiUtils {
} catch (Exception e) {
DEException.throwException(e);
}
array.add(Optional.ofNullable(data.get(field.get("originName"))).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
array.add(value.replaceAll("\n", " ").replaceAll("\r", " "));
} else {
array.add(Optional.ofNullable(data.get(field.get("originName"))).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
array.add(value.replaceAll("\n", " ").replaceAll("\r", " "));
}
field.put("value", array);
}
@@ -838,7 +845,14 @@ public class ApiUtils {
String[] row = new String[apiDefinition.getFields().size()];
int i = 0;
for (TableField field : apiDefinition.getFields()) {
row[i] = Optional.ofNullable(data.get(field.getOriginName())).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ");
String value = Optional.ofNullable(data.get(field.getOriginName())).orElse("").toString();
if (value.startsWith("{") && value.endsWith("}")) {
try {
value = objectMapper.writeValueAsString(data.get(field.getOriginName()));
} catch (Exception e) {
}
}
row[i] = value.replaceAll("\n", " ").replaceAll("\r", " ");
i++;
}
dataList.add(row);