feat:增加切换租户的功能

This commit is contained in:
YunaiV 2025-05-05 17:02:48 +08:00
parent 2765c4adde
commit c6898c0a99
6 changed files with 83 additions and 4 deletions

View File

@ -41,6 +41,11 @@ export const getTenant = (id: number) => {
return request.get({ url: '/system/tenant/get?id=' + id }) return request.get({ url: '/system/tenant/get?id=' + id })
} }
// 获取租户精简信息列表
export const getTenantList = () => {
return request.get({ url: '/system/tenant/simple-list' })
}
// 新增租户 // 新增租户
export const createTenant = (data: TenantVO) => { export const createTenant = (data: TenantVO) => {
return request.post({ url: '/system/tenant/create', data }) return request.post({ url: '/system/tenant/create', data })

View File

@ -3,7 +3,14 @@ import axios, { AxiosError, AxiosInstance, AxiosResponse, InternalAxiosRequestCo
import { ElMessage, ElMessageBox, ElNotification } from 'element-plus' import { ElMessage, ElMessageBox, ElNotification } from 'element-plus'
import qs from 'qs' import qs from 'qs'
import { config } from '@/config/axios/config' import { config } from '@/config/axios/config'
import { getAccessToken, getRefreshToken, getTenantId, removeToken, setToken } from '@/utils/auth' import {
getAccessToken,
getRefreshToken,
getTenantId,
getVisitTenantId,
removeToken,
setToken
} from '@/utils/auth'
import errorCode from './errorCode' import errorCode from './errorCode'
import { resetRouter } from '@/router' import { resetRouter } from '@/router'
@ -55,6 +62,11 @@ service.interceptors.request.use(
if (tenantEnable && tenantEnable === 'true') { if (tenantEnable && tenantEnable === 'true') {
const tenantId = getTenantId() const tenantId = getTenantId()
if (tenantId) config.headers['tenant-id'] = tenantId if (tenantId) config.headers['tenant-id'] = tenantId
// 只有登录时,才设置 visit-tenant-id 访问租户
const visitTenantId = getVisitTenantId()
if (config.headers.Authorization && visitTenantId) {
config.headers['visit-tenant-id'] = visitTenantId
}
} }
const method = config.method?.toUpperCase() const method = config.method?.toUpperCase()
// 防止 GET 请求缓存 // 防止 GET 请求缓存

View File

@ -10,6 +10,7 @@ export const CACHE_KEY = {
// 用户相关 // 用户相关
ROLE_ROUTERS: 'roleRouters', ROLE_ROUTERS: 'roleRouters',
USER: 'user', USER: 'user',
VisitTenantId: 'visitTenantId',
// 系统设置 // 系统设置
IS_DARK: 'isDark', IS_DARK: 'isDark',
LANG: 'lang', LANG: 'lang',
@ -35,5 +36,6 @@ export const deleteUserCache = () => {
const { wsCache } = useCache() const { wsCache } = useCache()
wsCache.delete(CACHE_KEY.USER) wsCache.delete(CACHE_KEY.USER)
wsCache.delete(CACHE_KEY.ROLE_ROUTERS) wsCache.delete(CACHE_KEY.ROLE_ROUTERS)
wsCache.delete(CACHE_KEY.VisitTenantId)
// 注意,不要清理 LoginForm 登录表单 // 注意,不要清理 LoginForm 登录表单
} }

View File

@ -0,0 +1,46 @@
<template>
<div>
<el-select
filterable
placeholder="请选择租户"
class="!w-180px"
v-model="value"
@change="handleChange"
clearable
>
<el-option v-for="item in tenants" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</div>
</template>
<script lang="ts" setup>
import { ref, onMounted } from 'vue'
import * as TenantApi from '@/api/system/tenant'
import { getVisitTenantId, setVisitTenantId } from '@/utils/auth'
import { useMessage } from '@/hooks/web/useMessage'
import { useTagsView } from '@/hooks/web/useTagsView'
const message = useMessage() //
const tagsView = useTagsView() //
const value = ref(getVisitTenantId()) // ID
const tenants = ref<any[]>([]) //
const handleChange = (id: number) => {
// 访 ID
setVisitTenantId(id)
//
tagsView.closeOther()
//
tagsView.refreshPage()
//
const tenant = tenants.value.find((item) => item.id === id)
if (tenant) {
message.success(`切换当前租户为: ${tenant.name}`)
}
}
onMounted(async () => {
tenants.value = await TenantApi.getTenantList()
})
</script>

View File

@ -8,8 +8,10 @@ import { Breadcrumb } from '@/layout/components/Breadcrumb'
import { SizeDropdown } from '@/layout/components/SizeDropdown' import { SizeDropdown } from '@/layout/components/SizeDropdown'
import { LocaleDropdown } from '@/layout/components/LocaleDropdown' import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
import RouterSearch from '@/components/RouterSearch/index.vue' import RouterSearch from '@/components/RouterSearch/index.vue'
import TenantVisit from '@/layout/components/TenantVisit/index.vue'
import { useAppStore } from '@/store/modules/app' import { useAppStore } from '@/store/modules/app'
import { useDesign } from '@/hooks/web/useDesign' import { useDesign } from '@/hooks/web/useDesign'
import { checkPermi } from '@/utils/permission'
const { getPrefixCls, variables } = useDesign() const { getPrefixCls, variables } = useDesign()
@ -41,6 +43,9 @@ const locale = computed(() => appStore.getLocale)
// //
const message = computed(() => appStore.getMessage) const message = computed(() => appStore.getMessage)
//
const hasTenantVisitPermission = computed(() => checkPermi(['system:tenant:visit']))
export default defineComponent({ export default defineComponent({
name: 'ToolHeader', name: 'ToolHeader',
setup() { setup() {
@ -62,6 +67,7 @@ export default defineComponent({
</div> </div>
) : undefined} ) : undefined}
<div class="h-full flex items-center"> <div class="h-full flex items-center">
{hasTenantVisitPermission.value ? <TenantVisit /> : undefined}
{screenfull.value ? ( {screenfull.value ? (
<Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull> <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
) : undefined} ) : undefined}

View File

@ -67,6 +67,14 @@ export const getTenantId = () => {
return wsCache.get(CACHE_KEY.TenantId) return wsCache.get(CACHE_KEY.TenantId)
} }
export const setTenantId = (username: string) => { export const setTenantId = (tenantId: number) => {
wsCache.set(CACHE_KEY.TenantId, username) wsCache.set(CACHE_KEY.TenantId, tenantId)
}
export const getVisitTenantId = () => {
return wsCache.get(CACHE_KEY.VisitTenantId)
}
export const setVisitTenantId = (visitTenantId: number) => {
wsCache.set(CACHE_KEY.VisitTenantId, visitTenantId)
} }