From 34d303947517e5a296102df253302b59f11f09ca Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 18 Oct 2024 17:37:36 +0800 Subject: [PATCH 1/3] Add filter to Blazor UI permission modal --- .../PermissionManagementModal.razor | 149 ++++++++++-------- .../PermissionManagementModal.razor.cs | 81 +++++++--- .../PermissionManagementModal.razor.css | 31 ++++ 3 files changed, 172 insertions(+), 89 deletions(-) create mode 100644 modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor index 0e0b2aa480..2d89ff866d 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor @@ -1,6 +1,4 @@ -@using Microsoft.Extensions.Localization -@using Volo.Abp.PermissionManagement.Localization -@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase +@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase @@ -8,74 +6,95 @@ + + + + + + + + + + + + + + + + + + + + @L["SelectAllInAllTabs"] + + + + - - - @L["SelectAllInAllTabs"] - - - - - - @if (_groups != null) - { - - - @foreach (var group in _groups) - { - - @if (group.Permissions.Any(x => x.IsGranted)) +
+ @L["PermissionGroup"] + + @if (_groups != null && _groups.Any()) + { + + + @foreach (var group in _groups) { - - @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) ) - + + @if (group.Permissions.Any(x => x.IsGranted)) + { + + @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) ) + + } + else + { + + @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) ) + + } + } - else + + + @foreach (var group in _groups) { - - @group.DisplayName ( @(group.Permissions.Count(x => x.IsGranted)) ) - - } - - } - - - @foreach (var group in _groups) - { - - - - - @L["SelectAllInThisTab"] - - + + + + + @L["SelectAllInThisTab"] + + - - - @foreach (var permission in group.Permissions) - { - - - @GetShownName(permission) - - + + + @foreach (var permission in group.Permissions) + { + + + @GetShownName(permission) + + + } + + } - - - } - - - } + + + } + +
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index 65a2416bcc..a087a5cb8a 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs @@ -24,6 +24,7 @@ public partial class PermissionManagementModal protected string _providerKey; protected string _entityDisplayName; + protected List _allGroups; protected List _groups; protected List _disabledPermissions = new List(); @@ -34,6 +35,8 @@ public partial class PermissionManagementModal protected int _notGrantedPermissionCount = 0; protected bool _selectAllDisabled; + + protected string _permissionGroupSearchText; protected bool GrantAll { get { @@ -85,35 +88,15 @@ public partial class PermissionManagementModal { _providerName = providerName; _providerKey = providerKey; + _permissionGroupSearchText = null; var result = await PermissionAppService.GetAsync(_providerName, _providerKey); _entityDisplayName = entityDisplayName ?? result.EntityDisplayName; - _groups = result.Groups; + _allGroups = result.Groups; + _groups = _allGroups; - _selectAllDisabled = _groups.All(IsPermissionGroupDisabled); - - _grantedPermissionCount = 0; - _notGrantedPermissionCount = 0; - foreach (var permission in _groups.SelectMany(x => x.Permissions)) - { - if (permission.IsGranted && permission.GrantedProviders.All(x => x.ProviderName != _providerName)) - { - _disabledPermissions.Add(permission); - continue; - } - - if (permission.IsGranted) - { - _grantedPermissionCount++; - } - else - { - _notGrantedPermissionCount++; - } - } - - _selectedTabName = GetNormalizedGroupName(_groups.First().Name); + NormalizePermissionGroup(); foreach (var group in _groups) { @@ -127,6 +110,34 @@ public partial class PermissionManagementModal await HandleErrorAsync(ex); } } + + protected void NormalizePermissionGroup() + { + _selectAllDisabled = _groups.All(IsPermissionGroupDisabled); + + _grantedPermissionCount = 0; + _notGrantedPermissionCount = 0; + _disabledPermissions.Clear(); + foreach (var permission in _groups.SelectMany(x => x.Permissions)) + { + if (permission.IsGranted && permission.GrantedProviders.All(x => x.ProviderName != _providerName)) + { + _disabledPermissions.Add(permission); + continue; + } + + if (permission.IsGranted) + { + _grantedPermissionCount++; + } + else + { + _notGrantedPermissionCount++; + } + } + + _selectedTabName = GetNormalizedGroupName(_groups.First().Name); + } protected Task CloseModal() { @@ -317,4 +328,26 @@ public partial class PermissionManagementModal return permissions.All(x => x.IsGranted) && grantedProviders.Any(p => p.ProviderName != _providerName); } + + protected virtual async Task OnPermissionGroupSearchTextChangedAsync(string value) + { + if (value == _permissionGroupSearchText) + { + return; + } + + _permissionGroupSearchText = value; + _groups = _permissionGroupSearchText.IsNullOrWhiteSpace() ? _allGroups : _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase)).ToList(); + + NormalizePermissionGroup(); + + await InvokeAsync(StateHasChanged); + } + + protected virtual Task OnSelectedTabChangedAsync(string name) + { + _selectedTabName = name; + + return Task.CompletedTask; + } } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css new file mode 100644 index 0000000000..6c827bec4a --- /dev/null +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.css @@ -0,0 +1,31 @@ +fieldset legend { + float: none; + width: auto; +} + +.lpx-scroll-pills-container ul { + display: block; + max-height: 500px; + overflow-y: auto; +} + +.lpx-scroll-pills-container .tab-content { + padding-top: 0 !important; + padding-bottom: 0 !important; +} + +.lpx-scroll-pills-container ul li { + border: 1px solid #e8eef3; + margin-bottom: 10px; + border-radius: 10px; +} + +.lpx-scroll-pills-container ul li a.active { + color: #fff !important; + border-color: #6c5dd3 !important; + background-color: #6c5dd3 !important; +} + +.lpx-theme-dark .lpx-scroll-pills-container ul li { + border: 1px solid #23262a; +} \ No newline at end of file From 2a3f29c2ce399183d2806a730b81fff1ccd41c25 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 18 Oct 2024 17:38:04 +0800 Subject: [PATCH 2/3] Add PermissionGroup localized text --- .../Volo/Abp/PermissionManagement/Localization/Domain/ar.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/cs.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/de.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/el.json | 3 ++- .../Abp/PermissionManagement/Localization/Domain/en-GB.json | 4 +++- .../Volo/Abp/PermissionManagement/Localization/Domain/en.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/es.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/fa.json | 4 +++- .../Volo/Abp/PermissionManagement/Localization/Domain/fi.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/fr.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/hi.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/hr.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/hu.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/is.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/it.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/nl.json | 3 ++- .../Abp/PermissionManagement/Localization/Domain/pl-PL.json | 3 ++- .../Abp/PermissionManagement/Localization/Domain/pt-BR.json | 3 ++- .../Abp/PermissionManagement/Localization/Domain/ro-RO.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/ru.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/sk.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/sl.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/sv.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/tr.json | 3 ++- .../Volo/Abp/PermissionManagement/Localization/Domain/vi.json | 3 ++- .../Abp/PermissionManagement/Localization/Domain/zh-Hans.json | 3 ++- .../Abp/PermissionManagement/Localization/Domain/zh-Hant.json | 3 ++- 27 files changed, 56 insertions(+), 27 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ar.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ar.json index da09f941b3..52de9ea37a 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ar.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ar.json @@ -6,6 +6,7 @@ "All": "الكل", "SelectAllInAllTabs": "منح كافة الأذونات", "SelectAllInThisTab": "تحديد الكل", - "SaveWithoutAnyPermissionsWarningMessage": "هل أنت متأكد أنك تريد الحفظ بدون أي أذونات؟" + "SaveWithoutAnyPermissionsWarningMessage": "هل أنت متأكد أنك تريد الحفظ بدون أي أذونات؟", + "PermissionGroup": "مجموعة الأذونات" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/cs.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/cs.json index 3503e04f67..c0e38b9320 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/cs.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/cs.json @@ -6,6 +6,7 @@ "All": "Všechna", "SelectAllInAllTabs": "Dát veškerá oprávnění", "SelectAllInThisTab": "Vybrat vše", - "SaveWithoutAnyPermissionsWarningMessage": "Opravdu chcete ukládat bez jakýchkoli oprávnění?" + "SaveWithoutAnyPermissionsWarningMessage": "Opravdu chcete ukládat bez jakýchkoli oprávnění?", + "PermissionGroup": "Skupina oprávnění" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/de.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/de.json index 1fc3766825..a2bb5fe72a 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/de.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/de.json @@ -6,6 +6,7 @@ "All": "Alle", "SelectAllInAllTabs": "Alle Berechtigungen erteilen", "SelectAllInThisTab": "Alle auswählen", - "SaveWithoutAnyPermissionsWarningMessage": "Sind Sie sicher, dass Sie ohne Berechtigungen speichern möchten?" + "SaveWithoutAnyPermissionsWarningMessage": "Sind Sie sicher, dass Sie ohne Berechtigungen speichern möchten?", + "PermissionGroup": "Berechtigungsgruppe" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/el.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/el.json index 2982e74a7e..bc2c96db04 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/el.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/el.json @@ -6,6 +6,7 @@ "All": "Όλα", "SelectAllInAllTabs": "Χορήγηση όλων των δικαιώματων", "SelectAllInThisTab": "Επιλογή όλων", - "SaveWithoutAnyPermissionsWarningMessage": "Είστε βέβαιοι ότι θέλετε να αποθηκεύσετε χωρίς δικαιώματα;" + "SaveWithoutAnyPermissionsWarningMessage": "Είστε βέβαιοι ότι θέλετε να αποθηκεύσετε χωρίς δικαιώματα;", + "PermissionGroup": "Ομάδα δικαιωμάτων" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en-GB.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en-GB.json index 73c2e4a093..62762d00a8 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en-GB.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en-GB.json @@ -5,6 +5,8 @@ "OnlyProviderPermissons": "Only this provider", "All": "All", "SelectAllInAllTabs": "Grant all permissions", - "SelectAllInThisTab": "Select all" + "SelectAllInThisTab": "Select all", + "SaveWithoutAnyPermissionsWarningMessage": "Are you sure you want to save without any permissions?", + "PermissionGroup": "Permission Group" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en.json index 8fbe3e9eab..45aeb905e2 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/en.json @@ -6,6 +6,7 @@ "All": "All", "SelectAllInAllTabs": "Grant all permissions", "SelectAllInThisTab": "Select all", - "SaveWithoutAnyPermissionsWarningMessage": "Are you sure you want to save without any permissions?" + "SaveWithoutAnyPermissionsWarningMessage": "Are you sure you want to save without any permissions?", + "PermissionGroup": "Permission Group" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/es.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/es.json index 60aad5eee2..610d86a2ff 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/es.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/es.json @@ -6,6 +6,7 @@ "All": "Todos", "SelectAllInAllTabs": "Conceder todos los permisos", "SelectAllInThisTab": "Seleccionar todo", - "SaveWithoutAnyPermissionsWarningMessage": "¿Estás seguro de que quieres guardar sin ningún permiso?" + "SaveWithoutAnyPermissionsWarningMessage": "¿Estás seguro de que quieres guardar sin ningún permiso?", + "PermissionGroup": "Grupo de permisos" } } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fa.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fa.json index ca158cd234..615ef79412 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fa.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fa.json @@ -5,6 +5,8 @@ "OnlyProviderPermissons": "فقط این ارائه دهنده", "All": "همه", "SelectAllInAllTabs": "اعطای همه مجوزها", - "SelectAllInThisTab": "انتخاب همه" + "SelectAllInThisTab": "انتخاب همه", + "SaveWithoutAnyPermissionsWarningMessage": "آیا مطمئن هستید که می خواهید بدون هیچ دسترسی ذخیره کنید؟", + "PermissionGroup": "گروه دسترسی" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fi.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fi.json index bd52741202..2c24727ad5 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fi.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fi.json @@ -6,6 +6,7 @@ "All": "Kaikki", "SelectAllInAllTabs": "Myönnä kaikki käyttöoikeudet", "SelectAllInThisTab": "Valitse kaikki", - "SaveWithoutAnyPermissionsWarningMessage": "Haluatko varmasti tallentaa ilman käyttöoikeuksia?" + "SaveWithoutAnyPermissionsWarningMessage": "Haluatko varmasti tallentaa ilman käyttöoikeuksia?", + "PermissionGroup": "Käyttöoikeus" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fr.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fr.json index 21a333223f..b2676631a2 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fr.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/fr.json @@ -6,6 +6,7 @@ "All": "Tous", "SelectAllInAllTabs": "Accorder toutes les autorisations", "SelectAllInThisTab": "Sélectionner tous les", - "SaveWithoutAnyPermissionsWarningMessage": "Êtes-vous sûr de vouloir enregistrer sans aucune autorisation ?" + "SaveWithoutAnyPermissionsWarningMessage": "Êtes-vous sûr de vouloir enregistrer sans aucune autorisation ?", + "PermissionGroup": "Groupe d'autorisations" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hi.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hi.json index b61ccf91ea..fa271bc752 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hi.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hi.json @@ -6,6 +6,7 @@ "All": "सब", "SelectAllInAllTabs": "सभी अनुमतियां प्रदान करें", "SelectAllInThisTab": "सभी का चयन करे", - "SaveWithoutAnyPermissionsWarningMessage": "क्या आप वाकई बिना किसी अनुमति के सहेजना चाहते हैं?" + "SaveWithoutAnyPermissionsWarningMessage": "क्या आप वाकई बिना किसी अनुमति के सहेजना चाहते हैं?", + "PermissionGroup": "अनुमति समूह" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hr.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hr.json index a222bc5e0e..45034a5bb6 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hr.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hr.json @@ -6,6 +6,7 @@ "All": "Svi", "SelectAllInAllTabs": "Dodijelite sva dopuštenja", "SelectAllInThisTab": "Odaberi sve", - "SaveWithoutAnyPermissionsWarningMessage": "Jeste li sigurni da želite spremiti bez ikakvih dopuštenja?" + "SaveWithoutAnyPermissionsWarningMessage": "Jeste li sigurni da želite spremiti bez ikakvih dopuštenja?", + "PermissionGroup": "Grupa dozvola" } } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hu.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hu.json index 8ebdbe7d80..fdb727bf2b 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hu.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/hu.json @@ -6,6 +6,7 @@ "All": "Összes", "SelectAllInAllTabs": "Adjon meg minden engedélyt", "SelectAllInThisTab": "Mindet kiválaszt", - "SaveWithoutAnyPermissionsWarningMessage": "Biztos, hogy engedélyek nélkül akar menteni?" + "SaveWithoutAnyPermissionsWarningMessage": "Biztos, hogy engedélyek nélkül akar menteni?", + "PermissionGroup": "Engedélycsoport" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/is.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/is.json index d1060e0c30..322e6b5580 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/is.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/is.json @@ -6,6 +6,7 @@ "All": "Allt", "SelectAllInAllTabs": "Veita allar heimildir", "SelectAllInThisTab": "Velja allt", - "SaveWithoutAnyPermissionsWarningMessage": "Ertu viss um að þú viljir vista án nokkurra heimilda?" + "SaveWithoutAnyPermissionsWarningMessage": "Ertu viss um að þú viljir vista án nokkurra heimilda?", + "PermissionGroup": "Heimildahópur" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/it.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/it.json index a879d9d94b..1312568b53 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/it.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/it.json @@ -6,6 +6,7 @@ "All": "Tutti", "SelectAllInAllTabs": "Concedi tutte le autorizzazioni", "SelectAllInThisTab": "Seleziona tutto", - "SaveWithoutAnyPermissionsWarningMessage": "Sei sicuro di voler salvare senza alcuna autorizzazione?" + "SaveWithoutAnyPermissionsWarningMessage": "Sei sicuro di voler salvare senza alcuna autorizzazione?", + "PermissionGroup": "Gruppo di autorizzazioni" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/nl.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/nl.json index 2702d5593c..0dacfe8341 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/nl.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/nl.json @@ -6,6 +6,7 @@ "All": "Alle", "SelectAllInAllTabs": "Verleen alle rechten", "SelectAllInThisTab": "Selecteer alles", - "SaveWithoutAnyPermissionsWarningMessage": "Weet u zeker dat u zonder rechten wilt opslaan?" + "SaveWithoutAnyPermissionsWarningMessage": "Weet u zeker dat u zonder rechten wilt opslaan?", + "PermissionGroup": "Rechtengroep" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pl-PL.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pl-PL.json index ce00ee9947..aa0bf32851 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pl-PL.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pl-PL.json @@ -6,6 +6,7 @@ "All": "Wszystkie", "SelectAllInAllTabs": "Udziel wszystkich uprawnień", "SelectAllInThisTab": "Zaznacz wszystkie", - "SaveWithoutAnyPermissionsWarningMessage": "Czy na pewno chcesz zapisać bez żadnych uprawnień?" + "SaveWithoutAnyPermissionsWarningMessage": "Czy na pewno chcesz zapisać bez żadnych uprawnień?", + "PermissionGroup": "Grupa uprawnień" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json index c70a1b190b..14f45ec46a 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/pt-BR.json @@ -6,6 +6,7 @@ "All": "Todos", "SelectAllInAllTabs": "Conceder todas as permissões", "SelectAllInThisTab": "Selecionar todos", - "SaveWithoutAnyPermissionsWarningMessage": "Tem certeza que deseja salvar sem nenhuma permissão?" + "SaveWithoutAnyPermissionsWarningMessage": "Tem certeza que deseja salvar sem nenhuma permissão?", + "PermissionGroup": "Grupo de permissão" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ro-RO.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ro-RO.json index be856834e5..6466540438 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ro-RO.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ro-RO.json @@ -6,6 +6,7 @@ "All": "Toate", "SelectAllInAllTabs": "Acordă toate permisiunile", "SelectAllInThisTab": "Selectează toate", - "SaveWithoutAnyPermissionsWarningMessage": "Sigur doriți să salvați fără nicio permisiune?" + "SaveWithoutAnyPermissionsWarningMessage": "Sigur doriți să salvați fără nicio permisiune?", + "PermissionGroup": "Grup de permisiuni" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ru.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ru.json index 467cb85e88..d46b4e289e 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ru.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/ru.json @@ -6,6 +6,7 @@ "All": "Все", "SelectAllInAllTabs": "Предоставить все разрешения", "SelectAllInThisTab": "Выбрать все", - "SaveWithoutAnyPermissionsWarningMessage": "Вы уверены, что хотите сохранить без каких-либо разрешений?" + "SaveWithoutAnyPermissionsWarningMessage": "Вы уверены, что хотите сохранить без каких-либо разрешений?", + "PermissionGroup": "Группа разрешений" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sk.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sk.json index d3f6c55324..722582d28f 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sk.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sk.json @@ -6,6 +6,7 @@ "All": "Všetky", "SelectAllInAllTabs": "Udeliť všetky oprávnenia", "SelectAllInThisTab": "Vybrať všetky", - "SaveWithoutAnyPermissionsWarningMessage": "Naozaj chcete ukladať bez akýchkoľvek povolení?" + "SaveWithoutAnyPermissionsWarningMessage": "Naozaj chcete ukladať bez akýchkoľvek povolení?", + "PermissionGroup": "Skupina oprávnení" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sl.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sl.json index aeb6e8da7b..36640ffdbd 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sl.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sl.json @@ -6,6 +6,7 @@ "All": "Vse", "SelectAllInAllTabs": "Dodeli vsa dovoljenja", "SelectAllInThisTab": "Izberi vse", - "SaveWithoutAnyPermissionsWarningMessage": "Ali ste prepričani, da želite shraniti brez kakršnih koli dovoljenj?" + "SaveWithoutAnyPermissionsWarningMessage": "Ali ste prepričani, da želite shraniti brez kakršnih koli dovoljenj?", + "PermissionGroup": "Skupina dovoljenj" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sv.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sv.json index 0a151cb50a..3671bf1422 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sv.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/sv.json @@ -6,6 +6,7 @@ "All": "Alla", "SelectAllInAllTabs": "Ge alla behörigheter", "SelectAllInThisTab": "Välj alla", - "SaveWithoutAnyPermissionsWarningMessage": "Är du säker på att du vill spara utan några behörigheter?" + "SaveWithoutAnyPermissionsWarningMessage": "Är du säker på att du vill spara utan några behörigheter?", + "PermissionGroup": "Behörighetsgrupp" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/tr.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/tr.json index dececfcce5..3edfc2942f 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/tr.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/tr.json @@ -6,6 +6,7 @@ "All": "Hepsi", "SelectAllInAllTabs": "Tüm izinleri ver", "SelectAllInThisTab": "Hepsini seç", - "SaveWithoutAnyPermissionsWarningMessage": "Hiçbir izin olmadan kaydetmek istediğinize emin misiniz?" + "SaveWithoutAnyPermissionsWarningMessage": "Hiçbir izin olmadan kaydetmek istediğinize emin misiniz?", + "PermissionGroup": "İzin Grubu" } } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/vi.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/vi.json index 290425626c..d927f6a4a9 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/vi.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/vi.json @@ -6,6 +6,7 @@ "All": "Tất cả", "SelectAllInAllTabs": "Cấp tất cả các quyền", "SelectAllInThisTab": "Chọn tất cả", - "SaveWithoutAnyPermissionsWarningMessage": "Bạn có chắc chắn muốn lưu mà không có bất kỳ quyền nào không?" + "SaveWithoutAnyPermissionsWarningMessage": "Bạn có chắc chắn muốn lưu mà không có bất kỳ quyền nào không?", + "PermissionGroup": "Nhóm quyền" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json index afcdb60351..3ae69c4d58 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hans.json @@ -6,6 +6,7 @@ "All": "所有", "SelectAllInAllTabs": "授予所有权限", "SelectAllInThisTab": "全选", - "SaveWithoutAnyPermissionsWarningMessage": "您确定要在没有任何权限的情况下保存吗？" + "SaveWithoutAnyPermissionsWarningMessage": "您确定要在没有任何权限的情况下保存吗？", + "PermissionGroup": "权限组" } } \ No newline at end of file diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hant.json b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hant.json index 3f438ce7fe..b2d46a42a5 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hant.json +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/Localization/Domain/zh-Hant.json @@ -6,6 +6,7 @@ "All": "全部", "SelectAllInAllTabs": "授予所有權限", "SelectAllInThisTab": "全選", - "SaveWithoutAnyPermissionsWarningMessage": "您確定要在沒有任何權限的情況下保存嗎？" + "SaveWithoutAnyPermissionsWarningMessage": "您確定要在沒有任何權限的情況下保存嗎？", + "PermissionGroup": "權限組" } } \ No newline at end of file From ddf698090dc5390803238eecf60a5ef1bc080d3c Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Sat, 19 Oct 2024 00:30:22 +0800 Subject: [PATCH 3/3] search all permissions --- .../PermissionManagementModal.razor.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index a087a5cb8a..50e6035b9b 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs @@ -94,15 +94,10 @@ public partial class PermissionManagementModal _entityDisplayName = entityDisplayName ?? result.EntityDisplayName; _allGroups = result.Groups; - _groups = _allGroups; + _groups = _allGroups.ToList(); NormalizePermissionGroup(); - foreach (var group in _groups) - { - SetPermissionDepths(group.Permissions, null, 0); - } - await InvokeAsync(_modal.Show); } catch (Exception ex) @@ -135,8 +130,16 @@ public partial class PermissionManagementModal _notGrantedPermissionCount++; } } + + foreach (var group in _groups) + { + SetPermissionDepths(group.Permissions, null, 0); + } - _selectedTabName = GetNormalizedGroupName(_groups.First().Name); + if (_groups.Count != 0) + { + _selectedTabName = GetNormalizedGroupName(_groups.First().Name); + } } protected Task CloseModal() @@ -337,7 +340,7 @@ public partial class PermissionManagementModal } _permissionGroupSearchText = value; - _groups = _permissionGroupSearchText.IsNullOrWhiteSpace() ? _allGroups : _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase)).ToList(); + _groups = _permissionGroupSearchText.IsNullOrWhiteSpace() ? _allGroups : _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase) || x.Permissions.Any(permission => permission.DisplayName.Contains(_permissionGroupSearchText, StringComparison.OrdinalIgnoreCase))).ToList(); NormalizePermissionGroup();