From 3fceca7efa548ecfda5c75d859501e206b0d03ba Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Tue, 12 Jul 2022 21:10:17 +0800 Subject: [PATCH] feat: add granting roles for user support Signed-off-by: Ryan Wang --- src/modules/system/users/UserDetail.vue | 21 +++++-- src/modules/system/users/UserList.vue | 15 ++++- .../users/components/UserCreationModal.vue | 57 +++++++++++++++++-- 3 files changed, 83 insertions(+), 10 deletions(-) diff --git a/src/modules/system/users/UserDetail.vue b/src/modules/system/users/UserDetail.vue index 1c8d06542..905de6a66 100644 --- a/src/modules/system/users/UserDetail.vue +++ b/src/modules/system/users/UserDetail.vue @@ -1,10 +1,19 @@ @@ -40,11 +49,15 @@ const router = useRouter(); >
角色
- + - {{ user?.metadata?.name }} + {{ role }}
diff --git a/src/modules/system/users/UserList.vue b/src/modules/system/users/UserList.vue index 16886b179..b3ab41072 100644 --- a/src/modules/system/users/UserList.vue +++ b/src/modules/system/users/UserList.vue @@ -45,6 +45,13 @@ const handleOpenCreateModal = (user: User) => { creationModal.value = true; }; +const getRoles = (user: User) => { + return JSON.parse( + user.metadata.annotations?.["rbac.authorization.halo.run/role-names"] || + "[]" + ); +}; + onMounted(() => { handleFetchUsers(); }); @@ -254,9 +261,13 @@ onMounted(() => {
-