Browse Source

REPORT-5084 [9.0二轮回归]设计器默认打开的模板中有设置了点击事件的按钮,打开有问题

master
MoMeak 7 years ago
parent
commit
1e33946812
  1. 4
      designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
  2. 2
      designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
  3. 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();

2
designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane {
// richie:避免多次update和populate大大降低效率
if (!evt.getValueIsAdjusting()) {
// shoc 切换的时候加检验
if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) {
if (hasInvalid(false)) {
return;
}
((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update();

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