|
|
@ -572,7 +572,7 @@ public abstract class DesignTableDataManager { |
|
|
|
parameter.setValue(parameterMap.get(parameter.getName())); |
|
|
|
parameter.setValue(parameterMap.get(parameter.getName())); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
addTemplateInfo(parameterMap); |
|
|
|
addTemplateInfoIfNeed(parameterMap); |
|
|
|
return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount); |
|
|
|
return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
throw new TableDataException(e.getMessage(), e); |
|
|
|
throw new TableDataException(e.getMessage(), e); |
|
|
@ -592,7 +592,7 @@ public abstract class DesignTableDataManager { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private static void addTemplateInfo(Map<String, Object> parameterMap) { |
|
|
|
private static void addTemplateInfoIfNeed(Map<String, Object> parameterMap) { |
|
|
|
if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { |
|
|
|
if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { |
|
|
|
parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); |
|
|
|
parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); |
|
|
|
} |
|
|
|
} |
|
|
@ -675,7 +675,7 @@ public abstract class DesignTableDataManager { |
|
|
|
if (needLoadingBar) { |
|
|
|
if (needLoadingBar) { |
|
|
|
MultiResultTableDataWrapper.loadingBar.start(); |
|
|
|
MultiResultTableDataWrapper.loadingBar.start(); |
|
|
|
} |
|
|
|
} |
|
|
|
addTemplateInfo(parameterMap); |
|
|
|
addTemplateInfoIfNeed(parameterMap); |
|
|
|
return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0); |
|
|
|
return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|