Skip to content

fix: Remove the root directory from resource authorization #7591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangdan-fit2cloud merged 1 commit into from
Nov 2, 2026
Merged

fix: Remove the root directory from resource authorization #7591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ui/src/views/system/identity/resource-authorization/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import WorkspaceApi from '@/api/admin/system/workspace'
import CommonSystemApi from '@/api/admin/system/common'
import UserGroupsApi from '@/api/admin/system/user-groups'
import ResourceAuthorizationApi from '@/api/admin/system/resource-authorization'
import { RESOURCE_TYPE, RESOURCE_PERMISSION } from '@/api/enums'
import { RESOURCE_TYPE } from '@/api/enums'
import type {
ResourceAuthorizationType,
ResourcePermissionItem,
Expand Down Expand Up @@ -126,7 +126,6 @@ function buildResourceTree(resourceItems: ResourcePermissionItem[]) {
const resources = resourceItems.map((resource) => ({
...resource,
children: [] as ResourcePermissionItem[],
permission: !resource.folder_id && resource.permission === RESOURCE_PERMISSION.NOT_AUTH ? RESOURCE_PERMISSION.VIEW : resource.permission,
}))
const resourceMap = new Map(resources.map((resource) => [resource.id, resource]))

Expand All @@ -139,10 +138,8 @@ function buildResourceTree(resourceItems: ResourcePermissionItem[]) {
}
})

const defaultRoot = resourceMap.get('default')
if (defaultRoot && !defaultRoot.folder_id) return defaultRoot.children

return resources.filter(({ folder_id }) => !folder_id)
// 根目录仅作为资源容器，授权列表直接展示其子目录和资源。
return resources.filter(({ folder_id }) => !folder_id).flatMap((resource) => (resource.resource_type === 'folder' ? resource.children : [resource]))
}

/* 保存权限 */
Expand Down
Loading