Browse Source

Pull request #1881: REPORT-35568 参数面板,添加多个控件,撤销,会出现一个蓝色的框线

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0

* commit '4644b3d208f2b2739943a12327b042617f7e1867':
  REPORT-35568 参数面板,添加多个控件,撤销,会出现一个蓝色的框线  撤回另一个任务的代码
  REPORT-35544 国际化-切换到韩文,内置服务器启动的时候,显示异常
  REPORT-35568 参数面板添加多个控件撤销会出现一个蓝色的框线
  REPORT-35568 参数面板,添加多个控件,撤销,会出现一个蓝色的框线
feature/big-screen
Henry.Wang 4 years ago
parent
commit
1d0625d573
  1. 2
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

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

@ -760,6 +760,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
if (centerPane.isUpEditMode()) { if (centerPane.isUpEditMode()) {
if (hasParameterPane()) { if (hasParameterPane()) {
parameterPane.populate(u.getApplyTarget()); parameterPane.populate(u.getApplyTarget());
setAutoHeightForCenterPane();
DesignModuleFactory.getFormHierarchyPane().refreshRoot(); DesignModuleFactory.getFormHierarchyPane().refreshRoot();
} }
} else { } else {
@ -782,6 +783,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
private void applyAll(WorkBookUndoState u) { private void applyAll(WorkBookUndoState u) {
if (hasParameterPane()) { if (hasParameterPane()) {
parameterPane.populate(u.getApplyTarget()); parameterPane.populate(u.getApplyTarget());
setAutoHeightForCenterPane();
DesignModuleFactory.getFormHierarchyPane().refreshRoot(); DesignModuleFactory.getFormHierarchyPane().refreshRoot();
} }
//报表主体 //报表主体

Loading…
Cancel
Save