From ddf698090dc5390803238eecf60a5ef1bc080d3c Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Sat, 19 Oct 2024 00:30:22 +0800 Subject: [PATCH] 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();