xto-fronted 0.4.102 → 0.4.104

package/src/index.ts

@@ -1,101 +1,115 @@
-// 样式
-import './style.scss'
-
-// 配置
-import { initAppConfig, getAppId, getClientId, getApiBaseUrl } from './utils/config'
-import type { LocaleCode } from '@xto/core/locale'
-
-// XtoConfig 类型定义
-export interface XtoConfig {
-  appName?: string
-  appId?: string
-  clientId?: string
-  apiBaseUrl?: string
-  indexPath?: string
-  loginPath?: string
-  locale?: LocaleCode
-}
-
-/**
- * 初始化 XTO 应用
- * 在项目入口文件中调用此函数设置应用配置
- * @param config 应用配置
- */
-export function createXtoApp(config: Partial<XtoConfig>) {
-  initAppConfig({
-    appId: config.appId,
-    clientId: config.clientId,
-    apiBaseUrl: config.apiBaseUrl
-  })
-
-  // 设置初始语言（如果提供）
-  if (config.locale) {
-    import('./stores/locale').then(({ useLocaleStore }) => {
-      const localeStore = useLocaleStore()
-      localeStore.changeLocale(config.locale!)
-    })
-  }
-
-  return {
-    config: {
-      appName: config.appName || 'XTO App',
-      appId: getAppId(),
-      clientId: getClientId(),
-      apiBaseUrl: getApiBaseUrl(),
-      indexPath: config.indexPath || '/dashboard',
-      loginPath: config.loginPath || '/login',
-      locale: config.locale || 'zh-CN'
-    }
-  }
-}
-
-// 组件
-export { default as Layout } from './components/Layout/index.vue'
-export { default as Header } from './components/Layout/Header.vue'
-export { default as Sidebar } from './components/Layout/Sidebar.vue'
-export { default as Tabs } from './components/Layout/Tabs.vue'
-export { default as Footer } from './components/Layout/Footer.vue'
-
-// 错误页面组件
-export { default as Login } from './views/login/index.vue'
-export { default as NotFound } from './views/error/404.vue'
-export { default as Forbidden } from './views/error/403.vue'
-
-// 组合式函数
-export * from './composables/useApp'
-export * from './composables/useAuth'
-export * from './composables/useForm'
-export * from './composables/useTable'
-export * from './composables/useI18n'
-
-// 工具函数
-export * from './utils/auth'
-export * from './utils/permission'
-export * from './utils/request'
-export * from './utils/storage'
-export * from './utils/config'
-
-// Store
-export * from './stores/app'
-export * from './stores/auth'
-export * from './stores/menu'
-export * from './stores/user'
-export * from './stores/locale'
-
-// 路由
-export { default as router, resetRouter } from './router'
-export * from './router/staticRoutes'
-export * from './router/dynamicRoutes'
-export { createLayoutRoute, createRouter } from './router/layoutRoute'
-export { setupRouterGuards } from './router/guards'
-
-// API
-export * from './api/auth'
-export * from './api/system'
-export * from './api/user'
-
-// 枚举
-export * from './enums'
-
-// 指令
+// 样式
+import './style.scss'
+
+// 配置
+import { initAppConfig, getAppId, getClientId, getApiBaseUrl } from './utils/config'
+import type { LocaleCode } from '@xto/core/locale'
+
+// XtoConfig 类型定义
+export interface XtoConfig {
+  appName?: string
+  appId?: string
+  clientId?: string
+  apiBaseUrl?: string
+  indexPath?: string
+  loginPath?: string
+  locale?: LocaleCode
+}
+
+/**
+ * 初始化 XTO 应用
+ * 在项目入口文件中调用此函数设置应用配置
+ * @param config 应用配置
+ */
+export function createXtoApp(config: Partial<XtoConfig>) {
+  initAppConfig({
+    appId: config.appId,
+    clientId: config.clientId,
+    apiBaseUrl: config.apiBaseUrl
+  })
+
+  // 设置应用名称和路径到 store
+  import('./stores/app').then(({ useAppStore }) => {
+    const appStore = useAppStore()
+    if (config.appName) {
+      appStore.setAppName(config.appName)
+    }
+    if (config.indexPath) {
+      appStore.setIndexPath(config.indexPath)
+    }
+    if (config.loginPath) {
+      appStore.setLoginPath(config.loginPath)
+    }
+  })
+
+  // 设置初始语言（如果提供）
+  if (config.locale) {
+    import('./stores/locale').then(({ useLocaleStore }) => {
+      const localeStore = useLocaleStore()
+      localeStore.changeLocale(config.locale!)
+    })
+  }
+
+  return {
+    config: {
+      appName: config.appName || 'XTO App',
+      appId: getAppId(),
+      clientId: getClientId(),
+      apiBaseUrl: getApiBaseUrl(),
+      indexPath: config.indexPath || '/dashboard',
+      loginPath: config.loginPath || '/login',
+      locale: config.locale || 'zh-CN'
+    }
+  }
+}
+
+// 组件
+export { default as Layout } from './components/Layout/index.vue'
+export { default as Header } from './components/Layout/Header.vue'
+export { default as Sidebar } from './components/Layout/Sidebar.vue'
+export { default as Tabs } from './components/Layout/Tabs.vue'
+export { default as Footer } from './components/Layout/Footer.vue'
+
+// 错误页面组件
+export { default as Login } from './views/login/index.vue'
+export { default as NotFound } from './views/error/404.vue'
+export { default as Forbidden } from './views/error/403.vue'
+
+// 组合式函数
+export * from './composables/useApp'
+export * from './composables/useAuth'
+export * from './composables/useForm'
+export * from './composables/useTable'
+export * from './composables/useI18n'
+
+// 工具函数
+export * from './utils/auth'
+export * from './utils/permission'
+export * from './utils/request'
+export * from './utils/storage'
+export * from './utils/config'
+
+// Store
+export * from './stores/app'
+export * from './stores/auth'
+export * from './stores/menu'
+export * from './stores/user'
+export * from './stores/locale'
+
+// 路由
+export { default as router, resetRouter } from './router'
+export * from './router/staticRoutes'
+export * from './router/dynamicRoutes'
+export { createLayoutRoute, createRouter } from './router/layoutRoute'
+export { setupRouterGuards } from './router/guards'
+
+// API
+export * from './api/auth'
+export * from './api/system'
+export * from './api/user'
+
+// 枚举
+export * from './enums'
+
+// 指令
 export { default as permissionDirective } from './directives/permission'

package/src/router/guards.ts

@@ -1,127 +1,129 @@
-/**
- * 路由守卫设置
- */
-
-import type { Router } from 'vue-router'
-import { getToken, clearToken } from '@/utils/auth'
-import { useUserStore } from '@/stores/user'
-import { useMenuStore } from '@/stores/menu'
-import { useAppStore } from '@/stores/app'
-import { getUserInfo } from '@/api/auth'
-import { getMenuTree } from '@/api/system'
-
-// 白名单路由
-const defaultWhiteList = ['/login', '/404', '/403']
-
-interface RouterGuardOptions {
-  // 白名单路由
-  whiteList?: string[]
-  // 登录页路径
-  loginPath?: string
-  // 首页路径
-  homePath?: string
-  // 应用ID
-  appId?: string
-  // 获取用户信息的回调（可选，默认调用 API）
-  fetchUserInfo?: () => Promise<any>
-  // 获取菜单的回调（可选，默认调用 API）
-  fetchMenu?: () => Promise<any>
-  // 登录成功后的回调
-  onLoginSuccess?: () => void
-}
-
-/**
- * 设置路由守卫
- * @param router 路由实例
- * @param options 配置选项
- */
-export function setupRouterGuards(router: Router, options: RouterGuardOptions = {}) {
-  const whiteList = options.whiteList || defaultWhiteList
-  const loginPath = options.loginPath || '/login'
-  const homePath = options.homePath || '/'
-
-  router.beforeEach(async (to, _from, next) => {
-    const appStore = useAppStore()
-    const userStore = useUserStore()
-    const menuStore = useMenuStore()
-
-    // 初始化主题
-    appStore.initTheme()
-
-    // 检查是否有 token
-    const token = getToken()
-
-    if (token) {
-      // 已登录
-      if (to.path === loginPath) {
-        // 已登录访问登录页，跳转到首页
-        next({ path: homePath })
-      } else {
-        // 检查是否已获取用户信息
-        if (userStore.isLoggedIn) {
-          // 已有用户信息，直接放行
-          // 添加缓存页面
-          if (to.name && to.meta.keepAlive) {
-            appStore.addCachedView(to.name as string)
-          }
-          next()
-        } else {
-          // 尝试获取用户信息
-          try {
-            // 获取用户信息
-            if (options.fetchUserInfo) {
-              const userInfo = await options.fetchUserInfo()
-              userStore.setUserInfo(userInfo)
-            } else {
-              const userInfo = await getUserInfo()
-              userStore.setUserInfo(userInfo)
-            }
-
-            // 获取菜单
-            if (options.fetchMenu) {
-              const menuList = await options.fetchMenu()
-              menuStore.setMenuList(menuList)
-            } else {
-              const menuList = await getMenuTree(options.appId)
-              menuStore.setMenuList(menuList)
-            }
-
-            // 登录成功回调
-            if (options.onLoginSuccess) {
-              options.onLoginSuccess()
-            }
-
-            // 添加缓存页面
-            if (to.name && to.meta.keepAlive) {
-              appStore.addCachedView(to.name as string)
-            }
-
-            // 重新导航到目标路由，确保动态路由已添加
-            next({ ...to, replace: true })
-          } catch (error) {
-            // 获取用户信息失败，清除所有 token 相关数据并跳转到登录页
-            console.error('获取用户信息失败:', error)
-            userStore.clearUserInfo()
-            menuStore.clearMenu()
-            // 使用 clearToken 清除所有 token 相关数据（包括 expires_time、refresh_time 等）
-            clearToken()
-            next({ path: loginPath, query: { redirect: to.fullPath } })
-          }
-        }
-      }
-    } else {
-      // 未登录
-      if (whiteList.includes(to.path)) {
-        // 在白名单中，直接放行
-        next()
-      } else {
-        // 不在白名单中，跳转到登录页
-        next({ path: loginPath, query: { redirect: to.fullPath } })
-      }
-    }
-  })
-
-  router.afterEach(() => {
-    // 可以在这里添加进度条结束等
-  })
-}
+/**
+ * 路由守卫设置
+ */
+
+import type { Router } from 'vue-router'
+import { getToken, clearToken } from '@/utils/auth'
+import { useUserStore } from '@/stores/user'
+import { useMenuStore } from '@/stores/menu'
+import { useAppStore } from '@/stores/app'
+import { getUserInfo } from '@/api/auth'
+import { getMenuTree } from '@/api/system'
+
+// 白名单路由
+const defaultWhiteList = ['/login', '/404', '/403']
+
+interface RouterGuardOptions {
+  // 白名单路由
+  whiteList?: string[]
+  // 登录页路径
+  loginPath?: string
+  // 首页路径
+  homePath?: string
+  // 应用ID
+  appId?: string
+  // 获取用户信息的回调（可选，默认调用 API）
+  fetchUserInfo?: () => Promise<any>
+  // 获取菜单的回调（可选，默认调用 API）
+  fetchMenu?: () => Promise<any>
+  // 登录成功后的回调
+  onLoginSuccess?: () => void
+}
+
+/**
+ * 设置路由守卫
+ * @param router 路由实例
+ * @param options 配置选项
+ */
+export function setupRouterGuards(router: Router, options: RouterGuardOptions = {}) {
+  const whiteList = options.whiteList || defaultWhiteList
+
+  router.beforeEach(async (to, _from, next) => {
+    const appStore = useAppStore()
+    const userStore = useUserStore()
+    const menuStore = useMenuStore()
+
+    // 从 store 获取路径配置（createXtoApp 已设置）
+    const loginPath = appStore.loginPath || options.loginPath || '/login'
+    const homePath = appStore.indexPath || options.homePath || '/dashboard'
+
+    // 初始化主题
+    appStore.initTheme()
+
+    // 检查是否有 token
+    const token = getToken()
+
+    if (token) {
+      // 已登录
+      if (to.path === loginPath) {
+        // 已登录访问登录页，跳转到首页
+        next({ path: homePath })
+      } else {
+        // 检查是否已获取用户信息
+        if (userStore.isLoggedIn) {
+          // 已有用户信息，直接放行
+          // 添加缓存页面
+          if (to.name && to.meta.keepAlive) {
+            appStore.addCachedView(to.name as string)
+          }
+          next()
+        } else {
+          // 尝试获取用户信息
+          try {
+            // 获取用户信息
+            if (options.fetchUserInfo) {
+              const userInfo = await options.fetchUserInfo()
+              userStore.setUserInfo(userInfo)
+            } else {
+              const userInfo = await getUserInfo()
+              userStore.setUserInfo(userInfo)
+            }
+
+            // 获取菜单
+            if (options.fetchMenu) {
+              const menuList = await options.fetchMenu()
+              menuStore.setMenuList(menuList)
+            } else {
+              const menuList = await getMenuTree(options.appId)
+              menuStore.setMenuList(menuList)
+            }
+
+            // 登录成功回调
+            if (options.onLoginSuccess) {
+              options.onLoginSuccess()
+            }
+
+            // 添加缓存页面
+            if (to.name && to.meta.keepAlive) {
+              appStore.addCachedView(to.name as string)
+            }
+
+            // 重新导航到目标路由，确保动态路由已添加
+            next({ ...to, replace: true })
+          } catch (error) {
+            // 获取用户信息失败，清除所有 token 相关数据并跳转到登录页
+            console.error('获取用户信息失败:', error)
+            userStore.clearUserInfo()
+            menuStore.clearMenu()
+            // 使用 clearToken 清除所有 token 相关数据（包括 expires_time、refresh_time 等）
+            clearToken()
+            next({ path: loginPath, query: { redirect: to.fullPath } })
+          }
+        }
+      }
+    } else {
+      // 未登录
+      if (whiteList.includes(to.path)) {
+        // 在白名单中，直接放行
+        next()
+      } else {
+        // 不在白名单中，跳转到登录页
+        next({ path: loginPath, query: { redirect: to.fullPath } })
+      }
+    }
+  })
+
+  router.afterEach(() => {
+    // 可以在这里添加进度条结束等
+  })
+}

package/src/router/layoutRoute.ts

@@ -1,71 +1,71 @@
-/**
- * 布局路由工厂函数
- */
-
-import { createRouter as vueCreateRouter, createWebHistory } from 'vue-router'
-import type { RouteRecordRaw, Router } from 'vue-router'
-import { h, defineComponent } from 'vue'
-import Layout from '@/components/Layout/index.vue'
-
-interface LayoutRouteOptions {
-  indexPath?: string
-  logoSrc?: string
-}
-
-interface CreateRouterOptions {
-  base?: string
-}
-
-/**
- * 创建布局路由
- * @param children 子路由配置
- * @param options 配置选项
- * @returns 布局路由配置
- */
-export function createLayoutRoute(
-  children: RouteRecordRaw[],
-  options: LayoutRouteOptions = {}
-): RouteRecordRaw {
-  const indexPath = options.indexPath || '/dashboard'
-  const logoSrc = options.logoSrc || '/vite.svg'
-
-  // 添加 catch-all 路由，让404在Layout内部渲染，保持左侧菜单显示
-  const catchAllRoute: RouteRecordRaw = {
-    path: '/:pathMatch(.*)*',
-    name: 'CatchAll',
-    component: () => import('@/views/error/404.vue'),
-    meta: {
-      title: '404'
-    }
-  }
-
-  // 创建带 props 的 Layout 包装组件
-  const LayoutWrapper = defineComponent({
-    name: 'LayoutWrapper',
-    render() {
-      return h(Layout, { logoSrc })
-    }
-  })
-
-  return {
-    path: '/',
-    name: 'Layout',
-    component: LayoutWrapper,
-    redirect: indexPath,
-    children: [...children, catchAllRoute]
-  }
-}
-
-/**
- * 创建路由实例
- * @param routes 路由配置数组
- * @param options 配置选项
- * @returns 路由实例
- */
-export function createRouter(routes: RouteRecordRaw[], options: CreateRouterOptions = {}): Router {
-  return vueCreateRouter({
-    history: createWebHistory(options.base),
-    routes,
-    scrollBehavior: () => ({ left: 0, top: 0 })
-  })
+/**
+ * 布局路由工厂函数
+ */
+
+import { createRouter as vueCreateRouter, createWebHistory } from 'vue-router'
+import type { RouteRecordRaw, Router } from 'vue-router'
+import { h, defineComponent } from 'vue'
+import Layout from '@/components/Layout/index.vue'
+
+interface LayoutRouteOptions {
+  indexPath?: string
+  logoSrc?: string
+}
+
+interface CreateRouterOptions {
+  base?: string
+}
+
+/**
+ * 创建布局路由
+ * @param children 子路由配置
+ * @param options 配置选项
+ * @returns 布局路由配置
+ */
+export function createLayoutRoute(
+  children: RouteRecordRaw[],
+  options: LayoutRouteOptions = {}
+): RouteRecordRaw {
+  const indexPath = options.indexPath || '/dashboard'
+  const logoSrc = options.logoSrc || '/vite.svg'
+
+  // 添加 catch-all 路由，让404在Layout内部渲染，保持左侧菜单显示
+  const catchAllRoute: RouteRecordRaw = {
+    path: '/:pathMatch(.*)*',
+    name: 'CatchAll',
+    component: () => import('@/views/error/404.vue'),
+    meta: {
+      title: '404'
+    }
+  }
+
+  // 创建带 props 的 Layout 包装组件
+  const LayoutWrapper = defineComponent({
+    name: 'LayoutWrapper',
+    render() {
+      return h(Layout, { logoSrc })
+    }
+  })
+
+  return {
+    path: '/',
+    name: 'Layout',
+    component: LayoutWrapper,
+    redirect: indexPath,
+    children: [...children, catchAllRoute]
+  }
+}
+
+/**
+ * 创建路由实例
+ * @param routes 路由配置数组
+ * @param options 配置选项
+ * @returns 路由实例
+ */
+export function createRouter(routes: RouteRecordRaw[], options: CreateRouterOptions = {}): Router {
+  return vueCreateRouter({
+    history: createWebHistory(options.base),
+    routes,
+    scrollBehavior: () => ({ left: 0, top: 0 })
+  })
 }

package/src/stores/app.ts

@@ -13,6 +13,7 @@ export const useAppStore = defineStore('app', () => {
   // 状态
   const appName = ref<string>(local.get<string>('appName') || 'XTO App')
   const indexPath = ref<string>(local.get<string>('indexPath') || '/dashboard')
+  const loginPath = ref<string>(local.get<string>('loginPath') || '/login')
   const isDark = ref<boolean>(local.get<boolean>('isDark') || false)
   const theme = ref<ThemeMode>(local.get<ThemeMode>('theme') || 'light')
   const layout = ref<LayoutMode>(local.get<LayoutMode>('layout') || 'sidebar')
@@ -39,6 +40,12 @@ export const useAppStore = defineStore('app', () => {
     local.set('indexPath', path)
   }
 
+  // 设置登录页路径
+  const setLoginPath = (path: string) => {
+    loginPath.value = path
+    local.set('loginPath', path)
+  }
+
   // 切换主题
   const toggleTheme = () => {
     isDark.value = !isDark.value
@@ -141,6 +148,7 @@ export const useAppStore = defineStore('app', () => {
   return {
     appName,
     indexPath,
+    loginPath,
     isDark,
     theme,
     layout,
@@ -154,6 +162,7 @@ export const useAppStore = defineStore('app', () => {
     themeClass,
     setAppName,
     setIndexPath,
+    setLoginPath,
     toggleTheme,
     toggleCollapse,
     setTheme,