diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/PermissionType.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/PermissionType.cs new file mode 100644 index 0000000..2ac5949 --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/PermissionType.cs @@ -0,0 +1,9 @@ +using MECF.Framework.UI.Client.ClientBase; + +namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles; + +public class PermissionType +{ + public MenuPermissionEnum EnumPermission { get; set; } + public string StringPermission { get; set; } +} diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionMapper.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionMapper.cs index 8033a9e..2be708d 100644 --- a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionMapper.cs +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionMapper.cs @@ -1,61 +1,55 @@ using System.Collections.ObjectModel; +using Aitex.Core.Util; using MECF.Framework.UI.Client.ClientBase; using OpenSEMI.ClientBase; namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles { - public class RolePermissionMapper + public class RolePermissionMapper : Singleton { - private RolePermissionMapper() + #region Constructors + + public RolePermissionMapper() { - _DicPermission.Add(new PermissionType() + PermissionDictionary.Add(new PermissionType() { EnumPermission = MenuPermissionEnum.MP_NONE, StringPermission = "NONE" }); - _DicPermission.Add(new PermissionType() + PermissionDictionary.Add(new PermissionType() { EnumPermission = MenuPermissionEnum.MP_READ, StringPermission = "Read" }); - _DicPermission.Add(new PermissionType() + PermissionDictionary.Add(new PermissionType() { EnumPermission = MenuPermissionEnum.MP_READ_WRITE, StringPermission = "Read & Write" }); } - private static RolePermissionMapper _Instance = null; - public static RolePermissionMapper Instance + #endregion + + + #region Properties + + public ObservableCollection PermissionDictionary { get; } = new(); + + #endregion + + #region Methods + + public int ToInt(MenuPermissionEnum enumPermission) { - get + return (int)enumPermission; + } + + public string ToString(MenuPermissionEnum enumPermission) + { + foreach (var pd in PermissionDictionary) { - if (_Instance == null) - { - _Instance = new RolePermissionMapper(); - } - - return _Instance; - } - } - - private ObservableCollection _DicPermission = new ObservableCollection(); - public ObservableCollection PermissionDictionary - { - get { return _DicPermission; } - } - - public int ToInt(MenuPermissionEnum enumPermistion) - { - return (int)enumPermistion; - } - - public string ToString(MenuPermissionEnum enumPermistion) - { - foreach (PermissionType pd in _DicPermission) - { - if (pd.EnumPermission == enumPermistion) + if (pd.EnumPermission == enumPermission) { return pd.StringPermission; } @@ -63,11 +57,8 @@ namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles return ""; } - } - public class PermissionType - { - public MenuPermissionEnum EnumPermission{get;set;} - public string StringPermission { get; set; } + #endregion } + } diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionTrueFalseMapper.cs b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionTrueFalseMapper.cs new file mode 100644 index 0000000..4c13160 --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RolePermissionTrueFalseMapper.cs @@ -0,0 +1,63 @@ +using System.Collections.ObjectModel; +using Aitex.Core.Util; +using MECF.Framework.UI.Client.ClientBase; + +namespace MECF.Framework.UI.Client.CenterViews.Configs.Roles +{ + public class RolePermissionTrueFalseMapper : Singleton + { + #region Constructors + + public RolePermissionTrueFalseMapper() + { + PermissionDictionary.Add(new PermissionType() + { EnumPermission = MenuPermissionEnum.MP_NONE, + StringPermission = "No" + }); + + PermissionDictionary.Add(new PermissionType() + { + EnumPermission = MenuPermissionEnum.MP_READ_WRITE, + StringPermission = "Yes" + }); + } + + #endregion + + #region Properties + + public ObservableCollection PermissionDictionary { get; } = new(); + + #endregion + + #region Methods + + public int ToInt(MenuPermissionEnum enumPermission) + { + return (int)enumPermission; + } + + + public string ToString(MenuPermissionEnum enumPermission) + { + foreach (var pd in PermissionDictionary) + { + if (pd.EnumPermission == enumPermission) + { + return pd.StringPermission; + } + } + + return ""; + } + + #endregion + + + + + + + + } +} diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleView.xaml b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleView.xaml index e4a93cc..e558f0c 100644 --- a/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleView.xaml +++ b/MECF.Framework.UI.Client/CenterViews/Configs/Roles/RoleView.xaml @@ -471,7 +471,7 @@ x:Name="combPermission" Width="140" DisplayMemberPath="StringPermission" - ItemsSource="{Binding DataContext.PermissionDictionary, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" + ItemsSource="{Binding DataContext.PermissionTrueFalseDictionary, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" SelectedIndex="{Binding DisplayIndexPermission}"> @@ -501,28 +501,28 @@