From 3f8393813bcf945ad823c796cbdb6792d30b2758 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Sun, 25 Jan 2026 11:15:59 +0800 Subject: [PATCH] refactor(tenant): refine menu scope boundaries and document plan/tenant menu design --- .env.development | 19 +- .env.production | 2 - src/api/system/menu.ts | 4 +- src/api/system/tenant-plan.ts | 70 ++++ src/components/TenantSwitcher/index.vue | 6 +- src/constants/index.ts | 8 + src/enums/business.ts | 8 + src/layouts/components/LayoutToolbar.vue | 46 +-- src/router/guards/permission.ts | 5 +- src/store/modules/tenant.ts | 114 +++--- src/types/api/index.ts | 1 + src/types/api/menu.ts | 4 + src/types/api/tenant-plan.ts | 35 ++ src/types/api/tenant.ts | 3 + src/types/api/user.ts | 6 +- src/utils/tenant.ts | 16 + src/views/system/menu/index.vue | 25 +- src/views/system/tenant-plan/index.vue | 454 +++++++++++++++++++++++ src/views/system/tenant/index.vue | 258 ++++++++++++- src/views/system/user/index.vue | 33 -- 20 files changed, 959 insertions(+), 158 deletions(-) create mode 100644 src/api/system/tenant-plan.ts create mode 100644 src/types/api/tenant-plan.ts create mode 100644 src/utils/tenant.ts create mode 100644 src/views/system/tenant-plan/index.vue diff --git a/.env.development b/.env.development index dead00d5..14eb819b 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,3 @@ -# ============================================ -# 🌐 网络配置 -# ============================================ # 应用端口 VITE_APP_PORT=3000 # 项目名称 @@ -9,25 +6,19 @@ VITE_APP_TITLE=vue3-element-admin VITE_APP_BASE_API=/dev-api # 接口地址 -VITE_APP_API_URL=https://api.youlai.tech/v2 # 线上 -# VITE_APP_API_URL=http://localhost:8000 # 本地 +# VITE_APP_API_URL=https://api.youlai.tech/v2 # 线上 +VITE_APP_API_URL=http://localhost:8000 # 本地 # WebSocket 端点（不配置则关闭） # 线上: ws://api.youlai.tech/ws # 本地: ws://localhost:8000/ws VITE_APP_WS_ENDPOINT= -# ============================================ -# 🔧 开发工具 -# ============================================ + # 启用 Mock 服务 VITE_MOCK_DEV_SERVER=false -# ============================================ -# 🎛️ 功能开关 -# ============================================ -# 多租户（需与后端 youlai.tenant.enabled 保持一致） + +# 多租户开关(true:开启 false:关闭) VITE_APP_TENANT_ENABLED=false -# AI 助手（系统级开关，用户可在设置中单独控制） -VITE_ENABLE_AI_ASSISTANT=true diff --git a/.env.production b/.env.production index 14473e22..4fd8cfdd 100644 --- a/.env.production +++ b/.env.production @@ -14,5 +14,3 @@ VITE_APP_TITLE=vue3-element-admin # 多租户（需与后端 app.tenant.enabled 保持一致） VITE_APP_TENANT_ENABLED=false -# AI 助手（系统级开关） -VITE_ENABLE_AI_ASSISTANT=true diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts index 87e410ef..e85dbf74 100644 --- a/src/api/system/menu.ts +++ b/src/api/system/menu.ts @@ -17,11 +17,11 @@ const MenuAPI = { }); }, /** 获取菜单下拉数据源 */ - getOptions(onlyParent?: boolean) { + getOptions(onlyParent?: boolean, scope?: number) { return request({ url: `${MENU_BASE_URL}/options`, method: "get", - params: { onlyParent }, + params: { onlyParent, scope }, }); }, /** 获取菜单表单数据 */ diff --git a/src/api/system/tenant-plan.ts b/src/api/system/tenant-plan.ts new file mode 100644 index 00000000..ad059a39 --- /dev/null +++ b/src/api/system/tenant-plan.ts @@ -0,0 +1,70 @@ +import request from "@/utils/request"; +import type { OptionItem, PageResult } from "@/types/api"; +import type { + TenantPlanForm, + TenantPlanItem, + TenantPlanQueryParams, +} from "@/types/api/tenant-plan"; + +const TENANT_PLAN_BASE_URL = "/api/v1/tenant-plans"; + +const TenantPlanAPI = { + /** 获取租户套餐分页数据 */ + getPage(queryParams?: TenantPlanQueryParams) { + return request>({ + url: `${TENANT_PLAN_BASE_URL}`, + method: "get", + params: queryParams, + }); + }, + + /** 获取租户套餐表单数据 */ + getFormData(planId: string) { + return request({ + url: `${TENANT_PLAN_BASE_URL}/${planId}/form`, + method: "get", + }); + }, + + /** 新增租户套餐 */ + create(data: TenantPlanForm) { + return request({ url: `${TENANT_PLAN_BASE_URL}`, method: "post", data }); + }, + + /** 修改租户套餐 */ + update(planId: string, data: TenantPlanForm) { + return request({ url: `${TENANT_PLAN_BASE_URL}/${planId}`, method: "put", data }); + }, + + /** 删除租户套餐 */ + deleteByIds(ids: string) { + return request({ url: `${TENANT_PLAN_BASE_URL}/${ids}`, method: "delete" }); + }, + + /** 获取租户方案下拉选项 */ + getOptions() { + return request({ + url: `${TENANT_PLAN_BASE_URL}/options`, + method: "get", + }); + }, + + /** 获取方案菜单ID集合 */ + getPlanMenuIds(planId: number) { + return request({ + url: `${TENANT_PLAN_BASE_URL}/${planId}/menuIds`, + method: "get", + }); + }, + + /** 更新方案菜单 */ + updatePlanMenus(planId: number, menuIds: number[]) { + return request({ + url: `${TENANT_PLAN_BASE_URL}/${planId}/menus`, + method: "put", + data: menuIds, + }); + }, +}; + +export default TenantPlanAPI; diff --git a/src/components/TenantSwitcher/index.vue b/src/components/TenantSwitcher/index.vue index 8ca9454d..df44a7ab 100644 --- a/src/components/TenantSwitcher/index.vue +++ b/src/components/TenantSwitcher/index.vue @@ -38,7 +38,7 @@ const tenantStore = useTenantStoreHook(); const tenantList = computed(() => tenantStore.tenantList); -const currentTenantIdRef = computed({ +const currentTenantId = computed({ get: () => tenantStore.currentTenantId, set: (val) => { tenantStore.currentTenantId = val; @@ -46,13 +46,13 @@ const currentTenantIdRef = computed({ }); const currentTenantName = computed(() => { - const currentId = currentTenantIdRef.value; + const currentId = currentTenantId.value; const fromList = tenantList.value.find((t) => t.id === currentId)?.name; return fromList || tenantStore.currentTenant?.name || "切换租户"; }); function onCommand(tenantId: number) { - if (tenantId === currentTenantIdRef.value) { + if (tenantId === currentTenantId.value) { return; } emit("change", tenantId); diff --git a/src/constants/index.ts b/src/constants/index.ts index 57f1e1f5..4b287120 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -18,6 +18,14 @@ export const APP_PREFIX = "vea"; */ export const ROLE_ROOT = "ROOT"; +/** + * 平台租户ID + * + * @description + * 用于前端识别平台租户（不参与套餐/菜单配置） + */ +export const PLATFORM_TENANT_ID = 0; + /** * 存储键名常量 * diff --git a/src/enums/business.ts b/src/enums/business.ts index b59fcb14..b97a1a78 100644 --- a/src/enums/business.ts +++ b/src/enums/business.ts @@ -14,6 +14,14 @@ export enum MenuTypeEnum { BUTTON = "B", // 按钮 } +/** + * 菜单范围枚举 + */ +export enum MenuScopeEnum { + PLATFORM = 1, // 平台菜单 + TENANT = 2, // 业务菜单 +} + /** * 用户性别枚举 */ diff --git a/src/layouts/components/LayoutToolbar.vue b/src/layouts/components/LayoutToolbar.vue index 84a499d4..23454c8c 100644 --- a/src/layouts/components/LayoutToolbar.vue +++ b/src/layouts/components/LayoutToolbar.vue @@ -28,7 +28,7 @@ -
+
@@ -72,7 +72,6 @@ import { useRoute, useRouter } from "vue-router"; import { defaults } from "@/settings"; import { DeviceEnum, SidebarColor, ThemeMode, LayoutMode } from "@/enums/settings"; import { useAppStore, useSettingsStore, useUserStore } from "@/store"; -import { hasPerm } from "@/utils/auth"; // 导入子组件 import CommandPalette from "@/components/CommandPalette/index.vue"; @@ -95,21 +94,14 @@ const router = useRouter(); // 是否为桌面设备 const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP); -const isPlatformUser = computed(() => { - return (userStore.userInfo?.tenantScope || "").toUpperCase() === "PLATFORM"; -}); +const canSwitchTenant = computed(() => userStore.userInfo?.canSwitchTenant === true); -const canSwitchTenant = computed(() => hasPerm("sys:tenant:switch", "button")); - -// 是否显示租户选择（仅平台用户可显式切换租户） -const showTenantSelect = computed(() => { - if (!isPlatformUser.value || !canSwitchTenant.value) { +// 是否显示租户选择 +const showTenantSwitcher = computed(() => { + if (!canSwitchTenant.value) { return false; } - if (tenantStore.tenantList.length <= 1) { - return false; - } - return true; + return tenantStore.tenantList.length > 1; }); function handleTenantChange(tenantId: number) { @@ -117,10 +109,10 @@ function handleTenantChange(tenantId: number) { .switchTenant(tenantId) .then(() => { ElMessage.success("切换租户成功"); - window.location.reload(); + window.location.href = "/"; }) .catch((error: any) => { - ElMessage.error(error?.message || "切换租户失败"); + ElMessage.error(error.message || "切换租户失败"); }); } @@ -234,7 +226,7 @@ function handleSettingsClick() { } &:hover { - background: rgba(0, 0, 0, 0.04); + background: var(--el-fill-color-light); :deep([class^="i-svg:"]) { color: var(--el-color-primary); @@ -269,35 +261,35 @@ function handleSettingsClick() { .navbar-actions--white-text { .navbar-actions__item { :deep([class^="i-svg:"]) { - color: rgba(255, 255, 255, 0.85); + color: color-mix(in srgb, var(--el-color-white) 85%, transparent); } &:hover { - background: rgba(255, 255, 255, 0.1); + background: color-mix(in srgb, var(--el-color-white) 10%, transparent); :deep([class^="i-svg:"]) { - color: #fff; + color: var(--el-color-white); } } } .user-profile__name { - color: rgba(255, 255, 255, 0.85); + color: color-mix(in srgb, var(--el-color-white) 85%, transparent); } // 租户选择器在白色文字模式下的样式 ::v-deep(.tenant-switcher__trigger) { - color: rgba(255, 255, 255, 0.85); + color: color-mix(in srgb, var(--el-color-white) 85%, transparent); } ::v-deep(.tenant-switcher__trigger .tenant-switcher__icon) { - color: rgba(255, 255, 255, 0.85); + color: color-mix(in srgb, var(--el-color-white) 85%, transparent); } ::v-deep(.tenant-switcher__trigger:hover) { - color: #fff; - background: rgba(255, 255, 255, 0.1); + color: var(--el-color-white); + background: color-mix(in srgb, var(--el-color-white) 10%, transparent); } ::v-deep(.tenant-switcher__trigger:hover .tenant-switcher__icon) { - color: #fff; + color: var(--el-color-white); } } @@ -330,7 +322,7 @@ function handleSettingsClick() { } ::v-deep(.tenant-switcher__trigger:hover) { color: var(--el-color-primary) !important; - background: rgba(0, 0, 0, 0.04); + background: var(--el-fill-color-light); } ::v-deep(.tenant-switcher__trigger:hover .tenant-switcher__icon) { color: var(--el-color-primary) !important; diff --git a/src/router/guards/permission.ts b/src/router/guards/permission.ts index 188de057..86ad540f 100644 --- a/src/router/guards/permission.ts +++ b/src/router/guards/permission.ts @@ -3,7 +3,7 @@ import NProgress from "@/plugins/nprogress"; import router from "@/router"; import { usePermissionStore, useUserStore } from "@/store"; import { useTenantStoreHook } from "@/store/modules/tenant"; -import { appConfig } from "@/settings"; +import { isTenantEnabled } from "@/utils/tenant"; /** * 路由权限守卫 @@ -89,7 +89,8 @@ export function setupPermissionGuard() { /** 初始化多租户上下文，未启用或失败时静默跳过 */ async function initTenantContext(): Promise { - if (!appConfig.tenantEnabled) return; + // 多租户关闭时不初始化租户上下文 + if (!isTenantEnabled()) return; try { await useTenantStoreHook().loadTenant(); diff --git a/src/store/modules/tenant.ts b/src/store/modules/tenant.ts index 32cdfc8f..57639e14 100644 --- a/src/store/modules/tenant.ts +++ b/src/store/modules/tenant.ts @@ -40,17 +40,10 @@ export const useTenantStore = defineStore("tenant", () => { /** * 获取用户租户列表 */ - function fetchTenantList() { - return new Promise((resolve, reject) => { - TenantAPI.getTenantList() - .then((data) => { - tenantList.value = data || []; - resolve(data || []); - }) - .catch((error) => { - reject(error); - }); - }); + async function fetchTenantList(): Promise { + const data = await TenantAPI.getTenantList(); + tenantList.value = data || []; + return data || []; } /** @@ -78,24 +71,17 @@ export const useTenantStore = defineStore("tenant", () => { !tenantList.value.some((t) => t.id === currentTenantId.value) ) { console.debug("[Tenant] 本地租户已不可用，清除并重新选择:", currentTenantId.value); - currentTenantId.value = null; - currentTenant.value = null; - localStorage.removeItem(STORAGE_KEYS.TENANT_ID); - localStorage.removeItem(STORAGE_KEYS.TENANT_INFO); + clearLocalTenant(); } // 3. 如果已有租户列表，则保证一定有一个默认租户被选中 if (tenantList.value.length > 0) { // 3.1 优先后端当前租户 if (currentTenantId.value == null) { - try { - const currentTenantInfo = await TenantAPI.getCurrentTenant(); - if (currentTenantInfo) { - setCurrentTenant(currentTenantInfo); - return; - } - } catch (error) { - console.debug("[Tenant] 获取当前租户失败，尝试本地/默认选择:", error); + const currentTenantInfo = await safeGetCurrentTenant(); + if (currentTenantInfo) { + setCurrentTenant(currentTenantInfo); + return; } } @@ -136,47 +122,27 @@ export const useTenantStore = defineStore("tenant", () => { * @param tenantId 目标租户ID */ async function switchTenant(tenantId: number): Promise { - try { - // 优先使用“切换租户并返回新 token”的接口（平台管理员跨租户切换需要更新 token 的 tenantId） - try { - const token = await AuthAPI.switchTenant(tenantId); - if (token?.accessToken && token?.refreshToken) { - AuthStorage.setTokens(token.accessToken, token.refreshToken, AuthStorage.getRememberMe()); - } - } catch { - // 忽略：非平台用户或后端未启用该接口时，回退到旧接口 - } + await refreshTokenIfSupported(tenantId); - // 调用后端切换接口（用于获取当前租户信息/兼容旧逻辑） - const tenantInfo = await TenantAPI.switchTenant(tenantId); - - // 后端返回切换后的租户信息 - if (tenantInfo) { - setCurrentTenant(tenantInfo); - } else { - // 如果后端未返回，从租户列表中找到对应的租户信息 - const tenant = tenantList.value.find((t) => t.id === tenantId); - if (tenant) { - setCurrentTenant(tenant); - } else { - // 如果列表中没有，重新获取租户信息 - try { - const info = await TenantAPI.getCurrentTenant(); - if (info) { - setCurrentTenant(info); - } else { - throw new Error("无法获取租户信息"); - } - } catch (error) { - console.error("获取租户信息失败:", error); - throw new Error("切换租户后无法获取租户信息"); - } - } - } - } catch (error) { - console.error("切换租户失败:", error); - throw error; + const tenantInfo = await TenantAPI.switchTenant(tenantId); + if (tenantInfo) { + setCurrentTenant(tenantInfo); + return; } + + const matched = tenantList.value.find((t) => t.id === tenantId); + if (matched) { + setCurrentTenant(matched); + return; + } + + const fallback = await safeGetCurrentTenant(); + if (fallback) { + setCurrentTenant(fallback); + return; + } + + throw new Error("切换租户后无法获取租户信息"); } /** @@ -186,10 +152,34 @@ export const useTenantStore = defineStore("tenant", () => { currentTenantId.value = null; currentTenant.value = null; tenantList.value = []; + clearLocalTenant(); + } + + function clearLocalTenant() { localStorage.removeItem(STORAGE_KEYS.TENANT_ID); localStorage.removeItem(STORAGE_KEYS.TENANT_INFO); } + async function safeGetCurrentTenant(): Promise { + try { + return await TenantAPI.getCurrentTenant(); + } catch (error) { + console.debug("[Tenant] 获取当前租户失败，尝试本地/默认选择:", error); + return null; + } + } + + async function refreshTokenIfSupported(tenantId: number): Promise { + try { + const token = await AuthAPI.switchTenant(tenantId); + if (token?.accessToken && token?.refreshToken) { + AuthStorage.setTokens(token.accessToken, token.refreshToken, AuthStorage.getRememberMe()); + } + } catch { + // 忽略：非平台用户或后端未启用该接口时，回退到旧接口 + } + } + /** * 设置租户列表 */ diff --git a/src/types/api/index.ts b/src/types/api/index.ts index 63d5208d..8bdfec3e 100644 --- a/src/types/api/index.ts +++ b/src/types/api/index.ts @@ -16,6 +16,7 @@ export * from "./log"; export * from "./statistics"; export * from "./notice"; export * from "./tenant"; +export * from "./tenant-plan"; // 其他模块 export * from "./ai"; diff --git a/src/types/api/menu.ts b/src/types/api/menu.ts index 9bc7fcc3..50307719 100644 --- a/src/types/api/menu.ts +++ b/src/types/api/menu.ts @@ -34,6 +34,8 @@ export interface MenuItem { type?: string; /** 菜单是否可见(1:显示;0:隐藏) */ visible?: number; + /** 菜单范围(1=平台 2=业务) */ + scope?: number; } /** 菜单表单对象 */ @@ -62,6 +64,8 @@ export interface MenuForm { sort?: number; /** 菜单是否可见 */ visible?: number; + /** 菜单范围(1=平台 2=业务) */ + scope?: number; /** 按钮权限标识 */ perm?: string; /** 路由参数（用于表单编辑 params） */ diff --git a/src/types/api/tenant-plan.ts b/src/types/api/tenant-plan.ts new file mode 100644 index 00000000..113c60dc --- /dev/null +++ b/src/types/api/tenant-plan.ts @@ -0,0 +1,35 @@ +/** + * Tenant Plan 租户套餐类型定义 + */ + +import type { BaseQueryParams } from "./common"; + +/** 租户套餐分页查询参数 */ +export interface TenantPlanQueryParams extends BaseQueryParams { + /** 关键字(套餐名称/套餐编码) */ + keywords?: string; + /** 状态(1-启用 0-停用) */ + status?: number; +} + +/** 租户套餐分页对象 */ +export interface TenantPlanItem { + id?: number; + name?: string; + code?: string; + status?: number; + sort?: number; + remark?: string; + createTime?: string; + updateTime?: string; +} + +/** 租户套餐表单对象 */ +export interface TenantPlanForm { + id?: number; + name?: string; + code?: string; + status?: number; + sort?: number; + remark?: string; +} diff --git a/src/types/api/tenant.ts b/src/types/api/tenant.ts index 75085b38..bd259fcf 100644 --- a/src/types/api/tenant.ts +++ b/src/types/api/tenant.ts @@ -32,6 +32,7 @@ export interface TenantItem { contactEmail?: string; domain?: string; logo?: string; + planId?: number; status?: number; remark?: string; expireTime?: string; @@ -49,6 +50,7 @@ export interface TenantForm { contactEmail?: string; domain?: string; logo?: string; + planId?: number; status?: number; remark?: string; expireTime?: string; @@ -63,6 +65,7 @@ export interface TenantCreateForm { contactEmail?: string; domain?: string; logo?: string; + planId?: number; remark?: string; expireTime?: string; adminUsername?: string; diff --git a/src/types/api/user.ts b/src/types/api/user.ts index cdbf3a0d..f40b8778 100644 --- a/src/types/api/user.ts +++ b/src/types/api/user.ts @@ -14,8 +14,8 @@ export interface UserInfo { nickname?: string; /** 头像URL */ avatar?: string; - /** 租户身份标识(PLATFORM/TENANT) */ - tenantScope?: string; + /** 租户切换权限（true 可切换租户） */ + canSwitchTenant?: boolean; /** 角色集合 */ roles: string[]; /** 权限集合 */ @@ -66,8 +66,6 @@ export interface UserForm { id?: string; /** 用户头像 */ avatar?: string; - /** 租户身份标识(PLATFORM/TENANT) */ - tenantScope?: string; /** 部门ID */ deptId?: string; /** 用户邮箱 */ diff --git a/src/utils/tenant.ts b/src/utils/tenant.ts new file mode 100644 index 00000000..052cae90 --- /dev/null +++ b/src/utils/tenant.ts @@ -0,0 +1,16 @@ +import { appConfig } from "@/settings"; +import { PLATFORM_TENANT_ID } from "@/constants"; + +/** + * 是否启用多租户 + */ +export const isTenantEnabled = () => appConfig.tenantEnabled; + +/** + * 判断是否平台租户 + * + * @description + * 平台租户不参与套餐与菜单配置 + */ +export const isPlatformTenantId = (tenantId?: string | number) => + Number(tenantId) === PLATFORM_TENANT_ID; diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index e53baa9a..83fd2deb 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -74,6 +74,13 @@ + + + + @@ -212,10 +306,15 @@ import { useDebounceFn } from "@vueuse/core"; import { hasPerm } from "@/utils/auth"; import TenantAPI from "@/api/system/tenant"; +import TenantPlanAPI from "@/api/system/tenant-plan"; +import MenuAPI from "@/api/system/menu"; import type { TenantCreateForm, TenantForm, TenantQueryParams, TenantItem } from "@/types/api"; +import { MenuScopeEnum } from "@/enums/business"; +import { isPlatformTenantId } from "@/utils/tenant"; const queryFormRef = ref(); const dataFormRef = ref(); +const menuTreeRef = ref(); const loading = ref(false); const ids = ref([]); @@ -229,11 +328,21 @@ const queryParams = reactive({ const pageData = ref([]); +const menuPermOptions = ref([]); + const dialog = reactive({ title: "", visible: false, }); +const planMenuDialogVisible = ref(false); +const checkedPlan = ref<{ id?: number; name?: string }>({}); +const menuKeywords = ref(""); +const menuExpanded = ref(true); +const menuParentChildLinked = ref(true); + +const planOptions = ref([]); + const formData = reactive({ id: undefined, name: "", @@ -242,24 +351,57 @@ const formData = reactive({ contactName: "", contactPhone: "", contactEmail: "", + planId: undefined, remark: "", expireTime: undefined, status: 1, adminUsername: "", }); +const isPlatformTenant = computed(() => isPlatformTenantId(formData.id)); + +// 平台租户不允许批量删除 +const isTenantSelectable = (row: TenantItem) => !isPlatformTenantId(row.id); + const rules = reactive({ name: [{ required: true, message: "请输入租户名称", trigger: "blur" }], code: [{ required: true, message: "请输入租户编码", trigger: "blur" }], + planId: [ + { + // 平台租户不绑定套餐 + validator: (_: unknown, value: number | undefined, callback: (error?: Error) => void) => { + if (isPlatformTenant.value) return callback(); + if (value == null) return callback(new Error("请选择租户套餐")); + return callback(); + }, + trigger: "change", + }, + ], }); const hasPermChangeStatus = computed(() => hasPerm("sys:tenant:change-status")); +function handleStatusChange(tenantId: string | number | undefined, val: string | number | boolean) { + if (tenantId == null) return; + if (pageData.value.length > 0) { + handleChangeStatus(String(tenantId), Number(val)); + } +} + +function resolvePlanLabel(planId?: number) { + if (planId == null) return "-"; + const matched = planOptions.value.find((item) => Number(item.value) === planId); + return matched?.label || String(planId); +} + function fetchData() { loading.value = true; TenantAPI.getPage(queryParams) .then((res) => { - pageData.value = res.data; + pageData.value = res.data.map((item) => ({ + ...item, + planId: item.planId != null ? Number(item.planId) : undefined, + })); total.value = res.page?.total ?? 0; }) .finally(() => { @@ -267,6 +409,85 @@ function fetchData() { }); } +async function handleOpenPlanMenuDialog(row: TenantItem) { + if (isPlatformTenantId(row.id)) { + return; + } + const planId = row.planId; + if (!planId) { + ElMessage.warning("请先为租户选择套餐"); + return; + } + + planMenuDialogVisible.value = true; + loading.value = true; + checkedPlan.value = { id: planId, name: resolvePlanLabel(planId) }; + + try { + // 套餐菜单只允许配置业务菜单 + const menuOptions = await MenuAPI.getOptions(false, MenuScopeEnum.TENANT); + menuPermOptions.value = menuOptions; + const menuIds = await TenantPlanAPI.getPlanMenuIds(planId); + await nextTick(); + menuTreeRef.value?.setCheckedKeys([], false); + menuIds.forEach((menuId) => menuTreeRef.value?.setChecked(menuId, true, false)); + } finally { + loading.value = false; + } +} + +function handleClosePlanMenuDialog() { + planMenuDialogVisible.value = false; + menuKeywords.value = ""; + menuExpanded.value = true; + menuParentChildLinked.value = true; + menuTreeRef.value?.setCheckedKeys([], false); +} + +function toggleMenuTree() { + menuExpanded.value = !menuExpanded.value; + if (menuTreeRef.value) { + Object.values(menuTreeRef.value.store.nodesMap).forEach((node: any) => { + if (menuExpanded.value) { + node.expand(); + } else { + node.collapse(); + } + }); + } +} + +function handleMenuLinkChange(val: boolean) { + menuParentChildLinked.value = val; +} + +watch(menuKeywords, (val) => { + menuTreeRef.value?.filter(val); +}); + +function handleMenuFilter(value: string, data: { [key: string]: any }) { + if (!value) return true; + return data.label.includes(value); +} + +async function handlePlanMenuSubmit() { + const planId = checkedPlan.value.id; + if (!planId) return; + + const checkedMenuIds: number[] = menuTreeRef + .value!.getCheckedNodes(false, true) + .map((node: any) => node.value); + + loading.value = true; + try { + await TenantPlanAPI.updatePlanMenus(planId, checkedMenuIds); + ElMessage.success("方案菜单配置成功"); + planMenuDialogVisible.value = false; + } finally { + loading.value = false; + } +} + function handleQuery() { queryParams.pageNum = 1; fetchData(); @@ -289,6 +510,10 @@ async function handleOpenDialog(tenantId?: string) { const data = await TenantAPI.getFormData(tenantId); Object.assign(formData, data); formData.adminUsername = ""; + formData.planId = formData.planId != null ? Number(formData.planId) : undefined; + if (isPlatformTenant.value) { + formData.planId = undefined; + } } else { dialog.title = "新增租户"; Object.assign(formData, { @@ -299,6 +524,7 @@ async function handleOpenDialog(tenantId?: string) { contactName: "", contactPhone: "", contactEmail: "", + planId: undefined, remark: "", expireTime: undefined, status: 1, @@ -319,6 +545,7 @@ function handleCloseDialog() { contactName: "", contactPhone: "", contactEmail: "", + planId: undefined, remark: "", expireTime: undefined, status: 1, @@ -342,6 +569,7 @@ const handleSubmit = useDebounceFn(async () => { contactName: formData.contactName, contactPhone: formData.contactPhone, contactEmail: formData.contactEmail, + planId: formData.planId, remark: formData.remark, expireTime: formData.expireTime, status: formData.status, @@ -356,6 +584,7 @@ const handleSubmit = useDebounceFn(async () => { contactName: formData.contactName, contactPhone: formData.contactPhone, contactEmail: formData.contactEmail, + planId: formData.planId, remark: formData.remark, expireTime: formData.expireTime, adminUsername: formData.adminUsername, @@ -413,7 +642,20 @@ async function handleChangeStatus(id: string | undefined, status: number) { onMounted(() => { fetchData(); + fetchPlanOptions(); }); + +async function fetchPlanOptions() { + try { + const options = await TenantPlanAPI.getOptions(); + planOptions.value = options.map((item) => ({ + ...item, + value: item.value != null ? Number(item.value) : item.value, + })); + } catch { + planOptions.value = []; + } +} diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 4c214887..472ad6a1 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -185,17 +185,6 @@ - - - - - - (appStore.device === DeviceEnum.DESKTOP ? "600px" : "90%")); -const isPlatformUser = computed(() => { - return (userStore.userInfo?.tenantScope || "").toUpperCase() === "PLATFORM"; -}); - -const canManageTenantScope = computed( - () => isPlatformUser.value && hasPerm("sys:tenant:switch", "button") -); - -const tenantScopeOptions = [ - { label: "平台", value: "PLATFORM" }, - { label: "租户", value: "TENANT" }, -]; - // ==================== 表单验证规则 ==================== const rules = reactive({ @@ -471,13 +445,6 @@ async function handleOpenDialog(id?: string): Promise { dialogState.title = "新增用户"; dialogState.mode = DialogMode.CREATE; } - - // 仅平台用户可设置租户身份；无权限时避免提交该字段 - if (canManageTenantScope.value) { - formData.tenantScope = formData.tenantScope || "TENANT"; - } else { - formData.tenantScope = undefined; - } } /**