SVN r899

SVN-Revision: r899

插件库/Lskj.Control/BrowserSetting/BsClient.cs

@@ -77,4 +77,17 @@ namespace Lskj.Control.BrowserSetting
             }
             else if (message.Name.Equals("OpenOnRightClick"))
             {
-       
+                string arg0 = message.Arguments.GetString(0);
+                string arg1 = message.Arguments.GetString(1);
+                string arg2 = message.Arguments.GetString(2);
+                string arg3 = message.Arguments.GetString(3);
+                if (ERPInfo.Instance.MainControl.InvokeRequired)
+                {
+                    ERPInfo.Instance.MainControl.Invoke(new Action(() =>
+                    {
+                        BsOpenModuleHandler.OpenRightModule(arg0, arg1, arg2, arg3);
+                    }));
+                }
+                else
+                {
+                    BsOpenModuleHandler.OpenRightModule(arg0, ar

插件库/Lskj.Control/BrowserSetting/BsOpenModuleHandler.cs

@@ -55,6 +55,14 @@ namespace Lskj.Control.BrowserSetting
                 outexception = null;
                 outtrn = true;
             }
+            else if (name == "CloseWin" && arguments.Length == 0)
+            {
+                CefProcessMessage cefProcessMessage = CefProcessMessage.Create("CloseWin");
+                V8Context.GetFrame().SendProcessMessage(CefProcessId.Browser, cefProcessMessage);
+                outreturnValue = CefV8Value.CreateUndefined();
+                outexception = null;
+                outtrn = true;
+            }
             else
             {
                 outreturnValue = null;

插件库/Lskj.Control/BrowserSetting/BsRenderProcessHandler.cs

@@ -16,4 +16,8 @@ namespace Lskj.Control.BrowserSetting
             var boundObject;
             if (!boundObject)
                 boundObject = {};
-          
+            (function() 
+            {
+                boundObject.OpenModule = function(menuId, menuName, dllName, modelFlag, urlParams) 
+                {
+                    native f

插件库/Lskj.Control/BrowserSetting2/BsClient.cs

@@ -11,6 +11,7 @@ namespace Lskj.Control.BrowserSetting2
 {
     public class BsClient : CefClient
     {
+        public FrmWebBrowser2 frmWebBrowser;
         public event EventHandler OnCreated;
         private readonly CefLifeSpanHandler lifeSpanHandler;
         private readonly CefDownloadHandler downloadHandler;
@@ -75,4 +76,17 @@ namespace Lskj.Control.BrowserSetting2
             }
             else if (message.Name.Equals("OpenOnRightClick"))
             {
-                string arg0 = message
+                string arg0 = message.Arguments.GetString(0);
+                string arg1 = message.Arguments.GetString(1);
+                string arg2 = message.Arguments.GetString(2);
+                string arg3 = message.Arguments.GetString(3);
+                if (ERPInfo.Instance.MainControl.InvokeRequired)
+                {
+                    ERPInfo.Instance.MainControl.Invoke(new Action(() =>
+                    {
+                        BrowserSetting.BsOpenModuleHandler.OpenRightModule(arg0, arg1, arg2, arg3);
+                    }));
+                }
+                else
+                {
+                    BrowserSetting.BsOpenModuleHandler.OpenRightModule(arg0, ar

插件库/Lskj.Control/FrmWebBrowser.cs

@@ -46,7 +46,6 @@ namespace Lskj.Control
             cefWindowInfo.SetAsChild(this.Handle, new CefRectangle(0, 0, this.Width, this.Height));
             var bsClient = new BsClient(RightKeyFlag);
             bsClient.frmWebBrowser = this;
-
             bsClient.OnCreated += bsClient_OnCreated;
             var cefBrowserSettings = new CefBrowserSettings();
             //Url = "https://ie.icoa.cn/";

插件库/Lskj.Control/FrmWebBrowser2.cs

@@ -48,6 +48,7 @@ namespace Lskj.Control
             var cefWindowInfo = CefWindowInfo.Create();
             cefWindowInfo.SetAsChild(this.Handle, new CefRectangle(0, 0, this.Width, this.Height));
             var bsClient = new BsClient(RightKeyFlag, this.AllowDownload);
+            bsClient.frmWebBrowser = this;
             bsClient.OnCreated += bsClient_OnCreated;
             var cefBrowserSettings = new CefBrowserSettings() { };
             //Url = "https://ie.icoa.cn/";