diff --git a/apps/web-antd/src/api/request.ts b/apps/web-antd/src/api/request.ts index 5b5c15fb..7f78987b 100644 --- a/apps/web-antd/src/api/request.ts +++ b/apps/web-antd/src/api/request.ts @@ -80,6 +80,10 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) { config.headers['tenant-id'] = tenantEnable ? accessStore.tenantId : undefined; + // 只有登录时,才设置 visit-tenant-id 访问租户 + config.headers['visit-tenant-id'] = tenantEnable + ? accessStore.visitTenantId + : undefined; return config; }, }); @@ -136,6 +140,10 @@ baseRequestClient.addRequestInterceptor({ config.headers['tenant-id'] = tenantEnable ? accessStore.tenantId : undefined; + // 只有登录时,才设置 visit-tenant-id 访问租户 + config.headers['visit-tenant-id'] = tenantEnable + ? accessStore.visitTenantId + : undefined; return config; }, }); diff --git a/apps/web-antd/src/api/system/tenant/index.ts b/apps/web-antd/src/api/system/tenant/index.ts index cefacc51..3bed9249 100644 --- a/apps/web-antd/src/api/system/tenant/index.ts +++ b/apps/web-antd/src/api/system/tenant/index.ts @@ -39,6 +39,13 @@ export function getTenant(id: number) { ); } +/** 获取租户精简信息列表 */ +export function getTenantList() { + return requestClient.get( + '/system/tenant/simple-list', + ); +} + /** 新增租户 */ export function createTenant(data: SystemTenantApi.Tenant) { return requestClient.post('/system/tenant/create', data); diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue index 86f44466..2777f4a3 100644 --- a/apps/web-antd/src/layouts/basic.vue +++ b/apps/web-antd/src/layouts/basic.vue @@ -34,6 +34,7 @@ import { useAuthStore } from '#/store'; import LoginForm from '#/views/_core/authentication/login.vue'; import Help from './components/help.vue'; +import TenantDropdown from './components/tenant-dropdown.vue'; const userStore = useUserStore(); const authStore = useAuthStore(); @@ -202,6 +203,9 @@ watch( @read="handleNotificationRead" /> +