diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue index 61256dab..eaa9997b 100644 --- a/apps/web-antd/src/layouts/basic.vue +++ b/apps/web-antd/src/layouts/basic.vue @@ -41,15 +41,15 @@ const { destroyWatermark, updateWatermark } = useWatermark(); const tenantStore = useTenantStore(); const menus = computed(() => { const defaultMenus = [ - { - handler: () => { - openWindow(VBEN_DOC_URL, { - target: '_blank', - }); - }, - icon: BookOpenText, - text: $t('ui.widgets.document'), - }, + // { + // handler: () => { + // openWindow(VBEN_DOC_URL, { + // target: '_blank', + // }); + // }, + // icon: BookOpenText, + // text: $t('ui.widgets.document'), + // }, { handler: () => { router.push('/profile'); @@ -146,7 +146,7 @@ watch( :avatar :menus :text="userStore.userInfo?.realName" - :description="userStore.userInfo?.roles[0]" + :description="userStore.userInfo?.roleName" tag-text="Pro" @logout="handleLogout" /> diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts index 2160ba05..db3637c4 100644 --- a/apps/web-antd/src/store/auth.ts +++ b/apps/web-antd/src/store/auth.ts @@ -116,6 +116,7 @@ export const useAuthStore = defineStore('auth', () => { roles, userId: user.userId, username: user.userName, + roleName:user.roles[0]?.roleName, } userStore.setUserInfo(userInfo) diff --git a/packages/stores/src/modules/user.ts b/packages/stores/src/modules/user.ts index 56810b4f..9a426040 100644 --- a/packages/stores/src/modules/user.ts +++ b/packages/stores/src/modules/user.ts @@ -18,6 +18,8 @@ interface BasicUserInfo { * 用户角色 */ roles: string[]; + + roleName: string; /** * 用户id */