From 9ae1d8603108e975de78cf4a53b6200760147d95 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sat, 11 May 2024 00:00:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E8=8F=9C=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- src/constants/business.ts | 4 ++-- src/router/elegant/routes.ts | 9 ++++++--- src/views/group/index.vue | 4 +++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 9238be9..f165d1d 100644 --- a/.env +++ b/.env @@ -41,7 +41,7 @@ VITE_SERVICE_MODAL_LOGOUT_CODES=5001 VITE_SERVICE_EXPIRED_TOKEN_CODES=9999,9998 # when the route mode is static, the defined super role -VITE_STATIC_SUPER_ROLE=R_SUPER +VITE_STATIC_SUPER_ROLE=R_ADMIN # sourcemap VITE_SOURCE_MAP=N diff --git a/src/constants/business.ts b/src/constants/business.ts index 877722e..33363a8 100644 --- a/src/constants/business.ts +++ b/src/constants/business.ts @@ -41,8 +41,8 @@ export const menuIconTypeRecord: Record = { - '1': 'R_ADMIN', - '2': 'R_SUPER' + '1': 'R_USER', + '2': 'R_ADMIN' }; export const podsType: Record = { diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 07f5932..16bf425 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -385,7 +385,8 @@ export const generatedRoutes: GeneratedRoute[] = [ title: 'namespace', i18nKey: 'route.namespace', icon: 'eos-icons:namespace', - order: 20 + order: 20, + roles: ['R_ADMIN'] } }, { @@ -497,7 +498,8 @@ export const generatedRoutes: GeneratedRoute[] = [ title: 'user', i18nKey: 'route.user', order: 900, - icon: 'material-symbols:manage-accounts' + icon: 'material-symbols:manage-accounts', + roles: ['R_ADMIN'] }, children: [ { @@ -508,7 +510,8 @@ export const generatedRoutes: GeneratedRoute[] = [ title: 'user_manager', i18nKey: 'route.user_manager', icon: 'streamline:interface-user-multiple-close-geometric-human-multiple-person-up-user', - order: 900 + order: 900, + roles: ['R_ADMIN'] } } ] diff --git a/src/views/group/index.vue b/src/views/group/index.vue index 2530168..8bd4e79 100644 --- a/src/views/group/index.vue +++ b/src/views/group/index.vue @@ -9,10 +9,11 @@ import { useTable, useTableOperate } from '@/hooks/common/table'; import { groupConfigIdModeRecord, yesOrNoRecord } from '@/constants/business'; import { tagColor } from '@/utils/common'; import StatusSwitch from '@/components/common/status-switch.vue'; +import { useAuth } from '@/hooks/business/auth'; import GroupOperateDrawer from './modules/group-operate-drawer.vue'; import GroupDetailDrawer from './modules/group-detail-drawer.vue'; import GroupSearch from './modules/group-search.vue'; - +const { hasAuth } = useAuth(); const appStore = useAppStore(); /** 详情页属性数据 */ @@ -166,6 +167,7 @@ function edit(id: string) { :disabled-delete="checkedRowKeys.length === 0" :loading="loading" :show-delete="false" + :show-add="hasAuth('R_ADMIN')" @add="handleAdd" @refresh="getData" />