Browse Source

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

* commit '96b5a506a0fdcc5465b2fcebcf69c074b5016bdb':
  无jira,去掉这段代码,其他地方改了
  REPORT-6245 设计器,悬浮元素,修改悬浮元素名称,点击确定,日志抛错 优化打开模板速度时回退了 REPORT-5084的pr,重新提交
superman 8 years ago
parent
commit
575095f5c6
  1. 2
      designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
  2. 4
      designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
  3. 2
      designer/src/com/fr/design/widget/WidgetEventPane.java
  4. 2
      designer_base/src/com/fr/design/mainframe/DesignerFrame.java

2
designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java

@ -39,7 +39,7 @@ public class EditFloatElementNameAction extends FloatSelectionAction {
if (report.getFloatElement(name) == null) {
selectedFloatElement.setName(name);
}
reportPane.setSelection(new FloatSelection(name));
((FloatSelection) reportPane.getSelection()).setFloatName(name);
}
});
nameDialog.setVisible(true);

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

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

2
designer/src/com/fr/design/widget/WidgetEventPane.java

@ -91,7 +91,7 @@ public class WidgetEventPane extends ObjectUIControlPane {
@Override
protected DBManipulationPane createDBManipulationPane() {
if(epane == null) {
if(epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
return autoCreateDBManipulationInWidgetEventPane();
}

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

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

Loading…
Cancel
Save