Browse Source

Merge pull request #1373 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '1e33946812c30a8c7cc73404cc073a195f6c7c95':
  REPORT-5084 [9.0二轮回归]设计器默认打开的模板中有设置了点击事件的按钮,打开有问题
  REPORT-5084 [9.0二轮回归]设计器默认打开的模板中有设置了点击事件的按钮,打开有问题
master
superman 7 years ago
parent
commit
cda21392eb
  1. 4
      designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
  2. 3
      designer_base/src/com/fr/design/mainframe/DesignerFrame.java

4
designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@ -75,7 +75,9 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
return;
}
CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
}
CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
QuickEditorRegion.getInstance().populate(getCurrentEditor());
JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();

3
designer_base/src/com/fr/design/mainframe/DesignerFrame.java

@ -925,7 +925,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
} else {
this.addAndActivateJTemplate(jt);
}
//REPORT-5084:激活后刷新一下右側面板
jt.refreshEastPropertiesPane();
}
/**

Loading…
Cancel
Save