|
|
@ -32,6 +32,7 @@ import com.fr.file.TableDataConfig; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.data.DataModel; |
|
|
|
import com.fr.general.data.DataModel; |
|
|
|
import com.fr.general.data.TableDataException; |
|
|
|
import com.fr.general.data.TableDataException; |
|
|
|
|
|
|
|
import com.fr.general.sql.sqlnote.SqlNoteConstants; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
import com.fr.module.ModuleContext; |
|
|
|
import com.fr.module.ModuleContext; |
|
|
|
import com.fr.script.Calculator; |
|
|
|
import com.fr.script.Calculator; |
|
|
@ -571,7 +572,7 @@ public abstract class DesignTableDataManager { |
|
|
|
parameter.setValue(parameterMap.get(parameter.getName())); |
|
|
|
parameter.setValue(parameterMap.get(parameter.getName())); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
parameterMap.put("templateName", HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); |
|
|
|
parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); |
|
|
|
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); |
|
|
|