From 0dd0eef5b546137bdf46cf8648fd254da46bef9e Mon Sep 17 00:00:00 2001
From: Lanlan <Lanlan@fanruan.com>
Date: Thu, 11 Nov 2021 14:29:27 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-61844=20=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A811.0=E3=80=91=E9=AB=98=E5=88=86=E5=B1=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9dpi=EF=BC=8C=E5=88=87=E6=8D=A2=E5=B8=86=E8=BD=AF?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=BC=B9=E7=AA=97=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=EF=BC=8C=E9=BC=A0=E6=A0=87=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=B2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/actions/file/PreferencePane.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
index 2e32eb88c..303d9fd81 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@@ -167,6 +167,7 @@ public class PreferencePane extends BasicPane {
     private UICheckBox oracleSpace;
     private UISpinner cachingTemplateSpinner;
     private UICheckBox useOptimizedUPMCheckbox;
+    private UICheckBox useNewVersionLoginCheckbox;
     private UICheckBox useUniverseDBMCheckbox;
     private UICheckBox joinProductImproveCheckBox;
     private UICheckBox autoPushUpdateCheckBox;
@@ -233,6 +234,13 @@ public class PreferencePane extends BasicPane {
             advancePane.add(upmSelectorPane);
         }
 
+        if (SupportOSImpl.DESIGNER_LOGIN.support()) {
+            JPanel loginSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Login_Manager"));
+            useNewVersionLoginCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_New_Login_Manager"));
+            loginSelectorPane.add(useNewVersionLoginCheckbox);
+            advancePane.add(loginSelectorPane);
+        }
+
         JPanel dbmSelectorPane = FRGUIPaneFactory.createTitledBorderPane(i18nText("Fine-Design_Basic_Database_Manager"));
         useUniverseDBMCheckbox = new UICheckBox(i18nText("Fine-Design_Basic_Use_Universe_Database_Manager"));
         //dbmSelectorPane.add(useUniverseDBMCheckbox);
@@ -726,6 +734,10 @@ public class PreferencePane extends BasicPane {
             useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
         }
 
+        if (useNewVersionLoginCheckbox != null) {
+            useNewVersionLoginCheckbox.setSelected(!DesignerEnvManager.getEnvManager().isUseOldVersionLogin());
+        }
+
         useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
 
         this.oracleSpace.setSelected(designerEnvManager.isOracleSystemSpace());
@@ -820,6 +832,10 @@ public class PreferencePane extends BasicPane {
             designerEnvManager.setAutoPushUpdateEnabled(this.autoPushUpdateCheckBox.isSelected());
         }
 
+        if (useNewVersionLoginCheckbox != null) {
+            designerEnvManager.setUseOldVersionLogin(!this.useNewVersionLoginCheckbox.isSelected());
+        }
+
         designerEnvManager.setUndoLimit(maxUndoLimit.getSelectedIndex() * SELECTED_INDEX_5);
         if (maxUndoLimit.getSelectedIndex() == SELECTED_INDEX_5) {
             designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);