fix: 收敛旧模块资源释放与诊断

2026-08-15 10:13:08 +08:00
parent 222ae3c08a
commit c49015d390
60 changed files with 4218 additions and 409 deletions
@@ -1,5 +1,6 @@
 using Lskj.Business;
 using Lskj.Model;
+using Lskj.Util;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -54,6 +55,19 @@ namespace Lskj.Control.BrowserSetting2
            return contextMenuHandler;
        }
        protected override bool OnProcessMessageReceived(CefBrowser browser, CefFrame frame, CefProcessId sourceProcess, CefProcessMessage message)
+        {
+            try
+            {
+                return OnProcessMessageReceivedCore(browser, frame, sourceProcess, message);
+            }
+            catch (Exception exception)
+            {
+                ReportProcessMessageFailure(exception);
+                return true;
+            }
+        }
+
+        private bool OnProcessMessageReceivedCore(CefBrowser browser, CefFrame frame, CefProcessId sourceProcess, CefProcessMessage message)
        {
            if (message.Name.Equals("OpenModule"))
            {
@@ -62,17 +76,17 @@ namespace Lskj.Control.BrowserSetting2
                string arg2 = message.Arguments.GetString(2);
                string arg3 = message.Arguments.GetString(3);
                string arg4 = message.Arguments.GetString(4);
-                if (ERPInfo.Instance.MainControl.InvokeRequired)
-                {
-                    ERPInfo.Instance.MainControl.Invoke(new Action(() =>
+                PostToUiThread(
+                    ERPInfo.Instance.MainControl,
+                    delegate
                    {
-                        BrowserSetting.BsOpenModuleHandler.OpenModule(arg0, arg1, arg2, arg3, arg4);
-                    }));
-                }
-                else
-                {
-                    BrowserSetting.BsOpenModuleHandler.OpenModule(arg0, arg1, arg2, arg3, arg4);
-                }
+                        BrowserSetting.BsOpenModuleHandler.OpenModule(
+                            arg0,
+                            arg1,
+                            arg2,
+                            arg3,
+                            arg4);
+                    });
            }
            else if (message.Name.Equals("OpenOnRightClick"))
            {
@@ -80,43 +94,140 @@ namespace Lskj.Control.BrowserSetting2
                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(() =>
+                PostToUiThread(
+                    ERPInfo.Instance.MainControl,
+                    delegate
                    {
-                        BrowserSetting.BsOpenModuleHandler.OpenRightModule(arg0, arg1, arg2, arg3);
-                    }));
-                }
-                else
-                {
-                    BrowserSetting.BsOpenModuleHandler.OpenRightModule(arg0, arg1, arg2, arg3);
-                }
+                        BrowserSetting.BsOpenModuleHandler.OpenRightModule(
+                            arg0,
+                            arg1,
+                            arg2,
+                            arg3);
+                    });
            }
            else if (message.Name.Equals("CloseWin"))
            {
-                if (frmWebBrowser != null && frmWebBrowser.Parent != null && frmWebBrowser.Parent.Parent != null && frmWebBrowser.Parent.Parent is BaseForm baseForm)
-                {
-                    if (baseForm.InvokeRequired)
-                    {
-                        baseForm.Invoke(new Action(() =>
-                        {
-                            baseForm.Close();
-                        }));
-                    }
-                    else
+                var browserControl = frmWebBrowser;
+                PostToUiThread(
+                    browserControl,
+                    delegate
                    {
+                        // Resolve the owning form only after returning to the
+                        // WinForms UI thread.
+                        var parent = browserControl.Parent;
+                        var baseForm = parent == null
+                            ? null
+                            : parent.Parent as BaseForm;
+                        if (baseForm == null || baseForm.IsDisposed)
+                            return;
+
                        baseForm.Close();
-                    }
-                }
+                    });
            }
            return base.OnProcessMessageReceived(browser, frame, sourceProcess, message);
        }
+
+        private static void PostToUiThread(
+            System.Windows.Forms.Control control,
+            Action action)
+        {
+            if (control == null || action == null || control.IsDisposed ||
+                !control.IsHandleCreated)
+                return;
+
+            Action guardedAction = delegate
+            {
+                if (control.IsDisposed)
+                    return;
+
+                try
+                {
+                    action();
+                }
+                catch (Exception exception)
+                {
+                    ReportProcessMessageFailure(exception);
+                }
+            };
+
+            try
+            {
+                // Never keep CEF's UI thread blocked while WinForms opens a
+                // modal module that may create another CEF browser.
+                control.BeginInvoke(guardedAction);
+            }
+            catch (Exception exception)
+            {
+                ReportProcessMessageFailure(exception);
+            }
+        }
+
+        private static void ReportProcessMessageFailure(Exception exception)
+        {
+            try
+            {
+                LogHelper.Instance.WriteError(exception);
+            }
+            catch
+            {
+                // Never propagate logging failures into a native CEF callback.
+            }
+
+            Action showError = delegate
+            {
+                try
+                {
+                    MessageUtil.Show(exception);
+                }
+                catch
+                {
+                }
+            };
+
+            try
+            {
+                System.Windows.Forms.Control mainControl = ERPInfo.Instance.MainControl;
+                if (mainControl == null || mainControl.IsDisposed ||
+                    !mainControl.IsHandleCreated)
+                    return;
+
+                if (mainControl.InvokeRequired)
+                    mainControl.BeginInvoke(showError);
+                else
+                    showError();
+            }
+            catch
+            {
+                // The main window may close while the callback is reporting.
+            }
+        }
+
        public void Created(CefBrowser cefBrowser)
        {
-            if (OnCreated != null)
+            if (frmWebBrowser != null && OnCreated != null)
            {
                OnCreated(cefBrowser, EventArgs.Empty);
            }
        }
+
+        public bool Closing(CefBrowser browser)
+        {
+            var control = frmWebBrowser;
+            return control != null && control.BrowserClosing(browser);
+        }
+
+        public void Closed(CefBrowser browser)
+        {
+            var control = frmWebBrowser;
+            if (control != null)
+            {
+                control.BrowserClosed(browser);
+                if (control.cefBrowserSettings == null)
+                {
+                    frmWebBrowser = null;
+                    OnCreated = null;
+                }
+            }
+        }
    }
 }