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

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java

@@ -244,10 +244,10 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
     }
 
     /**
-     * 关闭弹窗，如果有父弹窗，则一起关闭
+     * 关闭弹窗,如果有父弹窗,则一起关闭,如果有属性配置的弹窗面板要保存再关闭
      *
      */
-    public void closeDialog() {
+    public void SaveSettingAndCloseDialog() {
         if (dialog != null) {
             dialog.doOK();
             dialog.dispose();

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsCenterPane.java

@@ -140,7 +140,7 @@ public class VcsCenterPane extends VcsNewPane {
                 Object o = table.getValueAt(table.getEditingRow(), table.getEditingColumn());
                 if (o instanceof VcsTableEntity) {
                     VcsEntity entity = ((VcsTableEntity) o).getEntity();
-                    closeDialog();
+                    SaveSettingAndCloseDialog();
                     DesignerContext.getDesignerFrame().openTemplate(new FileNodeFILE(new FileNode(getTemplateTruePath(entity.getFilename()), false)));
                 }
             }

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java

@@ -160,7 +160,7 @@ public class VcsNewPane extends RecyclePane {
                             JOptionPane.QUESTION_MESSAGE);
                     if (selVal == JOptionPane.YES_OPTION) {
                         restoreEntity(entity);
-                        VcsNewPane.this.closeDialog();
+                        VcsNewPane.this.SaveSettingAndCloseDialog();
                     }
                 }
             }
@@ -230,7 +230,7 @@ public class VcsNewPane extends RecyclePane {
                 if (o instanceof VcsTableEntity) {
                     VcsEntity entity = ((VcsTableEntity) o).getEntity();
                     previewEntity(entity);
-                    VcsNewPane.this.closeDialog();
+                    VcsNewPane.this.SaveSettingAndCloseDialog();
                 }
             }
         });