From 8fc5323b5d3d55e20882805fa498c5fea41bbd84 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Wed, 16 Jun 2021 19:20:10 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-8038=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=B8=80=E4=BA=9B=E9=9D=99=E6=80=81=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=AF=BC=E8=87=B4=E6=9C=80=E8=BF=91=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=9A=84=E6=A8=A1=E6=9D=BF=E5=AF=B9=E8=B1=A1=E4=B8=8D=E9=87=8A?=
 =?UTF-8?q?=E6=94=BE=E5=86=85=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/controlpane/EventPropertyPane.java      | 11 ++++-------
 .../java/com/fr/design/mainframe/JForm.java     |  1 -
 .../fr/design/mainframe/WidgetPropertyPane.java |  9 ++++++++-
 .../mainframe/widget/ui/FormWidgetCardPane.java | 17 +++++++++++++++--
 4 files changed, 27 insertions(+), 11 deletions(-)

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<Form, FormUndoState> implements BaseJForm<F
         EastRegionContainerPane.getInstance().addParameterPane(parameterPropertyPane);
 
         refreshWidgetLibPane();
-        System.out.println(this.getEditingFILE());
         currentFormDesign = formDesign;
     }
 
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
index 865a50f41..927fe892b 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
@@ -75,6 +75,13 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
         if (eventTable != null) {
             eventTable.releaseResources();
         }
+        if (formWidgetCardPane != null) {
+            formWidgetCardPane.releaseResources();
+        }
+        if (wsp != null) {
+            wsp.removeAll();
+        }
+        designer.getSelectionModel().reset();
         formWidgetCardPane = null;
         eventTable = null;
         widgetPropertyTables = null;
@@ -84,7 +91,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
         wsp = null;
         tabsHeaderIconPane = null;
         lastAffectedCreator = null;
-        removeAll();
+        this.removeAll();
     }
 
     @Override
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index 4ab3fdb74..5cf563292 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
@@ -14,6 +14,7 @@ import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicScrollPane;
+import com.fr.design.file.CloseReleasable;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
@@ -23,6 +24,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.FormSelectionUtils;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.widget.DataModify;
 import com.fr.design.widget.FormWidgetDefinePaneFactoryBase;
@@ -48,7 +50,7 @@ import java.awt.BorderLayout;
 /**
  * Created by ibm on 2017/7/25.
  */
-public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
+public class FormWidgetCardPane extends AbstractAttrNoScrollPane implements CloseReleasable {
     private AttributeChangeListener listener;
     private FormDesigner designer;
     //当前的编辑器属性定义面板
@@ -86,7 +88,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
             return null;
         } else if (xLayoutContainer.acceptType(XWAbsoluteLayout.class)) {
             return new WidgetAbsoluteBoundPane(xCreator);
-        } else if(xCreator.acceptType(XWCardTagLayout.class)){
+        } else if (xCreator.acceptType(XWCardTagLayout.class)) {
             return new WidgetCardTagBoundPane(xCreator);
         }
         return new WidgetBoundPane(xCreator);
@@ -281,4 +283,15 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
     }
 
+    @Override
+    public void releaseResources() {
+        listener = null;
+        designer = null;
+        currentEditorDefinePane = null;
+        widgetPropertyPane = null;
+        attriCardPane = null;
+        xCreator = null;
+        widgetBoundPane = null;
+        this.removeAll();
+    }
 }