diff --git a/ui/src/api/system/resource-authorization.ts b/ui/src/api/system/resource-authorization.ts index c9efbbd6b74..45078081845 100644 --- a/ui/src/api/system/resource-authorization.ts +++ b/ui/src/api/system/resource-authorization.ts @@ -12,12 +12,11 @@ const getResourceAuthorization: ( workspace_id: string, user_id: string, resource: string, - page: pageRequest, params?: any, loading?: Ref, -) => Promise> = (workspace_id, user_id, resource, page, params, loading) => { +) => Promise> = (workspace_id, user_id, resource, params, loading) => { return get( - `${prefix}/${workspace_id}/user_resource_permission/user/${user_id}/resource/${resource}/${page.current_page}/${page.page_size}`, + `${prefix}/${workspace_id}/user_resource_permission/user/${user_id}/resource/${resource}`, params, loading, ) diff --git a/ui/src/components/folder-tree/index.vue b/ui/src/components/folder-tree/index.vue index 9b719cdfb2b..e54db68c9ca 100644 --- a/ui/src/components/folder-tree/index.vue +++ b/ui/src/components/folder-tree/index.vue @@ -48,7 +48,7 @@
- + @@ -102,6 +115,7 @@ import { computed, onUnmounted, ref, watch } from 'vue' import { onBeforeRouteLeave } from 'vue-router' import type { TreeInstance } from 'element-plus' import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue' +import ResourceAuthorizationDrawer from '@/components/resource-authorization-drawer/index.vue' import { t } from '@/locales' import { i18n_name } from '@/utils/common' import folderApi from '@/api/folder' @@ -255,6 +269,13 @@ function openEditFolder(row: Tree) { CreateFolderDialogRef.value.open(props.source, row.id, row) } +const currentNode = ref(null) +const ResourceAuthorizationDrawerRef = ref() +function openAuthorization(data: any) { + currentNode.value = data + ResourceAuthorizationDrawerRef.value.open(data.id) +} + function refreshFolder() { emit('refreshTree') } diff --git a/ui/src/components/resource-authorization-drawer/index.vue b/ui/src/components/resource-authorization-drawer/index.vue index b6213ff180e..26eadc37916 100644 --- a/ui/src/components/resource-authorization-drawer/index.vue +++ b/ui/src/components/resource-authorization-drawer/index.vue @@ -112,7 +112,7 @@ v-model="row.permission" @change="(val: any) => permissionsHandle(val, row)" > -