Browse Source

Pull request #2888: REPORT-43022 【10.0.11冒烟】参数面板未进入的情况下撤销重做无效

Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0

* commit '28746aff31a6ca57e6aeabee61c0d2113e4b0d57':
  REPORT-43022 【10.0.11冒烟】参数面板未进入的情况下撤销重做无效 【问题原因】参数面板的撤销重做并不是无效的,而是因为之前在不编辑参数面板的状态,如果经过了与参数面板有关的撤销重做操作,参数面板没有刷新 【改动方案】在没有编辑参数面板的时候,也需要populate一下参数面板
feature/big-screen
Yvan 4 years ago
parent
commit
32cd05ecc1
  1. 5
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

5
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@ -762,6 +762,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
DesignModuleFactory.getFormHierarchyPane().refreshRoot(); DesignModuleFactory.getFormHierarchyPane().refreshRoot();
} }
} else { } else {
// REPORT-43022 即使没有处于编辑参数面板的状态,在经过有关参数面板的撤销后,也需要刷新一下参数面板
if (hasParameterPane()) {
parameterPane.populate(u.getApplyTarget());
setAutoHeightForCenterPane();
}
reportComposite.setSelectedIndex(u.getSelectedReportIndex()); reportComposite.setSelectedIndex(u.getSelectedReportIndex());
u.getSelectedEditingState().revert(); u.getSelectedEditingState().revert();
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView(); TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();

Loading…
Cancel
Save