From ab28e1f4872164ccd2e9bc1e4b0964dcdec2daea Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Tue, 25 Jul 2023 14:57:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-100958=20=E3=80=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=89=E6=9C=9F=E3=80=91=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E9=A2=84=E8=A7=88=E7=89=88=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=BA=94=E8=AF=A5=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/vcs/ui/RecyclePane.java  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
index f9e803c3fc..1569eaf3d1 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
@@ -53,7 +53,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
     private static final int COLUMNS_COUNT = 15;
     private BasicDialog dialog;
 
-    private BasicDialog parent;
+    private BasicDialog parentDialog;
     private List<VcsTableEntity> tableEntities;
 
     public RecyclePane() {
@@ -234,21 +234,27 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
      * @param parent 父弹窗
      */
     public void showDialog(BasicDialog parent) {
-        this.parent = parent;
+        this.parentDialog = parent;
         dialog = this.showWindow(parent, false);
+        initDialogListener(dialog);
         dialog.setVisible(true);
     }
 
+    protected void initDialogListener(BasicDialog dialog) {
+    }
+
     /**
      * 关闭弹窗，如果有父弹窗，则一起关闭
      *
      */
     public void closeDialog() {
         if (dialog != null) {
+            dialog.doOK();
             dialog.dispose();
         }
-        if (parent != null) {
-            parent.dispose();
+        if (parentDialog != null) {
+            parentDialog.doOK();
+            parentDialog.dispose();
         }
     }
 
@@ -260,6 +266,14 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
         this.dialog = dialog;
     }
 
+    public BasicDialog getParentDialog() {
+        return parentDialog;
+    }
+
+    public void setParentDialog(BasicDialog parentDialog) {
+        this.parentDialog = parentDialog;
+    }
+
     /**
      * 删除范围
      *