From 42d5a803a6345138711fcadc94b8b2ac0af15ada Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <3166887LjL>
Date: Wed, 26 Jul 2023 00:53:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-101483=20=E3=80=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E6=9C=9F=E3=80=91=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=8F=90=E7=A4=BA=E7=9A=84=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=BB=A5=E8=AE=BE=E5=A4=87=E4=B8=AD=E5=A4=AE=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
index cd3e6f09a6..0479ee68e7 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
@@ -307,7 +307,7 @@ public class VcsMovePanel extends BasicPane {
         panel.add(titleLabel);
         panel.add(firstLabel);
         panel.add(secondLabel);
-        int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION);
+        int value = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame()), panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION);
         processMove(value);
     }
 

From ebb5e05e12348d2989dae11f912b3181cca945ad Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <3166887LjL>
Date: Wed, 26 Jul 2023 02:38:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-101478=20=E3=80=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E6=9C=9F=E3=80=91=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E9=BB=98=E8=AE=A4=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
index 8551f735b9..98a951a6a8 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
@@ -81,7 +81,7 @@ public class VcsConfigManager implements XMLReadable, XMLWriter {
             this.setUseInterval(reader.getAttrAsBoolean("useInterval", true));
             this.setVcsEnable(reader.getAttrAsBoolean("vcsEnable", true));
             this.setAutoSaveInterval(reader.getAttrAsInt("autoSaveInterval", 15));
-            this.setUseAutoSave(reader.getAttrAsBoolean("useAutoSave", false));
+            this.setUseAutoSave(reader.getAttrAsBoolean("useAutoSave", true));
         }
     }