From 45862d4f9d5d49ecad96a3d10264b72c0c48c3fd Mon Sep 17 00:00:00 2001 From: xiaoma <735878602@qq.com> Date: Thu, 23 Sep 2021 13:37:18 +0800 Subject: [PATCH] Fix bug and README.md update --- README.md | 2 +- src/hooks/web/usePermission.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d90c5a4..82647d1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 自`Naive Ui Admin`发布`1.x`版本之后,受到了许多小伙伴使用和热爱,当中也收到了不少的建议和反馈,比如:文档访问稳定性,详细程度,组件和页面丰富性,版本更新频率等... 至此我们团队为了给大家更好的体验,以及能够真正做一款相对完善的`开箱即用中后台框架`,我们从`2021-08-14`号,决定停止更新`1.x`版本,重点构造一个`全新v2大版本`, -并更名为`NaiveAdmin`,发布将定义为商业版本,详情可移步官网查看 [NaiveAdmin](https://naiveadmin.com),感谢大家给予的每一个建议包括,Pr,Star, +并更名为`NaiveAdmin`,发布将定义为商业版本,详情可移步官网查看 [NaiveAdmin](https://www.naiveadmin.com),感谢大家给予的每一个建议包括,Pr,Star, 谢谢大家支持! ## 💄 v2更新如下 diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts index b39118d..66f8e20 100644 --- a/src/hooks/web/usePermission.ts +++ b/src/hooks/web/usePermission.ts @@ -30,7 +30,7 @@ export function usePermission() { function hasEveryPermission(accesses: string[]): boolean { const permissionsList = userStore.getPermissions; if (Array.isArray(accesses)) { - return accesses.every((access) => !!permissionsList[access]); + return permissionsList.every((access: any) => accesses.includes(access.value)); } throw new Error(`[hasEveryPermission]: ${accesses} should be a array !`); } @@ -43,7 +43,7 @@ export function usePermission() { function hasSomePermission(accesses: string[]): boolean { const permissionsList = userStore.getPermissions; if (Array.isArray(accesses)) { - return accesses.some((access) => !!permissionsList[access]); + return permissionsList.some((access: any) => accesses.includes(access.value)); } throw new Error(`[hasSomePermission]: ${accesses} should be a array !`); }