Browse Source

CHART-13168 && REPORT-27122

feature/big-screen
hades 5 years ago
parent
commit
7364fd157b
  1. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/AbstractTableDataWrapper.java
  2. 6
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

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

@ -54,7 +54,7 @@ public abstract class AbstractTableDataWrapper implements TableDataWrapper {
if(ArrayUtils.isNotEmpty(colNames)){ if(ArrayUtils.isNotEmpty(colNames)){
return toColumnNameList(colNames); return toColumnNameList(colNames);
} else if (ArrayUtils.isNotEmpty(colNamesInCache)) { } else if (ArrayUtils.isNotEmpty(colNamesInCache)) {
return toColumnNameList(colNames); return toColumnNameList(colNamesInCache);
} }
EmbeddedTableData embeddedTableData = null; EmbeddedTableData embeddedTableData = null;

6
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -1141,8 +1141,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
DesignerEnvManager.getEnvManager().setLastOpenFile( JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); if (jt != null) {
DesignerEnvManager.getEnvManager().setLastOpenFile(jt.getEditingFILE().getPath());
}
DesignerEnvManager.getEnvManager().setLastWestRegionToolPaneY( DesignerEnvManager.getEnvManager().setLastWestRegionToolPaneY(
WestRegionContainerPane.getInstance().getToolPaneY()); WestRegionContainerPane.getInstance().getToolPaneY());

Loading…
Cancel
Save