diff --git a/插件库/Lskj.Control/BrowserSetting/BsClient.cs b/插件库/Lskj.Control/BrowserSetting/BsClient.cs index 825ae6d..27eab04 100644 --- a/插件库/Lskj.Control/BrowserSetting/BsClient.cs +++ b/插件库/Lskj.Control/BrowserSetting/BsClient.cs @@ -116,4 +116,12 @@ namespace Lskj.Control.BrowserSetting else if (message.Name.Equals("SelectPro")) { string arg0 = message.Arguments.GetString(0); - if (frmWebBrowser != null && frmWebBrowser.Parent != null && frmWebBrowser.Parent.Parent != null && frmWebBrowser.Parent.Parent is BaseForm \ No newline at end of file + string arg1 = message.Arguments.GetString(1); + bool isclose = arg1!=null&&!string.IsNullOrWhiteSpace(arg1) && arg1.Equals("1") ? true : false; + if (frmWebBrowser != null && frmWebBrowser.Parent != null && frmWebBrowser.Parent.Parent != null && frmWebBrowser.Parent.Parent is BaseForm baseForm) + { + if (baseForm.InvokeRequired) + { + baseForm.Invoke(new Action(() => + { + BsOpenModuleHandler.AddReturn \ No newline at end of file diff --git a/插件库/Lskj.Control/BrowserSetting/BsKeyboardHandler.cs b/插件库/Lskj.Control/BrowserSetting/BsKeyboardHandler.cs index 2317127..6641935 100644 --- a/插件库/Lskj.Control/BrowserSetting/BsKeyboardHandler.cs +++ b/插件库/Lskj.Control/BrowserSetting/BsKeyboardHandler.cs @@ -53,8 +53,16 @@ namespace Lskj.Control.BrowserSetting { //弹出当前网址 string NUrl = browser.GetMainFrame().Url + ""; - MessageBox.Show(string.Format("Url:{0}已复制到粘贴板", NUrl)); - System.Windows.Forms.Clipboard.SetText(NUrl); + if (string.IsNullOrWhiteSpace(NUrl)) + { + MessageBox.Show("地址还未加载"); + } + else + { + MessageBox.Show(string.Format("Url:{0}已复制到粘贴板", NUrl)); + System.Windows.Forms.Clipboard.SetText(NUrl); + } + } } diff --git a/插件库/Lskj.Control/BrowserSetting/BsLifeSpanHandler.cs b/插件库/Lskj.Control/BrowserSetting/BsLifeSpanHandler.cs index 72a6cf2..159752e 100644 --- a/插件库/Lskj.Control/BrowserSetting/BsLifeSpanHandler.cs +++ b/插件库/Lskj.Control/BrowserSetting/BsLifeSpanHandler.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; using Xilium.CefGlue; namespace Lskj.Control.BrowserSetting @@ -23,5 +24,6 @@ namespace Lskj.Control.BrowserSetting { base.OnBeforeClose(browser); } + } -} +} \ No newline at end of file diff --git a/插件库/Lskj.Control/BrowserSetting/BsOpenModuleHandler.cs b/插件库/Lskj.Control/BrowserSetting/BsOpenModuleHandler.cs index c134557..f432d8b 100644 --- a/插件库/Lskj.Control/BrowserSetting/BsOpenModuleHandler.cs +++ b/插件库/Lskj.Control/BrowserSetting/BsOpenModuleHandler.cs @@ -64,10 +64,11 @@ namespace Lskj.Control.BrowserSetting outexception = null; outtrn = true; } - else if (name == "SelectPro" && arguments.Length == 1) + else if (name == "SelectPro" && arguments.Length == 2) { CefProcessMessage cefProcessMessage = CefProcessMessage.Create("SelectPro"); cefProcessMessage.Arguments.SetString(0, arguments[0].GetStringValue()); + cefProcessMessage.Arguments.SetString(1, arguments[1].GetStringValue()); V8Context.GetFrame().SendProcessMessage(CefProcessId.Browser, cefProcessMessage); outreturnValue = CefV8Value.CreateUndefined(); outexception = null; diff --git a/插件库/Lskj.Control/BrowserSetting/BsRenderProcessHandler.cs b/插件库/Lskj.Control/BrowserSetting/BsRenderProcessHandler.cs index 1bb16c6..cb0dd0c 100644 --- a/插件库/Lskj.Control/BrowserSetting/BsRenderProcessHandler.cs +++ b/插件库/Lskj.Control/BrowserSetting/BsRenderProcessHandler.cs @@ -23,4 +23,4 @@ namespace Lskj.Control.BrowserSetting native function OpenModule(); return OpenModule(menuId, menuName, dllName, modelFlag, urlParams); }; - boundObject.OpenOnRightClick = function(arrayIte \ No newline at end of file + boundObject.OpenOnRightClick = function(arrayItem, rightId,MenuN \ No newline at end of file