Browse Source

REPORT-6245 设计器,悬浮元素,修改悬浮元素名称,点击确定,日志抛错

master
plough 6 years ago
parent
commit
d9435d7bfc
  1. 2
      designer-realize/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
  2. 4
      designer-realize/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
  3. 2
      designer-realize/src/com/fr/design/widget/WidgetEventPane.java

2
designer-realize/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-realize/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@ -79,9 +79,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-realize/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();
}

Loading…
Cancel
Save