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

fix(应用): 修复仪表板应用导出时，携带单独数据集定义的组件导入新环境组件会报错问题 #4620

Browse Source
This commit is contained in:
wangjiahao 2023-02-28 15:11:41 +08:00
parent 66f46ff7d5
commit d27d7e91d7
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -932,6 +932,28 @@ public class PanelGroupService {
}
}
}
// 兼容过滤组件使用独立的数据集情况
PanelGroupDTO panelGroupInfo = this.findOne(panelId);
String panelData = panelGroupInfo.getPanelData();
try {
if (StringUtils.isNotEmpty(panelData)) {
JSONArray panelDataArray = JSONObject.parseArray(panelData);
for (int i = 0; i < panelDataArray.size(); i++) {
JSONObject element = panelDataArray.getJSONObject(i);
if ("custom".equals(element.getString("type"))) {
JSONObject fieldsParent = element.getJSONObject("options").getJSONObject("attrs").getJSONObject("fieldsParent");
if (ObjectUtils.isNotEmpty(fieldsParent)) {
allTableIds.add(fieldsParent.getString("id"));
}
}
}
}
} catch (Exception e) {
//ignore
LogUtil.warn("custom component dataset id get error");
}
}
datasetTablesInfo = extDataSetTableMapper.findByTableIds(allTableIds);
//4.获取所有数据集字段信息