fix: fix some bugs

VShawn · VShawn · commit a957219d5c58 · 2024-06-07T11:36:55.000+08:00
diff --git a/Ui/Controls/NoteDisplay/NoteDisplayAndEditor.xaml b/Ui/Controls/NoteDisplay/NoteDisplayAndEditor.xaml
@@ -88,6 +88,7 @@
                     <Grid Margin="10"
                           MouseEnter="GridEditor_OnMouseEnter"
                           MouseLeave="GridEditor_OnMouseLeave"
+                          Background="Transparent"
                           >
                         <wpf:MarkdownViewer Name="MarkdownViewer"
                                             PreviewMouseDown="Ignore_OnPreviewMouseDown" 
diff --git a/Ui/Model/ProtocolActionHelper.cs b/Ui/Model/ProtocolActionHelper.cs
@@ -156,9 +156,7 @@ public static List<ProtocolAction> GetActions(this ProtocolBase server, bool for
         {
             actions.Add(new ProtocolAction(IoC.Translate("Open SFTP"), () =>
             {
-                var protocolClone = ssh.Clone();
                 // open SFTP when SSH is connected.
-                var tmpRunner = RunnerHelper.GetRunner(IoC.Get<ProtocolConfigurationService>(), protocolClone, SFTP.ProtocolName);
                 var sftp = new SFTP
                 {
                     ColorHex = ssh.ColorHex,
@@ -170,7 +168,7 @@ public static List<ProtocolAction> GetActions(this ProtocolBase server, bool for
                     Password = ssh.Password,
                     PrivateKey = ssh.PrivateKey
                 };
-                IoC.Get<SessionControlService>().ConnectWithTab(sftp, tmpRunner, "");
+                GlobalEventHelper.OnRequestServerConnect?.Invoke(sftp, fromView: $"{nameof(LauncherWindowView)} - Action - Open SFTP", assignTabToken: DateTime.Now.Ticks.ToString());
             }));
         }
 
diff --git a/Ui/Service/SessionControlService_OpenConnection.cs b/Ui/Service/SessionControlService_OpenConnection.cs
@@ -301,7 +301,8 @@ private async Task<string> Connect(ProtocolBase protocol, string fromView, strin
                     Password = ssh.Password,
                     PrivateKey = ssh.PrivateKey
                 };
-                assignTabToken = this.ConnectWithTab(sftp, tmpRunner, assignTabToken);
+                assignTabToken = await Connect(sftp, fromView, assignTabToken, tmpRunner.Name, assignCredentialName);
+                //assignTabToken = this.ConnectWithTab(sftp, tmpRunner, assignTabToken);
             }
             else if (protocolClone is LocalApp { RunWithHosting: false } localApp)
             {

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@`
`88`	`88`	`<Grid Margin="10"`
`89`	`89`	`MouseEnter="GridEditor_OnMouseEnter"`
`90`	`90`	`MouseLeave="GridEditor_OnMouseLeave"`
	`91`	`+ Background="Transparent"`
`91`	`92`	`>`
`92`	`93`	`<wpf:MarkdownViewer Name="MarkdownViewer"`
`93`	`94`	`PreviewMouseDown="Ignore_OnPreviewMouseDown"`
Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,7 @@ public static List<ProtocolAction> GetActions(this ProtocolBase server, bool for`
`156`	`156`	`{`
`157`	`157`	`actions.Add(new ProtocolAction(IoC.Translate("Open SFTP"), () =>`
`158`	`158`	`{`
`159`		`- var protocolClone = ssh.Clone();`
`160`	`159`	`// open SFTP when SSH is connected.`
`161`		`- var tmpRunner = RunnerHelper.GetRunner(IoC.Get<ProtocolConfigurationService>(), protocolClone, SFTP.ProtocolName);`
`162`	`160`	`var sftp = new SFTP`
`163`	`161`	`{`
`164`	`162`	`ColorHex = ssh.ColorHex,`
`@@ -170,7 +168,7 @@ public static List<ProtocolAction> GetActions(this ProtocolBase server, bool for`
`170`	`168`	`Password = ssh.Password,`
`171`	`169`	`PrivateKey = ssh.PrivateKey`
`172`	`170`	`};`
`173`		`- IoC.Get<SessionControlService>().ConnectWithTab(sftp, tmpRunner, "");`
	`171`	`+ GlobalEventHelper.OnRequestServerConnect?.Invoke(sftp, fromView: $"{nameof(LauncherWindowView)} - Action - Open SFTP", assignTabToken: DateTime.Now.Ticks.ToString());`
`174`	`172`	`}));`
`175`	`173`	`}`
`176`	`174`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,8 @@ private async Task<string> Connect(ProtocolBase protocol, string fromView, strin`
`301`	`301`	`Password = ssh.Password,`
`302`	`302`	`PrivateKey = ssh.PrivateKey`
`303`	`303`	`};`
`304`		`- assignTabToken = this.ConnectWithTab(sftp, tmpRunner, assignTabToken);`
	`304`	`+ assignTabToken = await Connect(sftp, fromView, assignTabToken, tmpRunner.Name, assignCredentialName);`
	`305`	`+ //assignTabToken = this.ConnectWithTab(sftp, tmpRunner, assignTabToken);`
`305`	`306`	`}`
`306`	`307`	`else if (protocolClone is LocalApp { RunWithHosting: false } localApp)`
`307`	`308`	`{`