xto-fronted 0.4.6 → 0.4.8

package/src/router/guards.ts

@@ -1,129 +1,129 @@
-/**
- * 路由守卫设置
- */
-
-import type { Router } from 'vue-router'
-import { getToken } 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()
-            // 清除 token
-            localStorage.removeItem('token')
-            localStorage.removeItem('token_type')
-            localStorage.removeItem('refresh_token')
-            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 } 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()
+            // 清除 token
+            localStorage.removeItem('token')
+            localStorage.removeItem('token_type')
+            localStorage.removeItem('refresh_token')
+            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/index.ts

@@ -1,80 +1,80 @@
-/**
- * 路由配置
- */
-
-import { createRouter, createWebHistory } from 'vue-router'
-import { staticRoutes, errorRoute } from './staticRoutes'
-import { layoutRoute } from './dynamicRoutes'
-import { hasToken } from '@/utils/auth'
-import { getAppId } from '@/utils/config'
-import { useUserStore } from '@/stores/user'
-import { useMenuStore } from '@/stores/menu'
-import { useAppStore } from '@/stores/app'
-import { mockMenuData } from './dynamicRoutes'
-
-const router = createRouter({
-  history: createWebHistory(),
-  routes: [...staticRoutes, layoutRoute, errorRoute],
-  scrollBehavior: () => ({ left: 0, top: 0 })
-})
-
-// 白名单路由
-const whiteList = ['/login', '/404', '/403']
-
-// 路由守卫
-router.beforeEach(async (to, _from, next) => {
-  const appStore = useAppStore()
-
-  // 初始化主题
-  appStore.initTheme()
-
-  // 已登录
-  if (hasToken()) {
-    if (to.path === '/login') {
-      // 已登录，跳转到首页
-      next({ path: '/' })
-    } else {
-      // 设置用户信息（如果未设置）
-      const userStore = useUserStore()
-      if (!userStore.isLoggedIn) {
-        userStore.setUserInfo({
-          appId: getAppId(),
-          userId: '1',
-          userName: '管理员',
-          departmentName: '技术部',
-          email: 'admin@example.com',
-          mobilePhone: '13800138000',
-          positionName: '管理员',
-          avatar: ''
-        })
-
-        // 设置菜单
-        const menuStore = useMenuStore()
-        menuStore.setMenuList(mockMenuData)
-      }
-
-      // 添加缓存页面
-      if (to.name && to.meta.keepAlive) {
-        appStore.addCachedView(to.name as string)
-      }
-      next()
-    }
-  } else {
-    // 未登录
-    if (whiteList.includes(to.path)) {
-      next()
-    } else {
-      next('/login')
-    }
-  }
-})
-
-export function resetRouter() {
-  const newRouter = createRouter({
-    history: createWebHistory(),
-    routes: [...staticRoutes, layoutRoute, errorRoute]
-  })
-  ;(router as any).matcher = (newRouter as any).matcher
-}
-
+/**
+ * 路由配置
+ */
+
+import { createRouter, createWebHistory } from 'vue-router'
+import { staticRoutes, errorRoute } from './staticRoutes'
+import { layoutRoute } from './dynamicRoutes'
+import { hasToken } from '@/utils/auth'
+import { getAppId } from '@/utils/config'
+import { useUserStore } from '@/stores/user'
+import { useMenuStore } from '@/stores/menu'
+import { useAppStore } from '@/stores/app'
+import { mockMenuData } from './dynamicRoutes'
+
+const router = createRouter({
+  history: createWebHistory(),
+  routes: [...staticRoutes, layoutRoute, errorRoute],
+  scrollBehavior: () => ({ left: 0, top: 0 })
+})
+
+// 白名单路由
+const whiteList = ['/login', '/404', '/403']
+
+// 路由守卫
+router.beforeEach(async (to, _from, next) => {
+  const appStore = useAppStore()
+
+  // 初始化主题
+  appStore.initTheme()
+
+  // 已登录
+  if (hasToken()) {
+    if (to.path === '/login') {
+      // 已登录，跳转到首页
+      next({ path: '/' })
+    } else {
+      // 设置用户信息（如果未设置）
+      const userStore = useUserStore()
+      if (!userStore.isLoggedIn) {
+        userStore.setUserInfo({
+          appId: getAppId(),
+          userId: '1',
+          userName: '管理员',
+          departmentName: '技术部',
+          email: 'admin@example.com',
+          mobilePhone: '13800138000',
+          positionName: '管理员',
+          avatar: ''
+        })
+
+        // 设置菜单
+        const menuStore = useMenuStore()
+        menuStore.setMenuList(mockMenuData)
+      }
+
+      // 添加缓存页面
+      if (to.name && to.meta.keepAlive) {
+        appStore.addCachedView(to.name as string)
+      }
+      next()
+    }
+  } else {
+    // 未登录
+    if (whiteList.includes(to.path)) {
+      next()
+    } else {
+      next('/login')
+    }
+  }
+})
+
+export function resetRouter() {
+  const newRouter = createRouter({
+    history: createWebHistory(),
+    routes: [...staticRoutes, layoutRoute, errorRoute]
+  })
+  ;(router as any).matcher = (newRouter as any).matcher
+}
+
 export default router

package/src/stores/auth.ts

@@ -1,66 +1,66 @@
-/**
- * 认证状态
- */
-
-import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
-import { getToken, clearToken, setTokenInfo, hasToken, type TokenInfo } from '@/utils/auth'
-
-export const useAuthStore = defineStore('auth', () => {
-  // 状态
-  const token = ref<string | null>(getToken())
-  const isLoggedIn = computed(() => hasToken())
-
-  // 应用配置
-  const baseUrl = ref<string>('')
-  const appId = ref<string>('')
-  const clientId = ref<string>('')
-  const loginPath = ref<string>('/login')
-
-  // 设置 token（参考 tineco-ui）
-  const login = (tokenInfo: TokenInfo) => {
-    token.value = tokenInfo.access_token
-    setTokenInfo(tokenInfo)
-  }
-
-  // 登出
-  const logout = () => {
-    token.value = null
-    clearToken()
-  }
-
-  // 设置 API 基础路径
-  const setBaseUrl = (url: string) => {
-    baseUrl.value = url
-  }
-
-  // 设置应用 ID
-  const setAppId = (id: string) => {
-    appId.value = id
-  }
-
-  // 设置客户端 ID
-  const setClientId = (id: string) => {
-    clientId.value = id
-  }
-
-  // 设置登录页路径
-  const setLoginPath = (path: string) => {
-    loginPath.value = path
-  }
-
-  return {
-    token,
-    isLoggedIn,
-    baseUrl,
-    appId,
-    clientId,
-    loginPath,
-    login,
-    logout,
-    setBaseUrl,
-    setAppId,
-    setClientId,
-    setLoginPath
-  }
+/**
+ * 认证状态
+ */
+
+import { defineStore } from 'pinia'
+import { ref, computed } from 'vue'
+import { getToken, clearToken, setTokenInfo, hasToken, type TokenInfo } from '@/utils/auth'
+
+export const useAuthStore = defineStore('auth', () => {
+  // 状态
+  const token = ref<string | null>(getToken())
+  const isLoggedIn = computed(() => hasToken())
+
+  // 应用配置
+  const baseUrl = ref<string>('')
+  const appId = ref<string>('')
+  const clientId = ref<string>('')
+  const loginPath = ref<string>('/login')
+
+  // 设置 token（参考 tineco-ui）
+  const login = (tokenInfo: TokenInfo) => {
+    token.value = tokenInfo.access_token
+    setTokenInfo(tokenInfo)
+  }
+
+  // 登出
+  const logout = () => {
+    token.value = null
+    clearToken()
+  }
+
+  // 设置 API 基础路径
+  const setBaseUrl = (url: string) => {
+    baseUrl.value = url
+  }
+
+  // 设置应用 ID
+  const setAppId = (id: string) => {
+    appId.value = id
+  }
+
+  // 设置客户端 ID
+  const setClientId = (id: string) => {
+    clientId.value = id
+  }
+
+  // 设置登录页路径
+  const setLoginPath = (path: string) => {
+    loginPath.value = path
+  }
+
+  return {
+    token,
+    isLoggedIn,
+    baseUrl,
+    appId,
+    clientId,
+    loginPath,
+    login,
+    logout,
+    setBaseUrl,
+    setAppId,
+    setClientId,
+    setLoginPath
+  }
 })

package/src/stores/menu.ts

@@ -1,49 +1,49 @@
-/**
- * 菜单状态
- */
-
-import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
-import type { MenuItem } from '@/types/api'
-import { local } from '@/utils/storage'
-
-const MENU_LIST_KEY = 'menu_list'
-
-// 首页菜单（参考 tineco-ui）
-const indexMenu: MenuItem = {
-  menuCode: 'home',
-  menuName: '首页',
-  menuUrl: '/dashboard',
-  icon: 'home',
-  closable: false,
-  isDefault: false,
-  isOut: false
-}
-
-export const useMenuStore = defineStore('menu', () => {
-  // 状态
-  const menuList = ref<MenuItem[]>(local.get<MenuItem[]>(MENU_LIST_KEY) || [])
-
-  // 计算属性
-  const hasMenu = computed(() => menuList.value.length > 0)
-
-  // 设置菜单
-  const setMenuList = (menus: MenuItem[]) => {
-    // 添加首页菜单到开头
-    menuList.value = [indexMenu, ...menus]
-    local.set(MENU_LIST_KEY, menuList.value)
-  }
-
-  // 清除菜单
-  const clearMenu = () => {
-    menuList.value = []
-    local.remove(MENU_LIST_KEY)
-  }
-
-  return {
-    menuList,
-    hasMenu,
-    setMenuList,
-    clearMenu
-  }
+/**
+ * 菜单状态
+ */
+
+import { defineStore } from 'pinia'
+import { ref, computed } from 'vue'
+import type { MenuItem } from '@/types/api'
+import { local } from '@/utils/storage'
+
+const MENU_LIST_KEY = 'menu_list'
+
+// 首页菜单（参考 tineco-ui）
+const indexMenu: MenuItem = {
+  menuCode: 'home',
+  menuName: '首页',
+  menuUrl: '/dashboard',
+  icon: 'home',
+  closable: false,
+  isDefault: false,
+  isOut: false
+}
+
+export const useMenuStore = defineStore('menu', () => {
+  // 状态
+  const menuList = ref<MenuItem[]>(local.get<MenuItem[]>(MENU_LIST_KEY) || [])
+
+  // 计算属性
+  const hasMenu = computed(() => menuList.value.length > 0)
+
+  // 设置菜单
+  const setMenuList = (menus: MenuItem[]) => {
+    // 添加首页菜单到开头
+    menuList.value = [indexMenu, ...menus]
+    local.set(MENU_LIST_KEY, menuList.value)
+  }
+
+  // 清除菜单
+  const clearMenu = () => {
+    menuList.value = []
+    local.remove(MENU_LIST_KEY)
+  }
+
+  return {
+    menuList,
+    hasMenu,
+    setMenuList,
+    clearMenu
+  }
 })