修正shortid.dll文件位置。

修正ModuleDataMonitor在BaseApp中被屏蔽的问题,导致UI无法获取模组Slot中Wafer信息的问题。
This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-04-15 13:43:41 +08:00
parent 4647e085e8
commit adf7d885af
3 changed files with 17 additions and 16 deletions

BIN
Dependencies/shortid.dll vendored Normal file

Binary file not shown.

View File

@ -34,24 +34,24 @@ namespace MECF.Framework.UI.Client.ClientBase
public BaseApp()
{
this.UserMode = UserMode.None;
this.Initialized = false;
UserMode = UserMode.None;
Initialized = false;
this.Configure();
Configure();
}
public void Initialize(bool force = false)
{
if (this.Initialized && !force)
if (Initialized && !force)
return;
this.MenuLoader = new MenuLoader(Path.Combine(PathManager.GetCfgDir(), "Menu.xml"));
MenuLoader = new MenuLoader(Path.Combine(PathManager.GetCfgDir(), "Menu.xml"));
this.MenuLoader.Load();
MenuLoader.Load();
this.MenuManager = new MenuManager();
MenuManager = new MenuManager();
this.UserContext = new UserContext();
UserContext = new UserContext();
var file = string.Format("{0}MECF.Framework.UI.Client.dll", System.AppDomain.CurrentDomain.BaseDirectory);
if (File.Exists(file))
@ -60,13 +60,13 @@ namespace MECF.Framework.UI.Client.ClientBase
AssemblySource.Instance.Add(assembly);
}
this.OnInitialize();
OnInitialize();
//must be called after specific project initialized
//_dataMonitor = new ModuleDataMonitor();
_dataMonitor = new ModuleDataMonitor();
this.Initialized = true;
Initialized = true;
}
public virtual void Dispose()
@ -77,7 +77,7 @@ namespace MECF.Framework.UI.Client.ClientBase
protected void Configure()
{
//config skin/language...
this.OnConfiguration();
OnConfiguration();
}
@ -88,9 +88,9 @@ namespace MECF.Framework.UI.Client.ClientBase
public int GetPermission(string menuid)
{
int per = 1;
if (this.UserContext != null)
if (UserContext != null)
{
string[] list = this.UserContext.Role.MenuPermission.Split(';');
string[] list = UserContext.Role.MenuPermission.Split(';');
var result = from r in list
where r.Split(',')[0] == menuid
select r;

View File

@ -38,8 +38,9 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="shortid">
<HintPath>..\ThirdParty\dlls\shortid.dll</HintPath>
<Reference Include="shortid, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Dependencies\shortid.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />