fix: #770

VShawn · VShawn · commit b2019bcb0152 · 2024-11-14T20:47:08.000+08:00
diff --git a/Ui/View/Editor/Forms/SftpFormView.xaml.cs b/Ui/View/Editor/Forms/SftpFormView.xaml.cs
@@ -15,17 +15,18 @@ public SftpFormView()
 
             Loaded += (sender, args) =>
             {
-                if (DataContext is SFTP vm)
+                if (DataContext is SftpFormViewModel { New: var vm })
                 {
-                    CbUsePrivateKey.IsChecked = false;
+	                bool? privateKey = false;
                     if (vm.PrivateKey == vm.ServerEditorDifferentOptions)
                     {
-                        CbUsePrivateKey.IsChecked = null;
+                        privateKey = null;
                     }
                     if (!string.IsNullOrEmpty(vm.PrivateKey))
                     {
-                        CbUsePrivateKey.IsChecked = true;
+                        privateKey = true;
                     }
+                    CbUsePrivateKey.IsChecked = privateKey;
                 }
             };
         }
diff --git a/Ui/View/Editor/Forms/SshFormView.xaml.cs b/Ui/View/Editor/Forms/SshFormView.xaml.cs
@@ -22,18 +22,14 @@ public SshFormView() : base()
 	                bool? privateKey = false;
                     if (ssh.PrivateKey == ssh.ServerEditorDifferentOptions)
                     {
-                        CbUsePrivateKey.IsChecked = null;
                         privateKey = null;
 
                     }
-
                     if (!string.IsNullOrEmpty(ssh.PrivateKey))
                     {
-                        CbUsePrivateKey.IsChecked = true;
                         privateKey = true;
 
                     }
-
                     CbUsePrivateKey.IsChecked = privateKey;
                 }
 			};
diff --git a/Ui/View/Editor/ServerEditorPageViewModel.cs b/Ui/View/Editor/ServerEditorPageViewModel.cs
@@ -534,24 +534,26 @@ private void UpdateServerWhenProtocolChanged(Type newProtocolType)
 
 
             #region change port and username if the old velue is the default port and username
-            if (server is ProtocolBaseWithAddressPort newPort && Server is ProtocolBaseWithAddressPort)
+            if (server is ProtocolBaseWithAddressPort newPort)
             {
-                var oldPortDefault = (ProtocolBaseWithAddressPort)protocolServerBaseAssembly.CreateInstance(Server.GetType().FullName!)!;
-                if (newPort.Port == oldPortDefault.Port)
+                bool isDefaultPort = false;
+                if (Server is ProtocolBaseWithAddressPort)
                 {
-                    var newDefault = (ProtocolBaseWithAddressPort)protocolServerBaseAssembly.CreateInstance(newProtocolType.FullName)!;
-                    newPort.Port = newDefault.Port;
+                    var oldPortDefault = (ProtocolBaseWithAddressPort)protocolServerBaseAssembly.CreateInstance(Server.GetType().FullName!)!;
+                    isDefaultPort = newPort.Port == oldPortDefault.Port;
                 }
-            }
-            if (server is ProtocolBaseWithAddressPortUserPwd newUserName && Server is ProtocolBaseWithAddressPortUserPwd)
-            {
-                var oldDefault = (ProtocolBaseWithAddressPortUserPwd)protocolServerBaseAssembly.CreateInstance(Server.GetType().FullName!)!;
-                if (newUserName.UserName == oldDefault.UserName)
+                else if (string.IsNullOrEmpty(newPort.Port) || newPort.Port == "3389")
+                {
+                    isDefaultPort = true;
+                }
+                if (isDefaultPort)
                 {
-                    var newDefault = (ProtocolBaseWithAddressPortUserPwd)protocolServerBaseAssembly.CreateInstance(newProtocolType.FullName)!;
-                    newUserName.UserName = newDefault.UserName;
+                    var newDefault = (ProtocolBaseWithAddressPort)protocolServerBaseAssembly.CreateInstance(newProtocolType.FullName)!;
+                    newPort.Port = newDefault.Port;
                 }
             }
+
+
             #endregion
 
             Server = server;

Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,18 @@ public SftpFormView()`
`15`	`15`
`16`	`16`	`Loaded += (sender, args) =>`
`17`	`17`	`{`
`18`		`- if (DataContext is SFTP vm)`
	`18`	`+ if (DataContext is SftpFormViewModel { New: var vm })`
`19`	`19`	`{`
`20`		`- CbUsePrivateKey.IsChecked = false;`
	`20`	`+ bool? privateKey = false;`
`21`	`21`	`if (vm.PrivateKey == vm.ServerEditorDifferentOptions)`
`22`	`22`	`{`
`23`		`- CbUsePrivateKey.IsChecked = null;`
	`23`	`+ privateKey = null;`
`24`	`24`	`}`
`25`	`25`	`if (!string.IsNullOrEmpty(vm.PrivateKey))`
`26`	`26`	`{`
`27`		`- CbUsePrivateKey.IsChecked = true;`
	`27`	`+ privateKey = true;`
`28`	`28`	`}`
	`29`	`+ CbUsePrivateKey.IsChecked = privateKey;`
`29`	`30`	`}`
`30`	`31`	`};`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,18 +22,14 @@ public SshFormView() : base()`
`22`	`22`	`bool? privateKey = false;`
`23`	`23`	`if (ssh.PrivateKey == ssh.ServerEditorDifferentOptions)`
`24`	`24`	`{`
`25`		`- CbUsePrivateKey.IsChecked = null;`
`26`	`25`	`privateKey = null;`
`27`	`26`
`28`	`27`	`}`
`29`		`-`
`30`	`28`	`if (!string.IsNullOrEmpty(ssh.PrivateKey))`
`31`	`29`	`{`
`32`		`- CbUsePrivateKey.IsChecked = true;`
`33`	`30`	`privateKey = true;`
`34`	`31`
`35`	`32`	`}`
`36`		`-`
`37`	`33`	`CbUsePrivateKey.IsChecked = privateKey;`
`38`	`34`	`}`
`39`	`35`	`};`