diff --git a/designer-base/src/main/java/com/fr/design/update/factory/UpdateFileFactory.java b/designer-base/src/main/java/com/fr/design/update/factory/UpdateFileFactory.java
new file mode 100644
index 0000000000..cf992fe08b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/update/factory/UpdateFileFactory.java
@@ -0,0 +1,50 @@
+package com.fr.design.update.factory;
+
+import com.fr.decision.update.data.UpdateConstants;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StableUtils;
+
+import java.io.File;;
+
+/**
+ * @author Bryant
+ * @version 10.0
+ * Created by Bryant on 2020-09-29
+ */
+public class UpdateFileFactory {
+
+    private UpdateFileFactory() {
+    }
+
+    public static File[] getBackupVersions() {
+        File[] versions = null;
+        try {
+            File backupDir = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR));
+            StableUtils.mkdirs(backupDir);
+            versions = backupDir.listFiles();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return versions;
+    }
+
+    public static boolean isBackupVersionsValid(String version) {
+        boolean designerValid = false;
+        boolean envValid = false;
+        try {
+            File designerLib = new File(StableUtils.pathJoin(version, UpdateConstants.DESIGNERBACKUPPATH));
+            File[] jars = designerLib.listFiles();
+            if (jars != null && jars.length > 0) {
+                designerValid = true;
+            }
+            File envLib = new File(StableUtils.pathJoin(version, UpdateConstants.BACKUPPATH));
+            jars = envLib.listFiles();
+            if (jars != null && jars.length > 0) {
+                envValid = true;
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return designerValid && envValid;
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java
index f54b811852..69f3f61604 100644
--- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java
@@ -86,7 +86,7 @@ public class RestoreDialog extends JDialog {
 
         JPanel jarListPane = new JPanel();
         jarListPane.setLayout(new BoxLayout(jarListPane, BoxLayout.Y_AXIS));
-        String[] jarBackupFiles = UpdateFileUtils.listFilteredFiles(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR);
+        String[] jarBackupFiles = UpdateFileUtils.listBackupVersions();
 
         ArrayUtils.reverse(jarBackupFiles);
         String[] jarFilesList = ((jarBackupFiles.length < NUMOFCELL_LEAST) ? Arrays.copyOf(jarBackupFiles, NUMOFCELL_LEAST) : jarBackupFiles);
diff --git a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
index 6163d44b55..3c91ebf145 100644
--- a/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
+++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
@@ -320,7 +320,7 @@ public class UpdateMainDialog extends UIDialog {
             }
         });
         //choose RestoreLabel to show
-        boolean isNeedRestore = ArrayUtils.isNotEmpty(UpdateFileUtils.listFilteredFiles(StableUtils.getInstallHome(), getBackupDirectory()));
+        boolean isNeedRestore = ArrayUtils.isNotEmpty(UpdateFileUtils.listBackupVersions());
         jarRestoreLabel = isNeedRestore ? jarRestorePreviousRevision : noJarPreviousRevision;
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/update/utils/UpdateFileUtils.java b/designer-base/src/main/java/com/fr/design/update/utils/UpdateFileUtils.java
index b2149be8f0..7a3c0a2a8a 100644
--- a/designer-base/src/main/java/com/fr/design/update/utils/UpdateFileUtils.java
+++ b/designer-base/src/main/java/com/fr/design/update/utils/UpdateFileUtils.java
@@ -1,5 +1,6 @@
 package com.fr.design.update.utils;
 
+import com.fr.design.update.factory.UpdateFileFactory;
 import com.fr.stable.StableUtils;
 
 import java.io.File;
@@ -12,22 +13,17 @@ import java.util.List;
  * Created by Bryant on 2020-09-25
  */
 public class UpdateFileUtils {
-
     /**
      * 列出过滤后的文件
      *
-     * @param installHome 安装目录
-     * @param backupdir   备份目录
      * @return String数组
      */
-    public static String[] listFilteredFiles(String installHome, String backupdir) {
-        File backupDir = new File(StableUtils.pathJoin(installHome, backupdir));
-        StableUtils.mkdirs(backupDir);
-        File[] versionBackup = backupDir.listFiles();
+    public static String[] listBackupVersions() {
+        File[] versionBackup = UpdateFileFactory.getBackupVersions();
         List<String> versions = new ArrayList<>();
         if (versionBackup != null) {
             for (File file : versionBackup) {
-                if (file.isDirectory() && file.length() > 0) {
+                if (UpdateFileFactory.isBackupVersionsValid(file.getAbsolutePath())) {
                     versions.add(file.getName());
                 } else {
                     StableUtils.deleteFile(file);
diff --git a/designer-base/src/test/java/com/fr/design/update/factory/UpdateFileFactoryTest.java b/designer-base/src/test/java/com/fr/design/update/factory/UpdateFileFactoryTest.java
new file mode 100644
index 0000000000..6c2211e76c
--- /dev/null
+++ b/designer-base/src/test/java/com/fr/design/update/factory/UpdateFileFactoryTest.java
@@ -0,0 +1,28 @@
+package com.fr.design.update.factory;
+
+import com.fr.decision.update.data.UpdateConstants;
+import com.fr.stable.StableUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+
+public class UpdateFileFactoryTest {
+
+    @Test
+    public void testGetBackupVersions() {
+        Assert.assertEquals(0, UpdateFileFactory.getBackupVersions().length);
+        File backupDir = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR));
+        StableUtils.deleteFile(backupDir);
+    }
+
+    @Test
+    public void testIsBackupVersionsValid() {
+        File des = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.BACKUPPATH, "test"));
+        File env = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.DESIGNERBACKUPPATH, "test"));
+        StableUtils.mkdirs(des);
+        StableUtils.mkdirs(env);
+        Assert.assertTrue(UpdateFileFactory.isBackupVersionsValid(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test")));
+        StableUtils.deleteFile(new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR)));
+    }
+}
diff --git a/designer-base/src/test/java/com/fr/design/update/utils/UpdateFileUtilsTest.java b/designer-base/src/test/java/com/fr/design/update/utils/UpdateFileUtilsTest.java
index 0e91e9d684..8788675352 100644
--- a/designer-base/src/test/java/com/fr/design/update/utils/UpdateFileUtilsTest.java
+++ b/designer-base/src/test/java/com/fr/design/update/utils/UpdateFileUtilsTest.java
@@ -1,5 +1,6 @@
 package com.fr.design.update.utils;
 
+import com.fr.decision.update.data.UpdateConstants;
 import com.fr.stable.StableUtils;
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,8 +16,12 @@ public class UpdateFileUtilsTest {
 
     @Test
     public void testListFilteredFiles() {
-        String[] result = UpdateFileUtils.listFilteredFiles("home", "backup");
-        Assert.assertEquals(0, result.length);
-        StableUtils.deleteFile(new File(StableUtils.pathJoin("home")));
+        File des = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.BACKUPPATH, "test"));
+        File env = new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR, "test", UpdateConstants.DESIGNERBACKUPPATH, "test"));
+        StableUtils.mkdirs(des);
+        StableUtils.mkdirs(env);
+        String[] result = UpdateFileUtils.listBackupVersions();
+        Assert.assertEquals(1, result.length);
+        StableUtils.deleteFile(new File(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR)));
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index e3594ff22d..847cd3891e 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -92,7 +92,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private AttrTooltipRichText richText;
 
-    public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
+    public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         this.parent = parent;
         this.showOnPane = showOnPane;
         this.richText = new AttrTooltipRichText();
@@ -101,7 +101,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
-        this.add(createLabelContentPane(),BorderLayout.CENTER);
+        this.add(createLabelContentPane(), BorderLayout.CENTER);
     }
 
     public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
@@ -330,7 +330,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
     }
 
-    private JPanel createCommonStylePane() {
+    protected JPanel createCommonStylePane() {
         styleButton = new UIButtonGroup<>(new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Automatic"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")
@@ -474,8 +474,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
 
-    protected double[] getRowSize(double p){
-        return new double[]{p,p,p,p};
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p};
     }
 
     protected Component[][] getPaneComponents() {
@@ -500,7 +500,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         content.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-               checkCardPane();
+                checkCardPane();
             }
         });
     }
@@ -584,8 +584,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
 
     @Override
-    public void populateBean(AttrTooltipContent attrTooltipContent){
-        if(attrTooltipContent == null){
+    public void populateBean(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent == null) {
             return;
         }
 
@@ -604,7 +604,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
 
         htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
-        if(!attrTooltipContent.isCommon()){
+        if (!attrTooltipContent.isCommon()) {
             setDirty(false);
         }
 
@@ -801,9 +801,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
      * CHART-1295
      * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。
      * 图表对于其他的格式有要求也可以在这里继续添加。
+     *
      * @param attrTooltipContent
      */
-    private void updateFormatsWithPaneWidth (AttrTooltipContent attrTooltipContent) {
+    private void updateFormatsWithPaneWidth(AttrTooltipContent attrTooltipContent) {
         int paneWidth = seriesNameFormatPane.getWidth();
         if (paneWidth == 0) {
             attrTooltipContent.getSeriesFormat().setEnable(false);
diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
index b3215ede1c..0f673e30ae 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java
@@ -15,6 +15,7 @@ import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
@@ -111,7 +112,7 @@ public class SelectionModel {
         if (comp != designer.getRootComponent() && comp != designer.getParaComponent()) {
             XCreator parentContainer = (XCreator) comp.getParent();
             if (parentContainer != null) {
-                comp = parentContainer.isDedicateContainer() ? parentContainer : comp;
+                comp = parentContainer.isDedicateContainer() || comp instanceof XCardSwitchButton ? parentContainer : comp;
             }
         }
         if (selection.removeSelectedCreator(comp) || selection.addSelectedCreator(comp)) {