Browse Source

REPORT-89901 feat: sql添加注释

feature/x
Sky.Luo 2 years ago
parent
commit
52277923da
  1. 1
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
  2. 6
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

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

@ -571,6 +571,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());
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);

6
designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java

@ -60,9 +60,6 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
} }
EmbeddedTableData embeddedTableData = null; EmbeddedTableData embeddedTableData = null;
if (tabledata instanceof DBTableData) {
((DBTableData) tabledata).setDesignerCurrEditTemplate(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getName());
}
try { try {
embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tds, tabledata, TableData.RESULT_NOT_NEED, false); embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tds, tabledata, TableData.RESULT_NOT_NEED, false);
} catch (Exception e) { } catch (Exception e) {
@ -108,9 +105,6 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
* *
*/ */
public void previewData() { public void previewData() {
if (tabledata instanceof DBTableData) {
((DBTableData) tabledata).setDesignerCurrEditTemplate(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getName());
}
PreviewTablePane.previewTableData(tabledata); PreviewTablePane.previewTableData(tabledata);
} }

Loading…
Cancel
Save