diff --git a/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java b/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java index cf235191e..7ba3b6e25 100644 --- a/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java @@ -28,13 +28,11 @@ public class EventPropertyPane extends UIListGroupControlPane implements CloseRe @Override public void releaseResources() { - Widget widget = creator.toData(); - if (widget.getListenerSize() > 0) { - FRTreeComboBox.releaseTreePopup(); - } + creator = null; + designer = null; + this.removeAll(); } - /** * 刷新 */ @@ -54,7 +52,6 @@ public class EventPropertyPane extends UIListGroupControlPane implements CloseRe } - public void populateNameObjects() { Widget widget = creator.toData(); populateNameObjects(widget); @@ -103,7 +100,7 @@ public class EventPropertyPane extends UIListGroupControlPane implements CloseRe return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Event"); } - protected String getWrapperLabelText(){ + protected String getWrapperLabelText() { return Toolkit.i18nText("Fine-Design_Report_Event"); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 3aab1ca0a..eee57c99f 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -859,7 +859,6 @@ public class JForm extends JTemplate implements BaseJForm