REPORT-100958 【版本管理三期】还原或者预览版本，弹窗应该关闭

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) {
+        if (parentDialog != null) {
-            parent.dispose();
+            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;
+    }
+
     /**
      * 删除范围
      *