From ebe387c9697042cf35a15f6de73aea2378c032a2 Mon Sep 17 00:00:00 2001 From: SL <123@123.com> Date: Sat, 2 Sep 2023 22:55:35 +0800 Subject: [PATCH] =?UTF-8?q?[UI.Client]=20=E5=B0=86Menuinfo=E3=80=81RecipeI?= =?UTF-8?q?nfo=E3=80=81StepInfo=E3=80=81ContentInfo=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E4=BB=8ERoleItem.cs=E4=B8=AD=E7=A7=BB=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E4=B8=BA=E5=8D=95=E7=8B=ACcs=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CenterViews/Configs/Roles/ContentInfo.cs | 109 +++++ .../CenterViews/Configs/Roles/MenuInfo.cs | 116 +++++ .../CenterViews/Configs/Roles/RecipeInfo.cs | 116 +++++ .../CenterViews/Configs/Roles/RoleItem.cs | 420 ------------------ .../CenterViews/Configs/Roles/StepInfo.cs | 117 +++++ .../MECF.Framework.UI.Client.csproj | 4 + 6 files changed, 462 insertions(+), 420 deletions(-) create mode 100644 MECF.Framework.UI.Client/CenterViews/Configs/Roles/ContentInfo.cs create mode 100644 MECF.Framework.UI.Client/CenterViews/Configs/Roles/MenuInfo.cs create mode 100644 MECF.Framework.UI.Client/CenterViews/Configs/Roles/RecipeInfo.cs create mode 100644 MECF.Framework.UI.Client/CenterViews/Configs/Roles/StepInfo.cs diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/ContentInfo.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/ContentInfo.cs new file mode 100644 index 0000000..01ba7c6 --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/ContentInfo.cs @@ -0,0 +1,109 @@ +using Caliburn.Micro.Core; +using MECF.Framework.UI.Client.ClientBase; + +namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles; + +public class ContentInfo : PropertyChangedBase + { + private string _strPermissionID; + public string ID + { + get { return _strPermissionID; } + set + { + if (value != _strPermissionID) + _strPermissionID = value; + } + } + + private MenuPermissionEnum _EnummenuPermission; + public MenuPermissionEnum EnumPermission + { + get { return _EnummenuPermission; } + set + { + if (value != _EnummenuPermission) + { + _EnummenuPermission = value; + _IndexPermission = (int)_EnummenuPermission; + } + } + } + + private string _StrPermission; + public string stringPermission + { + get { return _StrPermission; } + set + { + if (value != _StrPermission) + _StrPermission = value; + } + } + + private int _IndexPermission; + public int IndexPermission + { + get { return _IndexPermission; } + set + { + if (value != _IndexPermission) + { + _IndexPermission = value; + EnumPermission = (MenuPermissionEnum)_IndexPermission; + } + } + } + + private int _DisplayIndexPermission; + public int DisplayIndexPermission + { + get { return _DisplayIndexPermission; } + set + { + if (value != _DisplayIndexPermission) + { + _DisplayIndexPermission = value; + } + } + } + + private bool _ComboBoxSaved = false; + public bool ComboBoxSaved + { + get { return _ComboBoxSaved; } + set + { + if (_ComboBoxSaved != value) + { + _ComboBoxSaved = value; + NotifyOfPropertyChange("ComboBoxSaved"); + } + } + } + + private string _strName; + public string Name + { + get { return _strName; } + set + { + if (value != _strName) + _strName = value; + } + } + + public ContentInfo Clone() + { + ContentInfo contentInfo = new ContentInfo(); + + contentInfo.Name = this.Name; + contentInfo.stringPermission = this.stringPermission; + contentInfo.EnumPermission = this.EnumPermission; + contentInfo.ID = this.ID; + contentInfo.IndexPermission = this.IndexPermission; + contentInfo.DisplayIndexPermission = this.IndexPermission - 1; + + return contentInfo; + } + } \ No newline at end of file diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/MenuInfo.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/MenuInfo.cs new file mode 100644 index 0000000..f81f14f --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/MenuInfo.cs @@ -0,0 +1,116 @@ +using Caliburn.Micro.Core; +using MECF.Framework.UI.Client.ClientBase; + +namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles; + +public class MenuInfo : PropertyChangedBase +{ + private string _strMenuID; + + public string ID + { + get { return _strMenuID; } + set + { + if (value != _strMenuID) + _strMenuID = value; + } + } + + private MenuPermissionEnum _EnummenuPermission; + + public MenuPermissionEnum EnumPermission + { + get { return _EnummenuPermission; } + set + { + if (value != _EnummenuPermission) + { + _EnummenuPermission = value; + _IndexMenuPermission = (int)_EnummenuPermission; + } + } + } + + private string _StrMenuPermission; + + public string stringPermission + { + get { return _StrMenuPermission; } + set + { + if (value != _StrMenuPermission) + _StrMenuPermission = value; + } + } + + private int _IndexMenuPermission; + + public int IndexPermission + { + get { return _IndexMenuPermission; } + set + { + if (value != _IndexMenuPermission) + { + _IndexMenuPermission = value; + EnumPermission = (MenuPermissionEnum)_IndexMenuPermission; + } + } + } + + private int _DisplayIndexPermission; + + public int DisplayIndexPermission + { + get { return _DisplayIndexPermission; } + set + { + if (value != _DisplayIndexPermission) + { + _DisplayIndexPermission = value; + } + } + } + + private bool _ComboBoxSaved = false; + + public bool ComboBoxSaved + { + get { return _ComboBoxSaved; } + set + { + if (_ComboBoxSaved != value) + { + _ComboBoxSaved = value; + NotifyOfPropertyChange("ComboBoxSaved"); + } + } + } + + private string _strMenuName; + + public string Name + { + get { return _strMenuName; } + set + { + if (value != _strMenuName) + _strMenuName = value; + } + } + + public MenuInfo Clone() + { + MenuInfo menuInfo = new MenuInfo(); + + menuInfo.Name = this.Name; + menuInfo.stringPermission = this.stringPermission; + menuInfo.EnumPermission = this.EnumPermission; + menuInfo.ID = this.ID; + menuInfo.IndexPermission = this.IndexPermission; + menuInfo.DisplayIndexPermission = this.IndexPermission - 1; + + return menuInfo; + } +} \ No newline at end of file diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RecipeInfo.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RecipeInfo.cs new file mode 100644 index 0000000..0c1a1c3 --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RecipeInfo.cs @@ -0,0 +1,116 @@ +using Caliburn.Micro.Core; +using MECF.Framework.UI.Client.ClientBase; + +namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles; + +public class RecipeInfo : PropertyChangedBase +{ + private string _strRecipeID; + + public string ID + { + get { return _strRecipeID; } + set + { + if (value != _strRecipeID) + _strRecipeID = value; + } + } + + private MenuPermissionEnum _EnummenuPermission; + + public MenuPermissionEnum EnumPermission + { + get { return _EnummenuPermission; } + set + { + if (value != _EnummenuPermission) + { + _EnummenuPermission = value; + _IndexRecipePermission = (int)_EnummenuPermission; + } + } + } + + private string _StrRecipePermission; + + public string stringPermission + { + get { return _StrRecipePermission; } + set + { + if (value != _StrRecipePermission) + _StrRecipePermission = value; + } + } + + private int _IndexRecipePermission; + + public int IndexPermission + { + get { return _IndexRecipePermission; } + set + { + if (value != _IndexRecipePermission) + { + _IndexRecipePermission = value; + EnumPermission = (MenuPermissionEnum)_IndexRecipePermission; + } + } + } + + private int _DisplayIndexPermission; + + public int DisplayIndexPermission + { + get { return _DisplayIndexPermission; } + set + { + if (value != _DisplayIndexPermission) + { + _DisplayIndexPermission = value; + } + } + } + + private bool _ComboBoxSaved = false; + + public bool ComboBoxSaved + { + get { return _ComboBoxSaved; } + set + { + if (_ComboBoxSaved != value) + { + _ComboBoxSaved = value; + NotifyOfPropertyChange("ComboBoxSaved"); + } + } + } + + private string _strRecipeName; + + public string Name + { + get { return _strRecipeName; } + set + { + if (value != _strRecipeName) + _strRecipeName = value; + } + } + + public RecipeInfo Clone() + { + RecipeInfo recipeInfo = new RecipeInfo(); + + recipeInfo.Name = this.Name; + recipeInfo.stringPermission = this.stringPermission; + recipeInfo.EnumPermission = this.EnumPermission; + recipeInfo.ID = this.ID; + recipeInfo.IndexPermission = this.IndexPermission; + recipeInfo.DisplayIndexPermission = this.IndexPermission - 1; + + return recipeInfo; + } +} \ No newline at end of file diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleItem.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleItem.cs index bdefcee..d161893 100644 --- a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleItem.cs +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleItem.cs @@ -227,424 +227,4 @@ namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles return false; } } - - public class MenuInfo : PropertyChangedBase - { - private string _strMenuID; - public string ID - { - get { return _strMenuID; } - set - { - if (value != _strMenuID) - _strMenuID = value; - } - } - - private MenuPermissionEnum _EnummenuPermission; - public MenuPermissionEnum EnumPermission - { - get { return _EnummenuPermission; } - set - { - if (value != _EnummenuPermission) - { - _EnummenuPermission = value; - _IndexMenuPermission = (int)_EnummenuPermission; - } - } - } - - private string _StrMenuPermission; - public string stringPermission - { - get { return _StrMenuPermission; } - set - { - if (value != _StrMenuPermission) - _StrMenuPermission = value; - } - } - - private int _IndexMenuPermission; - public int IndexPermission - { - get { return _IndexMenuPermission; } - set - { - if (value != _IndexMenuPermission) - { - _IndexMenuPermission = value; - EnumPermission = (MenuPermissionEnum)_IndexMenuPermission; - } - } - } - - private int _DisplayIndexPermission; - public int DisplayIndexPermission - { - get { return _DisplayIndexPermission; } - set - { - if (value != _DisplayIndexPermission) - { - _DisplayIndexPermission = value; - } - } - } - - private bool _ComboBoxSaved = false; - public bool ComboBoxSaved - { - get { return _ComboBoxSaved; } - set - { - if (_ComboBoxSaved != value) - { - _ComboBoxSaved = value; - NotifyOfPropertyChange("ComboBoxSaved"); - } - } - } - - private string _strMenuName; - public string Name - { - get { return _strMenuName; } - set - { - if (value != _strMenuName) - _strMenuName = value; - } - } - - public MenuInfo Clone() - { - MenuInfo menuInfo = new MenuInfo(); - - menuInfo.Name = this.Name; - menuInfo.stringPermission = this.stringPermission; - menuInfo.EnumPermission = this.EnumPermission; - menuInfo.ID = this.ID; - menuInfo.IndexPermission = this.IndexPermission; - menuInfo.DisplayIndexPermission = this.IndexPermission - 1; - - return menuInfo; - } - } - - public class RecipeInfo : PropertyChangedBase - { - private string _strRecipeID; - public string ID - { - get { return _strRecipeID; } - set - { - if (value != _strRecipeID) - _strRecipeID = value; - } - } - - private MenuPermissionEnum _EnummenuPermission; - public MenuPermissionEnum EnumPermission - { - get { return _EnummenuPermission; } - set - { - if (value != _EnummenuPermission) - { - _EnummenuPermission = value; - _IndexRecipePermission = (int)_EnummenuPermission; - } - } - } - - private string _StrRecipePermission; - public string stringPermission - { - get { return _StrRecipePermission; } - set - { - if (value != _StrRecipePermission) - _StrRecipePermission = value; - } - } - - private int _IndexRecipePermission; - public int IndexPermission - { - get { return _IndexRecipePermission; } - set - { - if (value != _IndexRecipePermission) - { - _IndexRecipePermission = value; - EnumPermission = (MenuPermissionEnum)_IndexRecipePermission; - } - } - } - - private int _DisplayIndexPermission; - public int DisplayIndexPermission - { - get { return _DisplayIndexPermission; } - set - { - if (value != _DisplayIndexPermission) - { - _DisplayIndexPermission = value; - } - } - } - - private bool _ComboBoxSaved = false; - public bool ComboBoxSaved - { - get { return _ComboBoxSaved; } - set - { - if (_ComboBoxSaved != value) - { - _ComboBoxSaved = value; - NotifyOfPropertyChange("ComboBoxSaved"); - } - } - } - - private string _strRecipeName; - public string Name - { - get { return _strRecipeName; } - set - { - if (value != _strRecipeName) - _strRecipeName = value; - } - } - - public RecipeInfo Clone() - { - RecipeInfo recipeInfo = new RecipeInfo(); - - recipeInfo.Name = this.Name; - recipeInfo.stringPermission = this.stringPermission; - recipeInfo.EnumPermission = this.EnumPermission; - recipeInfo.ID = this.ID; - recipeInfo.IndexPermission = this.IndexPermission; - recipeInfo.DisplayIndexPermission = this.IndexPermission - 1; - - return recipeInfo; - } - } - - public class StepInfo : PropertyChangedBase - { - private string _strStepID; - public string ID - { - get { return _strStepID; } - set - { - if (value != _strStepID) - _strStepID = value; - } - } - - private MenuPermissionEnum _EnummenuPermission; - public MenuPermissionEnum EnumPermission - { - get { return _EnummenuPermission; } - set - { - if (value != _EnummenuPermission) - { - _EnummenuPermission = value; - _IndexStepPermission = (int)_EnummenuPermission; - } - } - } - - private string _StrStepPermission; - public string stringPermission - { - get { return _StrStepPermission; } - set - { - if (value != _StrStepPermission) - _StrStepPermission = value; - } - } - - private int _IndexStepPermission; - public int IndexPermission - { - get { return _IndexStepPermission; } - set - { - if (value != _IndexStepPermission) - { - _IndexStepPermission = value; - EnumPermission = (MenuPermissionEnum)_IndexStepPermission; - } - } - } - - private int _DisplayIndexPermission; - public int DisplayIndexPermission - { - get { return _DisplayIndexPermission; } - set - { - if (value != _DisplayIndexPermission) - { - _DisplayIndexPermission = value; - } - } - } - - private bool _ComboBoxSaved = false; - public bool ComboBoxSaved - { - get { return _ComboBoxSaved; } - set - { - if (_ComboBoxSaved != value) - { - _ComboBoxSaved = value; - NotifyOfPropertyChange("ComboBoxSaved"); - } - } - } - - private string _strStepName; - public string Name - { - get { return _strStepName; } - set - { - if (value != _strStepName) - _strStepName = value; - } - } - - public StepInfo Clone() - { - StepInfo stepInfo = new StepInfo(); - - stepInfo.Name = this.Name; - stepInfo.stringPermission = this.stringPermission; - stepInfo.EnumPermission = this.EnumPermission; - stepInfo.ID = this.ID; - stepInfo.IndexPermission = this.IndexPermission; - stepInfo.DisplayIndexPermission = this.IndexPermission - 1; - - return stepInfo; - } - } - - public class ContentInfo : PropertyChangedBase - { - private string _strPermissionID; - public string ID - { - get { return _strPermissionID; } - set - { - if (value != _strPermissionID) - _strPermissionID = value; - } - } - - private MenuPermissionEnum _EnummenuPermission; - public MenuPermissionEnum EnumPermission - { - get { return _EnummenuPermission; } - set - { - if (value != _EnummenuPermission) - { - _EnummenuPermission = value; - _IndexPermission = (int)_EnummenuPermission; - } - } - } - - private string _StrPermission; - public string stringPermission - { - get { return _StrPermission; } - set - { - if (value != _StrPermission) - _StrPermission = value; - } - } - - private int _IndexPermission; - public int IndexPermission - { - get { return _IndexPermission; } - set - { - if (value != _IndexPermission) - { - _IndexPermission = value; - EnumPermission = (MenuPermissionEnum)_IndexPermission; - } - } - } - - private int _DisplayIndexPermission; - public int DisplayIndexPermission - { - get { return _DisplayIndexPermission; } - set - { - if (value != _DisplayIndexPermission) - { - _DisplayIndexPermission = value; - } - } - } - - private bool _ComboBoxSaved = false; - public bool ComboBoxSaved - { - get { return _ComboBoxSaved; } - set - { - if (_ComboBoxSaved != value) - { - _ComboBoxSaved = value; - NotifyOfPropertyChange("ComboBoxSaved"); - } - } - } - - private string _strName; - public string Name - { - get { return _strName; } - set - { - if (value != _strName) - _strName = value; - } - } - - public ContentInfo Clone() - { - ContentInfo contentInfo = new ContentInfo(); - - contentInfo.Name = this.Name; - contentInfo.stringPermission = this.stringPermission; - contentInfo.EnumPermission = this.EnumPermission; - contentInfo.ID = this.ID; - contentInfo.IndexPermission = this.IndexPermission; - contentInfo.DisplayIndexPermission = this.IndexPermission - 1; - - return contentInfo; - } - } } diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/StepInfo.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/StepInfo.cs new file mode 100644 index 0000000..ef88077 --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/StepInfo.cs @@ -0,0 +1,117 @@ +using Caliburn.Micro.Core; +using MECF.Framework.UI.Client.ClientBase; + +namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles; + +public class StepInfo : PropertyChangedBase +{ + private string _strStepID; + + public string ID + { + get { return _strStepID; } + set + { + if (value != _strStepID) + _strStepID = value; + } + } + + private MenuPermissionEnum _EnummenuPermission; + + public MenuPermissionEnum EnumPermission + { + get { return _EnummenuPermission; } + set + { + if (value != _EnummenuPermission) + { + _EnummenuPermission = value; + _IndexStepPermission = (int)_EnummenuPermission; + } + } + } + + private string _StrStepPermission; + + public string stringPermission + { + get { return _StrStepPermission; } + set + { + if (value != _StrStepPermission) + _StrStepPermission = value; + } + } + + private int _IndexStepPermission; + + public int IndexPermission + { + get { return _IndexStepPermission; } + set + { + if (value != _IndexStepPermission) + { + _IndexStepPermission = value; + EnumPermission = (MenuPermissionEnum)_IndexStepPermission; + } + } + } + + private int _DisplayIndexPermission; + + public int DisplayIndexPermission + { + get { return _DisplayIndexPermission; } + set + { + if (value != _DisplayIndexPermission) + { + _DisplayIndexPermission = value; + } + } + } + + private bool _ComboBoxSaved = false; + + public bool ComboBoxSaved + { + get { return _ComboBoxSaved; } + set + { + if (_ComboBoxSaved != value) + { + _ComboBoxSaved = value; + NotifyOfPropertyChange("ComboBoxSaved"); + } + } + } + + private string _strStepName; + + public string Name + { + get { return _strStepName; } + set + { + if (value != _strStepName) + _strStepName = value; + } + } + + public StepInfo Clone() + { + StepInfo stepInfo = new StepInfo(); + + stepInfo.Name = this.Name; + stepInfo.stringPermission = this.stringPermission; + stepInfo.EnumPermission = this.EnumPermission; + stepInfo.ID = this.ID; + stepInfo.IndexPermission = this.IndexPermission; + stepInfo.DisplayIndexPermission = this.IndexPermission - 1; + + return stepInfo; + } +} + \ No newline at end of file diff --git a/MECF.Framework.UI.Client/MECF.Framework.UI.Client.csproj b/MECF.Framework.UI.Client/MECF.Framework.UI.Client.csproj index 79c1057..57d47c7 100644 --- a/MECF.Framework.UI.Client/MECF.Framework.UI.Client.csproj +++ b/MECF.Framework.UI.Client/MECF.Framework.UI.Client.csproj @@ -203,7 +203,11 @@ AlarmView.xaml + + + + RadioCheckBox.xaml