xto-fronted 0.4.106 → 0.4.107

package/dist/utils/request.d.ts

@@ -17,6 +17,11 @@ export interface PageResponse<T> {
  * 用于 Nacos 动态配置场景
  */
 export declare function setApiBaseUrl(url: string): void;
+/**
+ * 设置运行时 base 路径
+ * 用于登录过期时正确跳转到登录页
+ */
+export declare function setBasePath(base: string): void;
 declare const request: AxiosInstance;
 export declare const http: {
     get<T = unknown>(url: string, config?: AxiosRequestConfig): Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xto-fronted",
-  "version": "0.4.106",
+  "version": "0.4.107",
   "private": false,
   "type": "module",
   "description": "XTO 前端应用框架",

package/src/index.ts

@@ -3,6 +3,7 @@ import './style.scss'
 
 // 配置
 import { initAppConfig, getAppId, getClientId, getApiBaseUrl } from './utils/config'
+import { setBasePath } from './utils/request'
 import type { LocaleCode } from '@xto/core/locale'
 
 // XtoConfig 类型定义
@@ -11,6 +12,7 @@ export interface XtoConfig {
   appId?: string
   clientId?: string
   apiBaseUrl?: string
+  basePath?: string
   indexPath?: string
   loginPath?: string
   locale?: LocaleCode
@@ -28,6 +30,11 @@ export function createXtoApp(config: Partial<XtoConfig>) {
     apiBaseUrl: config.apiBaseUrl
   })
 
+  // 设置 base 路径（用于登录过期时正确跳转）
+  if (config.basePath) {
+    setBasePath(config.basePath)
+  }
+
   // 设置应用名称和路径到 store
   import('./stores/app').then(({ useAppStore }) => {
     const appStore = useAppStore()
@@ -56,6 +63,7 @@ export function createXtoApp(config: Partial<XtoConfig>) {
       appId: getAppId(),
       clientId: getClientId(),
       apiBaseUrl: getApiBaseUrl(),
+      basePath: config.basePath || '/',
       indexPath: config.indexPath || '/dashboard',
       loginPath: config.loginPath || '/login',
       locale: config.locale || 'zh-CN'

package/src/utils/request.ts

@@ -32,6 +32,9 @@ export interface PageResponse<T> {
 // 运行时 API 基础 URL
 let runtimeApiBaseUrl: string | undefined
 
+// 运行时 base 路径
+let runtimeBasePath: string | undefined
+
 /**
  * 设置运行时 API 基础 URL
  * 用于 Nacos 动态配置场景
@@ -44,6 +47,24 @@ export function setApiBaseUrl(url: string) {
   }
 }
 
+/**
+ * 设置运行时 base 路径
+ * 用于登录过期时正确跳转到登录页
+ */
+export function setBasePath(base: string) {
+  runtimeBasePath = base
+}
+
+/**
+ * 获取登录页路径（考虑 base 路径）
+ */
+function getLoginPath(): string {
+  const base = runtimeBasePath || import.meta.env.BASE_URL || '/'
+  // 确保 base 以 / 结尾，login 不以 / 开头
+  const normalizedBase = base.endsWith('/') ? base : base + '/'
+  return normalizedBase + 'login'
+}
+
 // 创建 axios 实例
 const createRequest = (): AxiosInstance => {
   const instance = axios.create({
@@ -101,7 +122,7 @@ const createRequest = (): AxiosInstance => {
       if (data.code === 9121) {
         Message.error('登录已过期，请重新登录')
         clearToken()
-        window.location.href = '/login'
+        window.location.href = getLoginPath()
         return Promise.reject(new Error(data.message || 'EXPIRED OR INVALID TOKEN'))
       }
 
@@ -118,7 +139,7 @@ const createRequest = (): AxiosInstance => {
         if (data?.code === 9121) {
           Message.error('登录已过期，请重新登录')
           clearToken()
-          window.location.href = '/login'
+          window.location.href = getLoginPath()
           return Promise.reject(error)
         }
 
@@ -126,7 +147,7 @@ const createRequest = (): AxiosInstance => {
           case 401:
             Message.error('登录已过期，请重新登录')
             clearToken()
-            window.location.href = '/login'
+            window.location.href = getLoginPath()
             break
           case 403:
             Message.error('没有权限访问')