@liujitcn/kratos-admin-core 0.0.55 → 0.0.56

package/dist/package/declarations/src/api/base/v1/config.d.ts

@@ -1,7 +1,9 @@
-import type { ConfigService, GetConfigRequest, GetConfigResponse } from "../../../rpc/base/v1/config";
+import type { ConfigService, GetConfigRequest, GetConfigResponse, GetI18nCustomRequest, GetI18nCustomResponse } from "../../../rpc/base/v1/config";
 /** 系统配置公共服务 */
 export declare class ConfigServiceImpl implements ConfigService {
     /** 获取系统配置 */
     GetConfig(request: GetConfigRequest): Promise<GetConfigResponse>;
+    /** 获取当前租户的自定义国际化覆盖项。 */
+    GetI18nCustom(request: GetI18nCustomRequest): Promise<GetI18nCustomResponse>;
 }
 export declare const defConfigService: ConfigServiceImpl;

package/dist/package/declarations/src/rpc/base/v1/config.d.ts

@@ -29,8 +29,16 @@ export interface GetConfigResponse {
     configs: ConfigItem[];
     /** AI 助手是否可用 */
     ai_enabled: boolean;
+}
+/** 当前租户自定义国际化覆盖项查询条件。 */
+export interface GetI18nCustomRequest {
+    /** 位置：枚举【BaseConfigSite】 */
+    site: BaseConfigSite;
+}
+/** 当前租户自定义国际化覆盖项查询结果。 */
+export interface GetI18nCustomResponse {
     /** 全部语言的自定义国际化覆盖项 */
-    i18n_customs: I18nCustomItem[];
+    items: I18nCustomItem[];
 }
 /** 全部语言的自定义国际化覆盖项。 */
 export interface I18nCustomItem {
@@ -45,4 +53,6 @@ export interface I18nCustomItem {
 export interface ConfigService {
     /** 获取系统配置 */
     GetConfig(request: GetConfigRequest): Promise<GetConfigResponse>;
+    /** 获取当前租户的自定义国际化覆盖项 */
+    GetI18nCustom(request: GetI18nCustomRequest): Promise<GetI18nCustomResponse>;
 }

package/dist/package/declarations/src/stores/modules/config.d.ts

@@ -23,6 +23,14 @@ export declare const useConfigStore: import("pinia").StoreDefinition<"admin-conf
         adminLogo: string;
         background: string;
     }>;
+    /**
+     * 登录成功后加载当前租户的自定义国际化覆盖项。
+     */
+    loadI18nCustom(): Promise<void>;
+    /**
+     * 清空租户自定义翻译并恢复本地默认文案。
+     */
+    resetI18nCustom(): void;
 }>;
 /** 刷新当前管理端语言和站点运行配置。 */
 export declare function refreshAdminRuntimeConfig(): Promise<void>;

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

@@ -1,6 +1,11 @@
+import type { SelectOptionResponse_Option } from "../rpc/common/v1/common";
 /** 默认租户编码。 */
 export declare const DEFAULT_TENANT_CODE = "0000";
+/** 读取共享租户选项，同一时间只发起一次请求。 */
+export declare function loadSharedTenantOptions(): Promise<SelectOptionResponse_Option[]>;
+/** 清除共享租户选项，租户数据变更后由下一次读取重新加载。 */
+export declare function invalidateTenantOptions(): void;
 /** 读取租户列表筛选选项。 */
 export declare function requestTenantOptions(): Promise<{
-    data: import("../rpc/common/v1/common").SelectOptionResponse_Option[];
+    data: SelectOptionResponse_Option[];
 }>;

package/dist/package/src/api/base/v1/config.ts

@@ -1,5 +1,11 @@
 import service from "../../../utils/request";
-import type { ConfigService, GetConfigRequest, GetConfigResponse } from "../../../rpc/base/v1/config";
+import type {
+  ConfigService,
+  GetConfigRequest,
+  GetConfigResponse,
+  GetI18nCustomRequest,
+  GetI18nCustomResponse
+} from "../../../rpc/base/v1/config";
 
 const CONFIG_URL = "/v1/base/config";
 
@@ -14,6 +20,15 @@ export class ConfigServiceImpl implements ConfigService {
       headers: { Authorization: "no-auth" }
     });
   }
+
+  /** 获取当前租户的自定义国际化覆盖项。 */
+  GetI18nCustom(request: GetI18nCustomRequest): Promise<GetI18nCustomResponse> {
+    return service<GetI18nCustomRequest, GetI18nCustomResponse>({
+      url: `${CONFIG_URL}/i18n-custom`,
+      method: "get",
+      params: request
+    });
+  }
 }
 
 export const defConfigService = new ConfigServiceImpl();

package/dist/package/src/assets/images/logo.svg

@@ -1,7 +1,13 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Admin logo">
-  <rect width="64" height="64" rx="16" fill="#2563eb"/>
-  <path fill="#fff" d="M17 18.5A4.5 4.5 0 0 1 21.5 14h21a4.5 4.5 0 0 1 4.5 4.5v25a4.5 4.5 0 0 1-4.5 4.5h-21a4.5 4.5 0 0 1-4.5-4.5v-25Zm5 1.5v21h20V20.5H22Zm0 25h20v-1H22v1Z"/>
-  <circle cx="23" cy="17.5" r="1.5" fill="#93c5fd"/>
-  <circle cx="28" cy="17.5" r="1.5" fill="#93c5fd"/>
-  <path fill="#93c5fd" d="M25 26h3v10h-3V26Zm5-3h3v13h-3V23Zm5 6h3v7h-3v-7Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 56" role="img" aria-label="Admin logo">
+  <rect x="3" y="8" width="54" height="43" rx="7" fill="#eef6ff" stroke="#244987" stroke-width="4"/>
+  <rect x="11" y="17" width="22" height="24" rx="4" fill="#fff"/>
+  <path d="M17 22a5 5 0 1 0 5 5" fill="none" stroke="#ffd15c" stroke-width="4"/>
+  <path d="M22 22a5 5 0 0 1 5 5" fill="none" stroke="#ffbd00" stroke-width="4"/>
+  <rect x="17" y="34" width="3" height="4" rx="1" fill="#8679e8"/>
+  <rect x="22" y="31" width="3" height="7" rx="1" fill="#6f5bd9"/>
+  <rect x="27" y="28" width="3" height="10" rx="1" fill="#5540cf"/>
+  <path d="M39 23h10M39 29h10M39 35h7" fill="none" stroke="#8a7dea" stroke-width="3" stroke-linecap="round"/>
+  <circle cx="52" cy="10" r="10" fill="#c9f8e4"/>
+  <circle cx="52" cy="10" r="7" fill="#56dba0"/>
+  <path d="m48.5 10 2.5 2.5 4.5-5" fill="none" stroke="#fff" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

package/dist/package/src/bootstrap.ts

@@ -30,6 +30,9 @@ import { useUserStore } from "./stores/modules/user";
 import { getRouteMetaTitle } from "./utils";
 import { defLanguageService } from "./api/base/v1/language";
 import { setAdminDocumentTitle } from "./documentTitle";
+import defaultLogoUrl from "./assets/images/logo.svg";
+import defaultLoginBackgroundUrl from "./assets/images/login_bg.svg";
+import defaultLoginIllustrationUrl from "./assets/images/login_left.png";
 
 /**
  * 管理端启动参数。
@@ -49,6 +52,15 @@ export async function bootstrapAdminApp(options: AdminBootstrapOptions = {}) {
   registerAdminModules(modules);
   registerLocaleMessages(modules);
   initializeLocale();
+
+  // 登录页图片与启动接口并行加载，并在首次挂载前完成解码，避免页面先于图片绘制。
+  const loginImagePreloads = [defaultLogoUrl, defaultLoginBackgroundUrl, defaultLoginIllustrationUrl].map(
+    imageUrl => {
+      const image = new Image();
+      image.src = imageUrl;
+      return image.decode();
+    }
+  );
   try {
     applyLanguageConfig(await defLanguageService.OptionLanguage({}));
   } catch {
@@ -82,6 +94,7 @@ export async function bootstrapAdminApp(options: AdminBootstrapOptions = {}) {
   }
   updateDocumentTitle();
 
+  await Promise.allSettled(loginImagePreloads);
   app.mount(options.mount ?? "#app");
   return app;
 }
@@ -92,7 +105,7 @@ async function refreshLocalizedRuntimeData() {
   const authStore = useAuthStore(pinia);
   const dictStore = useDictStore(pinia);
   const configStore = useConfigStore(pinia);
-  await Promise.allSettled([configStore.loadDisplayConfig()]);
+  await Promise.allSettled([configStore.loadDisplayConfig(), ...(userStore.token ? [configStore.loadI18nCustom()] : [])]);
   if (userStore.token) {
     await Promise.allSettled([authStore.getAuthMenuList(), dictStore.updateDictionaryCache()]);
     syncLocalizedRouteState();

package/dist/package/src/locales/README.md

@@ -9,4 +9,4 @@
 | `en-US.json` | 英文公共语言包。 | 管理端切换为英文时由 Vue I18n 使用。 |
 | `ja-JP.json` | 日文公共语言包。 | 管理端切换为日文时由 Vue I18n 使用。 |
 
-语言包是标准 JSON，不能在文件内直接写注释；新增语言或修改键后执行仓库根目录的 `make i18n-sync`，脚本会校验所有语言并生成注册产物。语言切换选项固定显示后端 `base_language.native_name`，接口不可用时使用代码内置的原生名称；`common.language.*` 仅用于普通文案和语言迁移初始数据。新增语言的完整文件清单见[国际化语言扩展指南](../../../../../../docs/国际化语言扩展指南.md)。
+语言包是标准 JSON，不能在文件内直接写注释；新增语言或修改键后执行仓库根目录的 `make i18n`，脚本会校验所有语言并生成注册产物。语言切换选项固定显示后端 `base_language.native_name`，接口不可用时使用代码内置的原生名称；`common.language.*` 仅用于普通文案和语言迁移初始数据。新增语言的完整文件清单见[国际化语言扩展指南](../../../../../../docs/国际化语言扩展指南.md)。

package/dist/package/src/rpc/base/v1/config.ts

@@ -40,8 +40,18 @@ export interface GetConfigResponse {
   configs: ConfigItem[];
   /** AI 助手是否可用 */
   ai_enabled: boolean;
+}
+
+/** 当前租户自定义国际化覆盖项查询条件。 */
+export interface GetI18nCustomRequest {
+  /** 位置：枚举【BaseConfigSite】 */
+  site: BaseConfigSite;
+}
+
+/** 当前租户自定义国际化覆盖项查询结果。 */
+export interface GetI18nCustomResponse {
   /** 全部语言的自定义国际化覆盖项 */
-  i18n_customs: I18nCustomItem[];
+  items: I18nCustomItem[];
 }
 
 /** 全部语言的自定义国际化覆盖项。 */
@@ -58,4 +68,6 @@ export interface I18nCustomItem {
 export interface ConfigService {
   /** 获取系统配置 */
   GetConfig(request: GetConfigRequest): Promise<GetConfigResponse>;
+  /** 获取当前租户的自定义国际化覆盖项 */
+  GetI18nCustom(request: GetI18nCustomRequest): Promise<GetI18nCustomResponse>;
 }

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

@@ -118,18 +118,33 @@ export const useConfigStore = defineStore("admin-config", {
       });
       const configMap = buildConfigMap(configResponse.configs ?? []);
 
-      applyCustomLocaleMessages(configResponse.i18n_customs ?? []);
       this.setDisplayConfig(normalizeSiteDisplayConfig(configMap));
       this.setLoginCaptchaConfig(normalizeLoginCaptchaConfig(configMap));
       this.showTenantCode = !["false", "0"].includes((configMap[SHOW_TENANT_CODE_KEY] ?? "true").toLowerCase());
       this.i18nDraftEnabled = configMap[I18N_DRAFT_ENABLED_KEY] === "true";
       this.aiEnabled = configResponse.ai_enabled === true;
       return this.display;
+    },
+    /**
+     * 登录成功后加载当前租户的自定义国际化覆盖项。
+     */
+    async loadI18nCustom() {
+      const response = await defConfigService.GetI18nCustom({
+        site: BaseConfigSite.BASE_CONFIG_SITE_ADMIN
+      });
+      applyCustomLocaleMessages(response.items ?? []);
+    },
+    /**
+     * 清空租户自定义翻译并恢复本地默认文案。
+     */
+    resetI18nCustom() {
+      applyCustomLocaleMessages([]);
     }
   }
 });
 
 /** 刷新当前管理端语言和站点运行配置。 */
 export async function refreshAdminRuntimeConfig(): Promise<void> {
-  await useConfigStore().loadDisplayConfig();
+  const configStore = useConfigStore();
+  await Promise.all([configStore.loadDisplayConfig(), configStore.loadI18nCustom()]);
 }

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

@@ -10,6 +10,7 @@ import piniaPersistConfig from "../../stores/helper/persist";
 import { useDictStoreHook } from "../../stores/modules/dict";
 import { useLockScreenStore } from "../../stores/modules/lockScreen";
 import { useAuthStore } from "../../stores/modules/auth";
+import { useConfigStore } from "../../stores/modules/config";
 
 const defaultUserInfo: UserInfoForm = {
   user_name: "",
@@ -100,6 +101,7 @@ export const useUserStore = defineStore("admin-user", {
       useDictStoreHook().clearDictionaryCache();
       useLockScreenStore().clearLock();
       useAuthStore().$reset();
+      useConfigStore().resetI18nCustom();
       this.authVersion += 1;
       this.authInvalidated = true;
       this.setToken("");

package/dist/package/src/tenant.ts

@@ -4,7 +4,11 @@ import type { ColumnProps, EnumProps, RenderScope, SearchType } from "./componen
 import { defBaseTenantService } from "./api/system/admin/v1/base_tenant";
 import type { SelectOptionResponse_Option } from "./rpc/common/v1/common";
 import { useUserStore } from "./stores/runtime";
-import { DEFAULT_TENANT_CODE, requestTenantOptions as requestTenantOptionData } from "./utils/tenant";
+import {
+  DEFAULT_TENANT_CODE,
+  loadSharedTenantOptions,
+  requestTenantOptions as requestTenantOptionData
+} from "./utils/tenant";
 
 export * from "./utils/tenant";
 
@@ -89,8 +93,7 @@ export function useTenantScope(): TenantScope {
   async function loadTenantOptions(includeCurrentTenant = false) {
     if (!includeCurrentTenant && !isDefaultTenant.value) return;
     if (tenantOptions.value.length) return;
-    const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-    tenantOptions.value = response.list ?? [];
+    tenantOptions.value = await loadSharedTenantOptions();
   }
 
   function toRequestTenantId(value: unknown) {
@@ -129,7 +132,12 @@ export function useTenantScope(): TenantScope {
         search:
           options.searchable === false
             ? undefined
-            : { el: options.searchEl ?? "tenant-select", key: options.searchKey ?? prop, props: { filterable: true }, order: options.order },
+            : {
+                el: options.searchEl ?? "tenant-select",
+                key: options.searchKey ?? prop,
+                props: { filterable: true },
+                order: options.order ?? 1
+              },
         enum: options.enum ?? requestTenantOptionData,
         render: options.render ?? (scope => resolveTenantLabel(scope.row, prop))
       }

package/dist/package/src/utils/errorHandler.ts

@@ -1,3 +1,4 @@
+import axios from "axios";
 import { ElNotification } from "element-plus";
 import { t } from "../locales";
 
@@ -5,6 +6,7 @@ import { t } from "../locales";
  * @description 全局代码错误捕捉
  * */
 const errorHandler = (error: any) => {
+  if (axios.isCancel(error) || error === "canceled") return false;
   // 过滤 HTTP 请求错误
   if (error.status || error.status == 0) return false;
   let errorMap: { [key: string]: string } = {

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

@@ -152,6 +152,12 @@ function shouldSkipErrorMessage(config?: InternalAxiosRequestConfig) {
   return requestUrl === SESSION_URL && requestMethod === "delete";
 }
 
+/** 判断当前是否处于退出或认证失效过渡状态。 */
+function isAuthTransitioning() {
+  const userStore = getUserStore();
+  return userStore.isLoggingOut || userStore.authInvalidated;
+}
+
 /** 判断响应是否要求用户先修改密码。 */
 function isPasswordChangeRequired(data?: ErrorResponseData) {
   return data?.metadata?.[PASSWORD_CHANGE_REQUIRED_METADATA_KEY] === "true";
@@ -262,7 +268,6 @@ export async function ensureAccessToken() {
     await handleTokenRefresh(false);
     return hasValidAccessToken();
   } catch {
-    userStore.clearAuthData();
     return false;
   }
 }
@@ -304,7 +309,14 @@ export function handleAuthExpired() {
 // 请求拦截器
 service.interceptors.request.use(
   async (config: InternalAxiosRequestConfig) => {
+    const requestUrl = config.url ?? "";
+    const requestMethod = String(config.method ?? "").toLowerCase();
     const skipAuth = shouldSkipAuth(config);
+    const isLogoutRequest = requestUrl === SESSION_URL && requestMethod === "delete";
+    if (isAuthTransitioning() && !skipAuth && !isLogoutRequest) {
+      throw new axios.CanceledError();
+    }
+
     const accessToken = skipAuth ? "" : await getRequestAccessToken();
     Object.assign(config.headers, getLocaleRequestHeaders());
     config.headers[REFRESH_TOKEN_TRANSPORT_HEADER] = REFRESH_TOKEN_TRANSPORT_COOKIE;
@@ -341,14 +353,24 @@ service.interceptors.response.use(
     return Promise.reject(new Error(message || t("common.message.system_error")));
   },
   async (error: AxiosError) => {
+    if (axios.isCancel(error)) {
+      return Promise.reject(error);
+    }
+
     const status = error.response?.status;
     const data = error.response?.data as ErrorResponseData | undefined;
     const code = data?.code;
     const message = data?.message;
     const requestConfig = error.config as RetryableRequestConfig | undefined;
 
-    // 业务请求仅在 401 时尝试刷新并重放，403 直接展示后端权限错误。
-    if ((status === 401 || code === 401) && !shouldSkipAuthExpiredPrompt(requestConfig)) {
+    // 退出或认证失效后，页面中的在途请求返回 401 属于预期结果，不再重复刷新令牌、弹窗或提示错误。
+    if (isAuthTransitioning()) {
+      return Promise.reject(error);
+    }
+
+    // 业务请求仅在 401 时尝试刷新并重放，公共认证接口的 401 继续展示后端业务错误。
+    const isUnauthorized = status === 401 || code === 401;
+    if (isUnauthorized && !shouldSkipAuthExpiredPrompt(requestConfig)) {
       const userStore = getUserStore();
       if (requestConfig && !requestConfig._authRetried && !userStore.isLoggingOut && !userStore.authInvalidated && hasRefreshCookieHint()) {
         requestConfig._authRetried = true;
@@ -374,7 +396,7 @@ service.interceptors.response.use(
     } else if (!shouldSkipErrorMessage(requestConfig)) {
       showRequestError(error.message || t("common.message.system_error"));
     }
-    return Promise.reject(error.message);
+    return Promise.reject(error);
   }
 );
 
@@ -389,12 +411,25 @@ export default request;
 let isRefreshing = false;
 let refreshPromise: Promise<void> | null = null;
 
+/** 判断刷新令牌是否已被服务端判定为失效。 */
+function isRefreshTokenUnauthorized(error: unknown) {
+  if (!axios.isAxiosError<ErrorResponseData>(error)) return false;
+
+  const status = error.response?.status;
+  const code = error.response?.data?.code;
+  return status === 401 || code === 401;
+}
+
 /** 刷新 Token 处理 */
 async function handleTokenRefresh(promptOnFailure = true) {
   if (!isRefreshing) {
     isRefreshing = true;
     refreshPromise = refreshAccessToken()
       .catch(error => {
+        if (isRefreshTokenUnauthorized(error)) {
+          // 刷新令牌失效后立即终止后续自动刷新，避免旧 Cookie 被反复提交。
+          getUserStore().clearAuthData();
+        }
         if (promptOnFailure) {
           console.log("token 刷新失败", error);
           handleAuthExpired();

package/dist/package/src/utils/tenant.ts

@@ -1,10 +1,42 @@
 import { defBaseTenantService } from "../api/system/admin/v1/base_tenant";
+import type { SelectOptionResponse_Option } from "../rpc/common/v1/common";
 
 /** 默认租户编码。 */
 export const DEFAULT_TENANT_CODE = "0000";
 
+const tenantOptions: SelectOptionResponse_Option[] = [];
+let tenantOptionsLoaded = false;
+let tenantOptionsRequest: Promise<SelectOptionResponse_Option[]> | undefined;
+let tenantOptionsVersion = 0;
+
+/** 读取共享租户选项，同一时间只发起一次请求。 */
+export async function loadSharedTenantOptions() {
+  if (tenantOptionsLoaded) return tenantOptions;
+  if (!tenantOptionsRequest) {
+    const requestVersion = tenantOptionsVersion;
+    tenantOptionsRequest = defBaseTenantService.OptionBaseTenant({ keyword: "" })
+      .then(response => {
+        if (requestVersion !== tenantOptionsVersion) return tenantOptions;
+        tenantOptions.splice(0, tenantOptions.length, ...(response.list ?? []));
+        tenantOptionsLoaded = true;
+        return tenantOptions;
+      })
+      .finally(() => {
+        tenantOptionsRequest = undefined;
+      });
+  }
+  return tenantOptionsRequest;
+}
+
+/** 清除共享租户选项，租户数据变更后由下一次读取重新加载。 */
+export function invalidateTenantOptions() {
+  tenantOptionsVersion += 1;
+  tenantOptions.splice(0, tenantOptions.length);
+  tenantOptionsLoaded = false;
+  tenantOptionsRequest = undefined;
+}
+
 /** 读取租户列表筛选选项。 */
 export async function requestTenantOptions() {
-  const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  return { data: response.list ?? [] };
+  return { data: await loadSharedTenantOptions() };
 }

package/dist/package/src/views/login/components/LoginForm.vue

@@ -629,6 +629,11 @@ const handleLoginResponse = async (result: LoginResponse) => {
     clearPasswordChangeRequired();
   }
   userStore.updateTokenAuth(result.access_token, result.token_type ?? "", result.expires_in);
+  try {
+    await configStore.loadI18nCustom();
+  } catch {
+    configStore.resetI18nCustom();
+  }
   await finishLogin(mustChangePassword);
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-core",
   "private": false,
-  "version": "0.0.55",
+  "version": "0.0.56",
   "type": "module",
   "description": "kratos-admin frontend runtime and base modules",
   "author": {
@@ -236,7 +236,7 @@
   "scripts": {
     "build": "pnpm build:package",
     "build:package": "node ../../scripts/build-package.mjs .",
-    "test": "tsc -p tsconfig.test.json && node --test dist/test/tests/modules.test.js dist/test/tests/dict.test.js dist/test/tests/menu.test.js dist/test/tests/source-patterns.test.js dist/test/tests/codegen-hmr.test.js dist/test/tests/dialog-request.test.js",
+    "test": "tsc -p tsconfig.test.json && node --test dist/test/tests/modules.test.js dist/test/tests/dict.test.js dist/test/tests/menu.test.js dist/test/tests/source-patterns.test.js dist/test/tests/codegen-hmr.test.js dist/test/tests/dialog-request.test.js dist/test/tests/request-error.test.js",
     "type:check": "vue-tsc --noEmit --skipLibCheck"
   }
 }