From b2971cf5fba7d11438aca18f0bf59e3dfd17dd5e Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Sun, 28 Jul 2024 19:23:50 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?= =?UTF-8?q?h=202=20commits=20[trident-sync]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chore: --- .../ui/certd-client/src/plugin/permission/util.permission.ts | 3 +++ packages/ui/certd-client/src/store/modules/resource.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/ui/certd-client/src/plugin/permission/util.permission.ts b/packages/ui/certd-client/src/plugin/permission/util.permission.ts index 4efd2b6b..d16ba7bf 100644 --- a/packages/ui/certd-client/src/plugin/permission/util.permission.ts +++ b/packages/ui/certd-client/src/plugin/permission/util.permission.ts @@ -15,6 +15,9 @@ const util = { const permissionStore = usePermissionStore(); const userPermissionList = permissionStore.getPermissions; return userPermissionList.some((permission: any) => { + if (permission === "*") { + return true; + } return need.includes(permission); }); }, diff --git a/packages/ui/certd-client/src/store/modules/resource.ts b/packages/ui/certd-client/src/store/modules/resource.ts index cf7d39e8..965d2f54 100644 --- a/packages/ui/certd-client/src/store/modules/resource.ts +++ b/packages/ui/certd-client/src/store/modules/resource.ts @@ -112,6 +112,9 @@ export const useResourceStore = defineStore({ filterChildrenByPermission(list: any, permissions: any) { const menus = list.filter((item: any) => { if (item?.meta?.permission) { + if (permissions.includes("*")) { + return true; + } return permissions.includes(item.meta.permission); } return true;