|
|
@ -586,13 +586,13 @@ public abstract class DesignTableDataManager { |
|
|
|
TableDataSource source = TableDataSourceTailor.extractTableData(tableDataSource); |
|
|
|
TableDataSource source = TableDataSourceTailor.extractTableData(tableDataSource); |
|
|
|
bean.setDataSource(source); |
|
|
|
bean.setDataSource(source); |
|
|
|
bean.setDataName(DataOperator.getTableDataName(source, tabledata)); |
|
|
|
bean.setDataName(DataOperator.getTableDataName(source, tabledata)); |
|
|
|
bean.setParameterMap(parameterMap); |
|
|
|
bean.setConvertMap(parameterMap); |
|
|
|
if (checkBean(bean)) { |
|
|
|
if (checkBean(bean)) { |
|
|
|
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(bean).getTableData(); |
|
|
|
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(bean).getTableData(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
PreviewDataBean dataBean = new PreviewDataBean(); |
|
|
|
PreviewDataBean dataBean = new PreviewDataBean(); |
|
|
|
dataBean.setDataSource(tabledata); |
|
|
|
dataBean.setDataSource(tabledata); |
|
|
|
dataBean.setParameterMap(parameterMap); |
|
|
|
dataBean.setConvertMap(parameterMap); |
|
|
|
dataBean.setStart(rowCount); |
|
|
|
dataBean.setStart(rowCount); |
|
|
|
dataBean.setEnd(-1); |
|
|
|
dataBean.setEnd(-1); |
|
|
|
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(dataBean).getTableData(); |
|
|
|
return (EmbeddedTableData) TableDataRepository.getInstance().previewTableData(dataBean).getTableData(); |
|
|
|