@liujitcn/kratos-admin-core 0.0.87 → 0.0.89

package/dist/package/declarations/src/rpc/system/admin/v1/auth.d.ts

@@ -42,6 +42,8 @@ export interface UserInfoForm {
     tenant_code: string;
     /** 租户名称 */
     tenant_name: string;
+    /** 当前用户所属租户ID */
+    tenant_id: number;
 }
 /** 获取个人中心用户信息请求参数 */
 export interface GetUserProfileRequest {

package/dist/package/declarations/src/tenant.d.ts

@@ -11,6 +11,8 @@ export declare function requestTenantCodeOptions(): Promise<{
 export interface TenantScope {
     /** 当前账号是否为默认租户。 */
     isDefaultTenant: ComputedRef<boolean>;
+    /** 当前账号所属租户编号。 */
+    currentTenantId: ComputedRef<number | undefined>;
     /** 当前账号可用的租户选项。 */
     tenantOptions: Ref<SelectOptionResponse_Option[]>;
     /** 租户选项名称映射。 */

package/dist/package/src/layouts/components/Header/components/Avatar.vue

@@ -90,19 +90,20 @@ watch(
 );
 
 /** 退出登录并清理当前登录态。 */
-const logout = () => {
-  ElMessageBox.confirm(t("core.layout.logout_confirm"), t("common.title.warning"), {
+const logout = async () => {
+  const confirmed = await ElMessageBox.confirm(t("core.layout.logout_confirm"), t("common.title.warning"), {
     confirmButtonText: t("common.action.confirm"),
     cancelButtonText: t("common.action.cancel"),
     type: "warning"
-  }).then(async () => {
-    // 1.执行退出登录接口并清理本地状态
-    await userStore.logout();
+  }).then(() => true).catch(() => false);
+  if (!confirmed) return;
 
-    // 2.重定向到登录页
-    router.replace(LOGIN_URL);
-    ElMessage.success(t("core.layout.logout_success"));
-  });
+  // 1.执行退出登录接口并清理本地状态
+  await userStore.logout();
+
+  // 2.等待重定向到登录页完成
+  await router.replace(LOGIN_URL);
+  ElMessage.success(t("core.layout.logout_success"));
 };
 
 /** 头像加载失败时兜底显示默认头像，避免出现破图。 */

package/dist/package/src/rpc/system/admin/v1/auth.ts

@@ -54,6 +54,8 @@ export interface UserInfoForm {
   tenant_code: string;
   /** 租户名称 */
   tenant_name: string;
+  /** 当前用户所属租户ID */
+  tenant_id: number;
 }
 
 /** 获取个人中心用户信息请求参数 */

package/dist/package/src/stores/modules/user.ts

@@ -11,6 +11,7 @@ import { useDictStoreHook } from "../../stores/modules/dict";
 import { useLockScreenStore } from "../../stores/modules/lockScreen";
 import { useAuthStore } from "../../stores/modules/auth";
 import { useConfigStore } from "../../stores/modules/config";
+import { invalidateTenantOptions } from "../../utils/tenant";
 
 const defaultUserInfo: UserInfoForm = {
   user_name: "",
@@ -24,7 +25,8 @@ const defaultUserInfo: UserInfoForm = {
   role_name: "",
   dept_name: "",
   tenant_code: "",
-  tenant_name: ""
+  tenant_name: "",
+  tenant_id: 0
 };
 
 export const useUserStore = defineStore("admin-user", {
@@ -99,6 +101,7 @@ export const useUserStore = defineStore("admin-user", {
     clearAuthData() {
       // 清理登录态时同步清空字典缓存，避免切换账号后读到旧字典。
       useDictStoreHook().clearDictionaryCache();
+      invalidateTenantOptions();
       useLockScreenStore().clearLock();
       useAuthStore().$reset();
       useConfigStore().resetI18nCustom();

package/dist/package/src/tenant.ts

@@ -29,6 +29,8 @@ export async function requestTenantCodeOptions() {
 export interface TenantScope {
   /** 当前账号是否为默认租户。 */
   isDefaultTenant: ComputedRef<boolean>;
+  /** 当前账号所属租户编号。 */
+  currentTenantId: ComputedRef<number | undefined>;
   /** 当前账号可用的租户选项。 */
   tenantOptions: Ref<SelectOptionResponse_Option[]>;
   /** 租户选项名称映射。 */
@@ -87,6 +89,10 @@ export interface TenantColumnOptions {
 export function useTenantScope(): TenantScope {
   const userStore = useUserStore();
   const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+  const currentTenantId = computed(() => {
+    const tenantId = Number(userStore.userInfo.tenant_id);
+    return Number.isFinite(tenantId) && tenantId > 0 ? tenantId : undefined;
+  });
   const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
   const tenantNameMap = computed(() => new Map(tenantOptions.value.map(item => [String(item.value), item.label] as const)));
 
@@ -155,6 +161,7 @@ export function useTenantScope(): TenantScope {
 
   return {
     isDefaultTenant,
+    currentTenantId,
     tenantOptions,
     tenantNameMap,
     loadTenantOptions,

package/dist/package/src/utils/request.ts

@@ -59,6 +59,18 @@ const AUTH_EXPIRED_EXCLUDED_URL_SET = new Set([
   MFA_ENROLLMENT_CONFIRM_URL
 ]);
 
+/** 删除查询参数中表示“未选择”的租户项目零值。 */
+function compactTenantProjectQueryParams(value: unknown): unknown {
+  if (Array.isArray(value)) return value.map(item => compactTenantProjectQueryParams(item));
+  if (!value || typeof value !== "object") return value;
+  const result: Record<string, unknown> = {};
+  for (const [key, nested] of Object.entries(value as Record<string, unknown>)) {
+    if ((key === "tenant_id" || key === "project_id" || key.endsWith(".tenant_id") || key.endsWith(".project_id")) && nested === 0) continue;
+    result[key] = compactTenantProjectQueryParams(nested);
+  }
+  return result;
+}
+
 /** 支持自动重试的 Axios 请求配置。 */
 type RetryableRequestConfig = InternalAxiosRequestConfig & {
   /** 标记当前请求已经因认证失败重试过，避免刷新失败时递归重放。 */
@@ -109,7 +121,7 @@ const service = axios.create({
   baseURL: requestBaseURL,
   timeout: 50000,
   headers: { "Content-Type": "application/json;charset=utf-8" },
-  paramsSerializer: params => qs.stringify(params),
+  paramsSerializer: params => qs.stringify(compactTenantProjectQueryParams(params)),
   withCredentials: true
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-core",
   "private": false,
-  "version": "0.0.87",
+  "version": "0.0.89",
   "type": "module",
   "description": "kratos-admin frontend runtime and base modules",
   "author": {