feat: 优化初始化缓存及控件功能
This commit is contained in:
@@ -133,6 +133,10 @@ namespace Lskj.Control.Model
|
||||
public DataRow CurrentData;
|
||||
public ModuleModel SystemModel;
|
||||
/// <summary>
|
||||
/// 外部已查询的MRP操作按钮数据;为空时保持原查询逻辑。
|
||||
/// </summary>
|
||||
public DataTable MrpClickMenus;
|
||||
/// <summary>
|
||||
/// 下拉框、搜索框控件对象
|
||||
/// </summary>
|
||||
public List<ControlModel> mControlList = new List<ControlModel>();
|
||||
@@ -899,10 +903,13 @@ namespace Lskj.Control.Model
|
||||
return controlModel;
|
||||
}));
|
||||
}
|
||||
Task<DataTable> rightDtGridRightMenusTask = cachesDic.AddTask(this, "RightDtGridRightMenus", new Task<DataTable>(() =>
|
||||
if (MrpClickMenus == null)
|
||||
{
|
||||
return BaseModuleImpl.GetBaseGridRightMenus(dynamicModel.ModuleCode, ModuleType.MrpClickBtn);
|
||||
}));
|
||||
Task<DataTable> rightDtGridRightMenusTask = cachesDic.AddTask(this, "RightDtGridRightMenus", new Task<DataTable>(() =>
|
||||
{
|
||||
return BaseModuleImpl.GetBaseGridRightMenus(dynamicModel.ModuleCode, ModuleType.MrpClickBtn);
|
||||
}));
|
||||
}
|
||||
return true;
|
||||
}));
|
||||
}
|
||||
@@ -1042,7 +1049,17 @@ namespace Lskj.Control.Model
|
||||
}
|
||||
if (dynamicModel != null && !string.IsNullOrEmpty(dynamicModel.ModuleCode))
|
||||
{
|
||||
if (!dataCaches.GetValue(parent, "SysModel", out ModuleModel moduleModel))
|
||||
ModuleModel moduleModel = null;
|
||||
if (SystemModel != null && string.Equals(SystemModel.ModeCode, dynamicModel.ModuleCode, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
moduleModel = SystemModel;
|
||||
}
|
||||
if (moduleModel == null && dataCaches.GetValue(parent, "SysModel", out ModuleModel cacheModuleModel) &&
|
||||
cacheModuleModel != null && string.Equals(cacheModuleModel.ModeCode, dynamicModel.ModuleCode, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
moduleModel = cacheModuleModel;
|
||||
}
|
||||
if (moduleModel == null)
|
||||
{
|
||||
moduleModel = new ModuleModel(MainImpl.GetSystemdllTab(dynamicModel.ModuleCode));
|
||||
}
|
||||
@@ -1060,13 +1077,14 @@ namespace Lskj.Control.Model
|
||||
btnCondSearch.Click += new EventHandler(OnBtnCondSearchClick);
|
||||
}
|
||||
}
|
||||
DataTable rightDt = null;
|
||||
if (dynamicModel != null)
|
||||
DataTable rightDt = MrpClickMenus;
|
||||
if (rightDt == null && dynamicModel != null)
|
||||
{
|
||||
if (!dataCaches.GetValue(this, "RightDtGridRightMenus", out rightDt))
|
||||
{
|
||||
rightDt = BaseModuleImpl.GetBaseGridRightMenus(dynamicModel.ModuleCode, ModuleType.MrpClickBtn);
|
||||
}
|
||||
MrpClickMenus = rightDt;
|
||||
}
|
||||
if (rightDt != null && rightDt.Rows.Count > 0)
|
||||
{
|
||||
@@ -1220,13 +1238,14 @@ namespace Lskj.Control.Model
|
||||
_popupMenu.Name = "pm_search";
|
||||
CreateSearchScheme();
|
||||
}
|
||||
DataTable rightDt = null;
|
||||
if (dynamicModel != null)
|
||||
DataTable rightDt = MrpClickMenus;
|
||||
if (rightDt == null && dynamicModel != null)
|
||||
{
|
||||
if (!dynamicModel.DataCaches.GetValue(this, "RightDtGridRightMenus", out rightDt))
|
||||
{
|
||||
rightDt = BaseModuleImpl.GetBaseGridRightMenus(dynamicModel.ModuleCode, ModuleType.MrpClickBtn);
|
||||
}
|
||||
MrpClickMenus = rightDt;
|
||||
}
|
||||
if (rightDt != null && rightDt.Rows.Count > 0)
|
||||
{
|
||||
@@ -1295,10 +1314,13 @@ namespace Lskj.Control.Model
|
||||
return controlModel;
|
||||
}));
|
||||
}
|
||||
Task<DataTable> rightDtGridRightMenusTask = cachesDic.AddTask(this, "RightDtGridRightMenus", new Task<DataTable>(() =>
|
||||
if (MrpClickMenus == null)
|
||||
{
|
||||
return BaseModuleImpl.GetBaseGridRightMenus(dynamicModel.ModuleCode, ModuleType.MrpClickBtn);
|
||||
}));
|
||||
Task<DataTable> rightDtGridRightMenusTask = cachesDic.AddTask(this, "RightDtGridRightMenus", new Task<DataTable>(() =>
|
||||
{
|
||||
return BaseModuleImpl.GetBaseGridRightMenus(dynamicModel.ModuleCode, ModuleType.MrpClickBtn);
|
||||
}));
|
||||
}
|
||||
return true;
|
||||
}));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user