|
|
|
@ -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) { |
|
|
|
|