diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj index e6bacf2..3e2e4af 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj @@ -153,9 +153,6 @@ False ..\..\..\PlugInPlatform\Mesnac.PlugIn.dll - - ..\Microsoft.Office.Interop.Excel.dll - @@ -776,15 +773,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 8 - 0 - primary - False - True - {00020813-0000-0000-C000-000000000046} 1 diff --git a/Actions/Default/Mesnac.Action.Default/Purview/CheckPurviewControl.cs b/Actions/Default/Mesnac.Action.Default/Purview/CheckPurviewControl.cs index ff37614..e1cb867 100644 --- a/Actions/Default/Mesnac.Action.Default/Purview/CheckPurviewControl.cs +++ b/Actions/Default/Mesnac.Action.Default/Purview/CheckPurviewControl.cs @@ -28,7 +28,7 @@ namespace Mesnac.Action.Default.Purview { return;//窗体不验证权限 } - if (UserInfo.Instance.RoleGUID == "-mesnac") + if (UserInfo.Instance.RoleGUID == "-99") { return;//超级用户 } diff --git a/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.cs b/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.cs index c74fd68..f2e9e34 100644 --- a/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.cs +++ b/Actions/Default/Mesnac.Action.Default/Purview/FrmSysLogin.cs @@ -206,7 +206,7 @@ namespace Mesnac.Action.Default.Purview #region 如果是强制登录则放行 - if (Mesnac.Basic.UserInfo.Instance.RoleGUID.Equals("-mesnac") || _ower == Mesnac.Gui.Workbench.WorkbenchSingleton.Workbench) + if (Mesnac.Basic.UserInfo.Instance.RoleGUID.Equals("-99") || _ower == Mesnac.Gui.Workbench.WorkbenchSingleton.Workbench) { return true; } @@ -306,7 +306,7 @@ namespace Mesnac.Action.Default.Purview private bool superLogin() { bool bResult = false; - if (this.txtPWD.Text == "-mesnac") + if (this.txtPWD.Text == "-99") { UserInfo.Instance.RoleGUID = "-99"; UserInfo.Instance.UserGUID = "-"; diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml index 3600a0d..9638ce4 100644 --- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml +++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/Main/Mesnac.Gui.Run/ViewContent/BrowserCommand.cs b/Main/Mesnac.Gui.Run/ViewContent/BrowserCommand.cs index 0c30d06..22fa5b5 100644 --- a/Main/Mesnac.Gui.Run/ViewContent/BrowserCommand.cs +++ b/Main/Mesnac.Gui.Run/ViewContent/BrowserCommand.cs @@ -246,7 +246,7 @@ namespace Mesnac.Gui.Run.ViewContent public bool IsValid(object owner, ICSharpCode.Core.Condition condition) { //如果是超级管理员或没经过登录(独立运行)则可用 - if (UserInfo.Instance.RoleGUID == "-mesnac" || UserInfo.Instance.RoleGUID == "-1") + if (UserInfo.Instance.RoleGUID == "-99" || UserInfo.Instance.RoleGUID == "-1") { return true; }