Browse Source

REPORT-135341 【fr-fbp回归】树数据集构造失败 & REPORT-135830 【fr-fbp回归】新建关联数据集,直接预览空白,保存再编辑可正常预览

fbp/merge
Destiny.Lin 6 months ago
parent
commit
e82960f9a3
  1. 13
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

13
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@ -627,12 +627,15 @@ public abstract class DesignTableDataManager {
}
private static boolean checkBean(PreviewSourceBean bean, TableData tableData) {
if (tableData instanceof ConditionTableData || tableData instanceof RecursionTableData) {
bean.getDataSource().putTableData(StringUtils.EMPTY, tableData);
return true;
if (bean.getDataName().isEmpty()) {
if (tableData instanceof ConditionTableData || tableData instanceof RecursionTableData) {
bean.getDataSource().putTableData(StringUtils.EMPTY, tableData);
return true;
}
// dataName为空并且不为特殊的数据集说明是新建的,得用tabledata传
return false;
}
// dataName为空说明是新建的,得用tabledata传
return !bean.getDataName().isEmpty();
return true;
}
private static boolean needInputParams(boolean mustInputParameters, ParameterProvider[] parameters) {

Loading…
Cancel
Save