cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化模块资源释放与异步预加载

Browse Source
This commit is contained in:
SugarChes
2026-09-03 14:16:48 +08:00
parent a263522b47
commit fddab16bd2
35 changed files with 1553 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/MenuStrip/BaseMenuStrip.cs
+40 -6
View File
@@ -1330,14 +1330,45 @@ namespace Lskj.Control.Model
SmartX1Api.SmartX1Close(keyHandle);
}
}
IForm form = FormHelper.LoadDllForm(dllName, str);
string guid = isAddPage ? Guid.NewGuid().ToString() : null;
StaticControl.ModuleResourceScope moduleScope = null;
XtraTabPage modulePage = null;
if (isAddPage)
{
modulePage = new XtraTabPage();
modulePage.Tag = guid;
moduleScope = new StaticControl.ModuleResourceScope(guid);
StaticControl.AttachModuleScope(modulePage, moduleScope);
moduleScope.Register(modulePage, () =>
{
if (!modulePage.IsDisposed)
modulePage.Dispose();
});
}
IForm form;
if (moduleScope == null)
{
form = FormHelper.LoadDllForm(dllName, str);
}
else
{
using (StaticControl.PushModuleScope(moduleScope))
{
form = FormHelper.LoadDllForm(dllName, str);
}
}
if (form == null)
{
if (moduleScope != null)
moduleScope.Dispose();
MessageUtil.Show(ResourceKeys.DyncmicDllNotFount);
return false;
}
if (form.SubForm == null)
{
if (moduleScope != null)
moduleScope.Dispose();
MessageUtil.Show(ResourceKeys.DyncmicDllInitFault);
return false;
}
@@ -1356,7 +1387,7 @@ namespace Lskj.Control.Model
form.SubForm.Text = model.MenuName;
if (isPrivateDll)
{
StaticControl.DogVerifyNoPageForms.Add(form);
StaticControl.RegisterProtectedForm(form);
}
if (form.SubForm is BaseForm)//dllName.Equals("Lskj.BaseAccraditation.dll", StringComparison.OrdinalIgnoreCase)
{
@@ -1384,8 +1415,7 @@ namespace Lskj.Control.Model
}
else
{
string guid = Guid.NewGuid().ToString();
XtraTabPage tp = new XtraTabPage();
XtraTabPage tp = modulePage;
tp.Text = model.MenuName;
if (!string.IsNullOrWhiteSpace(model.PageName))
@@ -1403,6 +1433,7 @@ namespace Lskj.Control.Model
tp.Controls.Add(form.SubForm);
tp.ShowCloseButton = DefaultBoolean.True;
tp.Dock = DockStyle.Fill;
StaticControl.RegisterModulePage(module, tp, form.SubForm);
//配置了右键刷新的情况下，在当前页签关闭时触发刷新
if (model.Refresh && this.OnRightCallback != null)
{
@@ -1412,13 +1443,16 @@ namespace Lskj.Control.Model
ERPInfo.Instance.CurrentModulePage = tp;
if (isPrivateDll)
{
StaticControl.DogVerifyModuleForms.Add(tp);
StaticControl.RegisterProtectedPage(tp);
}
if (form.SubForm is BaseForm)
{
(form.SubForm as BaseForm).ParentView = this.BaseGridView;
}
form.SubForm.Show();
using (StaticControl.PushModuleScope(moduleScope))
{
form.SubForm.Show();
}
ERPInfo.Instance.ModuleForms.Add(guid, module);
//直接页签打开模块会直接向后面运行，默认返回false避免外面执行右键刷新
return false;
插件库/Lskj.Control/Model/MyControl.cs
+43 -14
View File
@@ -15,6 +15,7 @@ using Newtonsoft.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Data.Common;
using System.Data.SqlClient;
@@ -34,6 +35,13 @@ namespace Lskj.Control.Model
/// </summary>
public class MyControl : IDisposable
{
// Runtime menus and managers are owned by this model instance.
private readonly IContainer _components = new Container();
/// <summary>
/// Raised once when this non-visual control model releases its owned
/// resources. Static runtime references use it to clear exact owners.
/// </summary>
public event EventHandler Disposed;
private const long UserSearchCooldownTicks =
TimeSpan.TicksPerMillisecond * 350;
private string _searchSql;
@@ -54,6 +62,10 @@ namespace Lskj.Control.Model
private bool mUserSearchInProgress;
private long mLastUserSearchCompletedTicks;
private int mAcceptedUserSearchCount;
public bool IsDisposed
{
get { return mDisposed; }
}
/// <summary>
/// 计算字段
/// </summary>
@@ -112,7 +124,7 @@ namespace Lskj.Control.Model
/// </summary>
public string RefreshControl;
protected bool mLoading = false;
protected Timer mTimer = new Timer();
protected Timer mTimer;
/// <summary>
/// 查询按钮
/// </summary>
@@ -304,7 +316,8 @@ namespace Lskj.Control.Model
/// </summary>
public MyControl()
{
mTimer = new Timer(_components);
StaticControl.RegisterModuleResource(this, Dispose);
}
/// <summary>
/// Initializes a new instance of the <see cref="MyControl"/> class.
@@ -315,12 +328,14 @@ namespace Lskj.Control.Model
/// <param name="treeView">The tree view.</param>
public MyControl(string searchSql, GridControlEx mainGridEx, TreeViewEx treeView = null, GridControlEx gridLeft = null, MyControl leftSearch = null)
{
mTimer = new Timer(_components);
this._searchSql = searchSql;
this._mainGridEx = mainGridEx;
if (this._mainGridEx != null) this._gridControl = _mainGridEx.GridControl;
this._tvLeft = treeView;
this._gridLeft = gridLeft;
this._leftSearch = leftSearch;
StaticControl.RegisterModuleResource(this, mainGridEx, Dispose);
}
/// <summary>
/// <para>说明：设置GridControlEx</para>
@@ -336,6 +351,7 @@ namespace Lskj.Control.Model
{
this._mainGridEx = mainGridEx;
if (this._mainGridEx != null) this._gridControl = _mainGridEx.GridControl;
StaticControl.RegisterModuleResource(this, mainGridEx, Dispose);
}
/// <summary>
/// <para>说明：设置GridLeft</para>
@@ -1039,7 +1055,7 @@ namespace Lskj.Control.Model
{
if (_popupMenu == null)
{
_popupMenu = new PopupMenu();
_popupMenu = new PopupMenu(_components);
}
_dropDown = new DropDownButton();
_dropDown.DropDownArrowStyle = DropDownArrowStyle.Show;
@@ -1052,7 +1068,7 @@ namespace Lskj.Control.Model
_dropDown.Leave += new EventHandler(OnDropDownLeave);
width = _dropDown.Location.X + _dropDown.Width;
BarManager barManager1 = new BarManager();
BarManager barManager1 = new BarManager(_components);
_popupMenu.Manager = barManager1;
_popupMenu.Name = "pm_search";
CreateSearchScheme();
@@ -1234,7 +1250,7 @@ namespace Lskj.Control.Model
{
if (_popupMenu == null)
{
_popupMenu = new PopupMenu();
_popupMenu = new PopupMenu(_components);
}
_dropDown = new DropDownButton();
_dropDown.DropDownArrowStyle = DropDownArrowStyle.Show;
@@ -1247,7 +1263,7 @@ namespace Lskj.Control.Model
_dropDown.Leave += new EventHandler(OnDropDownLeave);
width = _dropDown.Location.X + _dropDown.Width;
BarManager barManager1 = new BarManager();
BarManager barManager1 = new BarManager(_components);
_popupMenu.Manager = barManager1;
_popupMenu.Name = "pm_search";
CreateSearchScheme();
@@ -1778,6 +1794,7 @@ namespace Lskj.Control.Model
{
timer.Tick -= mTimerTick;
timer.Stop();
_components.Remove(timer);
timer.Dispose();
}
}
@@ -3294,7 +3311,7 @@ namespace Lskj.Control.Model
//menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
//menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
//StaticControl.RightMenuGridView = MainGridEx.GridView;
StaticControl.RightMenuMyControl = this;
StaticControl.SetRightMenuMyControl(this);
menu.Apply(menuRow);
if (!menu.issuccess)
{
@@ -6833,6 +6850,20 @@ namespace Lskj.Control.Model
mDisposed = true;
mUserSearchInProgress = false;
EventHandler disposed = Disposed;
Disposed = null;
if (disposed != null)
{
try
{
disposed(this, EventArgs.Empty);
}
catch
{
// Reference cleanup must not interrupt disposal.
}
}
Timer timer = mTimer;
mTimer = null;
if (timer != null)
@@ -6841,6 +6872,7 @@ namespace Lskj.Control.Model
{
timer.Tick -= mTimerTick;
timer.Stop();
_components.Remove(timer);
timer.Dispose();
}
catch
@@ -6882,17 +6914,10 @@ namespace Lskj.Control.Model
}
}
BarManager searchSchemeManager =
_popupMenu == null ? null : _popupMenu.Manager;
if (_popupMenu != null)
{
_popupMenu.Manager = null;
_popupMenu.ItemLinks.Clear();
_popupMenu.Dispose();
}
if (searchSchemeManager != null)
{
searchSchemeManager.Dispose();
}
if (_mainGridEx != null &&
@@ -6937,6 +6962,10 @@ namespace Lskj.Control.Model
ModuleResultDic.Clear();
ParaContrlsDic.Clear();
// PopupMenu, BarManager and any future non-visual components are
// disposed together with this MyControl instance.
_components.Dispose();
_controls = null;
_schemes = null;
_fixField = null;
插件库/Lskj.Control/Model/StaticBandedControl.cs
+27 -240
View File
@@ -1,268 +1,55 @@
using DevExpress.XtraGrid.Views.BandedGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraTab;
using Lskj.Control.ZKFinger;
using Lskj.Util;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using WinFormsControl = System.Windows.Forms.Control;
using Lskj.Util;
using DevExpress.XtraTab;
namespace Lskj.Control.Model
{
/// <summary>
/// Static registries for banded-grid drag helpers. The helpers unregister
/// themselves from these dictionaries when their GridView is disposed;
/// module closing therefore does not need to scan a control tree.
/// </summary>
public static class StaticBandedControl
{
public static void ReleaseModuleReferences(WinFormsControl moduleRoot, XtraTabPage modulePage, string moduleCode)
{
List<WinFormsControl> moduleControls = CollectModuleControls(moduleRoot, modulePage);
ReleaseModuleReferences(moduleControls, modulePage, moduleCode);
}
internal static void ReleaseModuleReferences(
IEnumerable<WinFormsControl> moduleControls,
XtraTabPage modulePage,
string moduleCode)
{
try
{
List<WinFormsControl> controls = new List<WinFormsControl>();
if (moduleControls != null)
foreach (WinFormsControl control in moduleControls)
if (control != null && !ContainsControl(controls, control))
controls.Add(control);
List<BandedGridView> bandedViews = CollectBandedGridViews(controls);
List<GridView> targetViews = CollectTargetGridViews(controls);
foreach (BandedGridView view in bandedViews)
BandedGridDragGrid.DisposeRegistrations(
BandedGridViewDragGridDic,
BandedTargetViewDragGridDic,
view,
null);
foreach (GridView view in targetViews)
BandedGridDragGrid.DisposeRegistrations(
BandedGridViewDragGridDic,
BandedTargetViewDragGridDic,
null,
view);
if (ContainsBandedGridView(bandedViews, SourceDragBandedGridView))
SourceDragBandedGridView = null;
RemoveConditionPanels(moduleCode, controls);
RemoveProtectedReferences(controls, modulePage);
}
catch (Exception exception)
{
System.Diagnostics.Debug.WriteLine("释放旧 Banded 模块引用失败：" + exception);
}
}
private static List<WinFormsControl> CollectModuleControls(
WinFormsControl moduleRoot,
XtraTabPage modulePage)
{
List<WinFormsControl> result = new List<WinFormsControl>();
AddModuleControls(result, moduleRoot);
if (!ReferenceEquals(moduleRoot, modulePage))
AddModuleControls(result, modulePage);
return result;
}
private static void AddModuleControls(
List<WinFormsControl> target,
WinFormsControl root)
{
if (root == null)
return;
foreach (WinFormsControl control in EnumerateControls(root))
if (!ContainsControl(target, control))
target.Add(control);
}
private static List<BandedGridView> CollectBandedGridViews(
IEnumerable<WinFormsControl> controls)
{
List<BandedGridView> result = new List<BandedGridView>();
if (controls == null)
return result;
foreach (WinFormsControl control in controls)
{
DevExpress.XtraGrid.GridControl grid = control as DevExpress.XtraGrid.GridControl;
if (grid == null)
continue;
try
{
AddBandedGridView(result, grid.MainView as BandedGridView);
foreach (DevExpress.XtraGrid.Views.Base.BaseView baseView in grid.ViewCollection)
AddBandedGridView(result, baseView as BandedGridView);
}
catch (Exception exception)
{
System.Diagnostics.Debug.WriteLine("读取旧 Banded 表格视图失败：" + exception);
}
}
return result;
}
private static void AddBandedGridView(
List<BandedGridView> target,
BandedGridView view)
{
if (view != null && !ContainsBandedGridView(target, view))
target.Add(view);
}
private static bool ContainsBandedGridView(
IEnumerable<BandedGridView> gridViews,
BandedGridView value)
{
if (gridViews == null || value == null)
return false;
foreach (BandedGridView gridView in gridViews)
if (ReferenceEquals(gridView, value))
return true;
return false;
}
private static List<GridView> CollectTargetGridViews(
IEnumerable<WinFormsControl> controls)
{
List<GridView> result = new List<GridView>();
if (controls == null)
return result;
foreach (WinFormsControl control in controls)
{
DevExpress.XtraGrid.GridControl grid = control as DevExpress.XtraGrid.GridControl;
if (grid == null)
continue;
try
{
AddGridView(result, grid.MainView as GridView);
foreach (DevExpress.XtraGrid.Views.Base.BaseView baseView in grid.ViewCollection)
AddGridView(result, baseView as GridView);
}
catch (Exception exception)
{
System.Diagnostics.Debug.WriteLine("读取旧 Banded 目标表格视图失败：" + exception);
}
}
return result;
}
private static void AddGridView(List<GridView> target, GridView view)
{
if (view != null && !ContainsGridView(target, view))
target.Add(view);
}
private static bool ContainsGridView(
IEnumerable<GridView> gridViews,
GridView value)
{
if (gridViews == null || value == null)
return false;
foreach (GridView gridView in gridViews)
if (ReferenceEquals(gridView, value))
return true;
return false;
}
private static IEnumerable<WinFormsControl> EnumerateControls(WinFormsControl root)
{
yield return root;
foreach (WinFormsControl child in root.Controls)
foreach (WinFormsControl nested in EnumerateControls(child))
yield return nested;
}
private static void RemoveConditionPanels(
string moduleCode,
IEnumerable<WinFormsControl> moduleControls)
{
foreach (string key in ConditionsPanelDic.Keys.ToList())
{
ModuleConditionsPanelEx panel;
if (!ConditionsPanelDic.TryGetValue(key, out panel) || panel == null || panel.IsDisposed)
{
ConditionsPanelDic.Remove(key);
continue;
}
if (string.Equals(key, moduleCode, StringComparison.OrdinalIgnoreCase) &&
IsConditionPanelOwnedByModule(panel, moduleControls))
ConditionsPanelDic.Remove(key);
}
}
private static bool IsConditionPanelOwnedByModule(
ModuleConditionsPanelEx panel,
IEnumerable<WinFormsControl> moduleControls)
{
if (panel == null)
return false;
if (ContainsControl(moduleControls, panel) || ContainsControl(moduleControls, panel.Owner))
return true;
MyControl parentControl = panel.ParentControlObj;
return parentControl != null &&
parentControl.MainGridEx != null &&
ContainsControl(moduleControls, parentControl.MainGridEx);
}
private static void RemoveProtectedReferences(
IEnumerable<WinFormsControl> moduleControls,
XtraTabPage modulePage)
{
while (modulePage != null && DogVerifyModuleForms.Remove(modulePage))
{
}
foreach (XtraTabPage item in DogVerifyModuleForms.ToList())
if (item == null || item.IsDisposed || ContainsControl(moduleControls, item))
DogVerifyModuleForms.Remove(item);
foreach (IForm item in DogVerifyNoPageForms.ToList())
if (item == null || item.SubForm == null || item.SubForm.IsDisposed ||
ContainsControl(moduleControls, item.SubForm))
DogVerifyNoPageForms.Remove(item);
}
private static bool ContainsControl(
IEnumerable<WinFormsControl> moduleControls,
WinFormsControl value)
{
if (moduleControls == null || value == null)
return false;
foreach (WinFormsControl control in moduleControls)
if (ReferenceEquals(control, value))
return true;
return false;
}
/// <summary>
/// 记录当前U盾权限窗口
/// </summary>
public static List<XtraTabPage> DogVerifyModuleForms = new List<XtraTabPage>();
public static List<IForm> DogVerifyNoPageForms = new List<IForm>();
/// <summary>
///模块打开时的条件界面
/// </summary>
public static Dictionary<string, ModuleConditionsPanelEx> ConditionsPanelDic = new Dictionary<string, ModuleConditionsPanelEx>();
// Keep the old public fields as aliases so already deployed plug-ins
// loaded from lib do not fail with MissingFieldException.
[System.Obsolete("请使用 StaticControl.DogVerifyModuleForms")]
public static List<XtraTabPage> DogVerifyModuleForms =
StaticControl.DogVerifyModuleForms;
[System.Obsolete("请使用 StaticControl.DogVerifyNoPageForms")]
public static List<IForm> DogVerifyNoPageForms =
StaticControl.DogVerifyNoPageForms;
[System.Obsolete("请使用 StaticControl.ConditionsPanelDic")]
public static Dictionary<string, ModuleConditionsPanelEx> ConditionsPanelDic =
StaticControl.ConditionsPanelDic;
/// <summary>
/// 表格拖拽类，key值为源表，多表格
/// </summary>
public static Dictionary<BandedGridView, List<BandedGridDragGrid>> BandedGridViewDragGridDic = new Dictionary<BandedGridView, List<BandedGridDragGrid>>();
public static Dictionary<BandedGridView, List<BandedGridDragGrid>>
BandedGridViewDragGridDic =
new Dictionary<BandedGridView, List<BandedGridDragGrid>>();
/// <summary>
/// 表格拖拽类，key值为目标表
/// </summary>
public static Dictionary<GridView, List<BandedGridDragGrid>> BandedTargetViewDragGridDic = new Dictionary<GridView, List<BandedGridDragGrid>>();
public static Dictionary<GridView, List<BandedGridDragGrid>>
BandedTargetViewDragGridDic =
new Dictionary<GridView, List<BandedGridDragGrid>>();
/// <summary>
/// 当前拖拽源表格
/// </summary>
public static BandedGridView SourceDragBandedGridView;
/// <summary>
/// 指纹识别模块
/// </summary>
public static FingerHelper fingerHelper;
/// <summary>
/// 进度条
/// </summary>
插件库/Lskj.Control/Model/StaticControl.cs
+702 -466
View File
File diff suppressed because it is too large Load Diff