xto-fronted 0.4.2 → 0.4.4

package/src/directives/permission.ts

@@ -1,32 +1,22 @@
 /**
  * 权限指令
  * v-permission="['user:edit']" 或 v-permission="'user:edit'"
+ * 注意：tineco-ui 不支持 permissions 字段，此指令暂时只检查登录状态
  */
 
 import type { Directive, DirectiveBinding } from 'vue'
 import { useUserStore } from '@/stores/user'
 
 const permission: Directive = {
-  mounted(el: HTMLElement, binding: DirectiveBinding<string | string[]>) {
+  mounted(el: HTMLElement, _binding: DirectiveBinding<string | string[]>) {
     const userStore = useUserStore()
-    const { value } = binding
 
-    if (!value) return
-
-    const permissions = userStore.permissions
-
-    // 判断是否有权限
-    let hasPermission = false
-    if (Array.isArray(value)) {
-      hasPermission = value.some(p => permissions.includes(p) || permissions.includes('*'))
-    } else {
-      hasPermission = permissions.includes(value) || permissions.includes('*')
-    }
-
-    // 没有权限则移除元素
-    if (!hasPermission) {
+    // 如果没有登录，移除元素
+    if (!userStore.isLoggedIn) {
       el.parentNode?.removeChild(el)
     }
+
+    // 注意：tineco-ui 不支持 permissions 字段，此指令暂时不做权限判断
   }
 }
 

package/src/router/dynamicRoutes.ts

@@ -111,52 +111,52 @@ export const defaultDynamicRoutes: RouteRecordRaw[] = [
   }
 ]
 
-// Mock 菜单数据
+// Mock 菜单数据（参考 tineco-ui 格式）
 export const mockMenuData = [
   {
-    id: 1,
-    name: 'Dashboard',
-    path: '/dashboard',
-    component: 'dashboard/index',
+    menuCode: 'dashboard',
+    menuName: '仪表盘',
+    menuUrl: '/dashboard',
     icon: 'dashboard',
-    title: '仪表盘',
-    keepAlive: true,
-    affix: true
+    closable: true,
+    isDefault: true,
+    isOut: false
   },
   {
-    id: 2,
-    name: 'System',
-    path: '/system',
-    redirect: '/system/user',
+    menuCode: 'system',
+    menuName: '系统管理',
+    menuUrl: '/system',
     icon: 'setting',
-    title: '系统管理',
+    closable: false,
+    isDefault: false,
+    isOut: false,
     children: [
       {
-        id: 21,
-        name: 'SystemUser',
-        path: '/system/user',
-        component: 'system/user/index',
+        menuCode: 'system_user',
+        menuName: '用户管理',
+        menuUrl: '/system/user',
         icon: 'user',
-        title: '用户管理',
-        keepAlive: true
+        closable: true,
+        isDefault: false,
+        isOut: false
       },
       {
-        id: 22,
-        name: 'SystemRole',
-        path: '/system/role',
-        component: 'system/role/index',
+        menuCode: 'system_role',
+        menuName: '角色管理',
+        menuUrl: '/system/role',
         icon: 'role',
-        title: '角色管理',
-        keepAlive: true
+        closable: true,
+        isDefault: false,
+        isOut: false
       },
       {
-        id: 23,
-        name: 'SystemMenu',
-        path: '/system/menu',
-        component: 'system/menu/index',
+        menuCode: 'system_menu',
+        menuName: '菜单管理',
+        menuUrl: '/system/menu',
         icon: 'menu',
-        title: '菜单管理',
-        keepAlive: true
+        closable: true,
+        isDefault: false,
+        isOut: false
       }
     ]
   }

package/src/router/guards.ts

@@ -20,6 +20,8 @@ interface RouterGuardOptions {
   loginPath?: string
   // 首页路径
   homePath?: string
+  // 应用ID
+  appId?: string
   // 获取用户信息的回调（可选，默认调用 API）
   fetchUserInfo?: () => Promise<any>
   // 获取菜单的回调（可选，默认调用 API）
@@ -39,9 +41,6 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
   const homePath = options.homePath || '/'
 
   router.beforeEach(async (to, _from, next) => {
-    // 启动进度条（可选）
-    // NProgress.start()
-
     const appStore = useAppStore()
     const userStore = useUserStore()
     const menuStore = useMenuStore()
@@ -57,7 +56,6 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
       if (to.path === loginPath) {
         // 已登录访问登录页，跳转到首页
         next({ path: homePath })
-        // NProgress.done()
       } else {
         // 检查是否已获取用户信息
         if (userStore.isLoggedIn) {
@@ -84,7 +82,7 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
               const menuList = await options.fetchMenu()
               menuStore.setMenuList(menuList)
             } else {
-              const menuList = await getMenuTree()
+              const menuList = await getMenuTree(options.appId)
               menuStore.setMenuList(menuList)
             }
 
@@ -107,9 +105,9 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
             menuStore.clearMenu()
             // 清除 token
             localStorage.removeItem('token')
-            localStorage.removeItem('refreshToken')
+            localStorage.removeItem('token_type')
+            localStorage.removeItem('refresh_token')
             next({ path: loginPath, query: { redirect: to.fullPath } })
-            // NProgress.done()
           }
         }
       }
@@ -121,13 +119,11 @@ export function setupRouterGuards(router: Router, options: RouterGuardOptions =
       } else {
         // 不在白名单中，跳转到登录页
         next({ path: loginPath, query: { redirect: to.fullPath } })
-        // NProgress.done()
       }
     }
   })
 
   router.afterEach(() => {
-    // 结束进度条
-    // NProgress.done()
+    // 可以在这里添加进度条结束等
   })
 }

package/src/router/index.ts

@@ -37,16 +37,14 @@ router.beforeEach(async (to, _from, next) => {
       const userStore = useUserStore()
       if (!userStore.isLoggedIn) {
         userStore.setUserInfo({
-          id: 1,
-          username: 'admin',
-          nickname: '管理员',
-          avatar: '',
+          appId: import.meta.env.VITE_APP_ID,
+          userId: '1',
+          userName: '管理员',
+          departmentName: '技术部',
           email: 'admin@example.com',
-          phone: '13800138000',
-          status: 1,
-          roles: ['admin'],
-          permissions: ['*'],
-          createTime: new Date().toISOString()
+          mobilePhone: '13800138000',
+          positionName: '管理员',
+          avatar: ''
         })
 
         // 设置菜单

package/src/stores/auth.ts

@@ -4,7 +4,7 @@
 
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
-import { getToken, clearToken, setTokenInfo, hasToken } from '@/utils/auth'
+import { getToken, clearToken, setTokenInfo, hasToken, type TokenInfo } from '@/utils/auth'
 
 export const useAuthStore = defineStore('auth', () => {
   // 状态
@@ -17,9 +17,9 @@ export const useAuthStore = defineStore('auth', () => {
   const clientId = ref<string>('')
   const loginPath = ref<string>('/login')
 
-  // 设置 token
-  const login = (tokenInfo: { token: string; refreshToken: string; expireTime: number }) => {
-    token.value = tokenInfo.token
+  // 设置 token（参考 tineco-ui）
+  const login = (tokenInfo: TokenInfo) => {
+    token.value = tokenInfo.access_token
     setTokenInfo(tokenInfo)
   }
 

package/src/stores/menu.ts

@@ -4,77 +4,46 @@
 
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
-import type { AppRoute } from '@/types/router'
 import type { MenuItem } from '@/types/api'
 import { local } from '@/utils/storage'
-import router from '@/router'
+
+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[]>('menuList') || [])
+  const menuList = ref<MenuItem[]>(local.get<MenuItem[]>(MENU_LIST_KEY) || [])
 
   // 计算属性
   const hasMenu = computed(() => menuList.value.length > 0)
 
   // 设置菜单
   const setMenuList = (menus: MenuItem[]) => {
-    menuList.value = menus
-    local.set('menuList', menus)
+    // 添加首页菜单到开头
+    menuList.value = [indexMenu, ...menus]
+    local.set(MENU_LIST_KEY, menuList.value)
   }
 
   // 清除菜单
   const clearMenu = () => {
     menuList.value = []
-    local.remove('menuList')
-  }
-
-  // 生成路由
-  const generateRoutes = (menus: MenuItem[]): AppRoute[] => {
-    return menus
-      .filter(menu => !menu.hidden)
-      .map(menu => {
-        const route: AppRoute = {
-          path: menu.path,
-          name: menu.name,
-          meta: {
-            title: menu.title,
-            icon: menu.icon,
-            keepAlive: menu.keepAlive,
-            hidden: menu.hidden
-          }
-        }
-
-        if (menu.redirect) {
-          route.redirect = menu.redirect
-        }
-
-        if (menu.component) {
-          // 动态导入组件
-          route.component = () => import(`@/views/${menu.component}.vue`)
-        }
-
-        if (menu.children && menu.children.length > 0) {
-          route.children = generateRoutes(menu.children)
-        }
-
-        return route
-      })
-  }
-
-  // 添加路由
-  const addRoutes = (menus: MenuItem[]) => {
-    const routes = generateRoutes(menus)
-    routes.forEach(route => {
-      router.addRoute('Layout', route as any)
-    })
+    local.remove(MENU_LIST_KEY)
   }
 
   return {
     menuList,
     hasMenu,
     setMenuList,
-    clearMenu,
-    generateRoutes,
-    addRoutes
+    clearMenu
   }
 })

package/src/stores/user.ts

@@ -7,67 +7,45 @@ import { ref, computed } from 'vue'
 import type { UserInfo } from '@/types/api'
 import { local } from '@/utils/storage'
 
+const USER_INFO_KEY = 'user_info'
+
 export const useUserStore = defineStore('user', () => {
   // 状态
-  const userInfo = ref<UserInfo | null>(local.get<UserInfo>('userInfo'))
-  const roles = ref<string[]>(local.get<string[]>('roles') || [])
-  const permissions = ref<string[]>(local.get<string[]>('permissions') || [])
+  const userInfo = ref<UserInfo | null>(local.get<UserInfo>(USER_INFO_KEY))
 
   // 计算属性
   const isLoggedIn = computed(() => !!userInfo.value)
-  const username = computed(() => userInfo.value?.username || '')
-  const nickname = computed(() => userInfo.value?.nickname || '')
+  const userId = computed(() => userInfo.value?.userId || '')
+  const userName = computed(() => userInfo.value?.userName || '')
+  const departmentName = computed(() => userInfo.value?.departmentName || '')
+  const email = computed(() => userInfo.value?.email || '')
+  const mobilePhone = computed(() => userInfo.value?.mobilePhone || '')
+  const positionName = computed(() => userInfo.value?.positionName || '')
   const avatar = computed(() => userInfo.value?.avatar || '')
-  const userId = computed(() => userInfo.value?.id)
 
   // 设置用户信息
   const setUserInfo = (info: UserInfo) => {
     userInfo.value = info
-    roles.value = info.roles || []
-    permissions.value = info.permissions || []
-    local.set('userInfo', info)
-    local.set('roles', info.roles || [])
-    local.set('permissions', info.permissions || [])
+    local.set(USER_INFO_KEY, info)
   }
 
   // 清除用户信息
   const clearUserInfo = () => {
     userInfo.value = null
-    roles.value = []
-    permissions.value = []
-    local.remove('userInfo')
-    local.remove('roles')
-    local.remove('permissions')
-  }
-
-  // 检查权限
-  const hasPermission = (permission: string | string[]): boolean => {
-    if (Array.isArray(permission)) {
-      return permission.some(p => permissions.value.includes(p))
-    }
-    return permissions.value.includes(permission)
-  }
-
-  // 检查角色
-  const hasRole = (role: string | string[]): boolean => {
-    if (Array.isArray(role)) {
-      return role.some(r => roles.value.includes(r))
-    }
-    return roles.value.includes(role)
+    local.remove(USER_INFO_KEY)
   }
 
   return {
     userInfo,
-    roles,
-    permissions,
     isLoggedIn,
-    username,
-    nickname,
-    avatar,
     userId,
+    userName,
+    departmentName,
+    email,
+    mobilePhone,
+    positionName,
+    avatar,
     setUserInfo,
-    clearUserInfo,
-    hasPermission,
-    hasRole
+    clearUserInfo
   }
 })

package/src/types/api.d.ts

@@ -24,22 +24,19 @@ export interface PageResponse<T> {
   pageSize: number
 }
 
-// 用户信息
+// 用户信息（参考 tineco-ui）
 export interface UserInfo {
-  id: number | string
-  username: string
-  nickname: string
-  avatar?: string
+  appId: string
+  userId: string
+  userName: string
+  departmentName?: string
   email?: string
-  phone?: string
-  status: number
-  roles: string[]
-  permissions: string[]
-  createTime?: string
-  updateTime?: string
+  mobilePhone?: string
+  positionName?: string
+  avatar?: string
 }
 
-// 登录请求
+// 登录请求参数（参考 tineco-ui）
 export interface LoginParams {
   appId: string
   clientId: string
@@ -48,28 +45,26 @@ export interface LoginParams {
   code?: boolean
 }
 
-// 登录响应
+// 登录响应（参考 tineco-ui）
 export interface LoginResult {
-  token: string
-  refreshToken: string
-  expireTime: number
-  user: UserInfo
+  access_token: string
+  token_type: string
+  refresh_token: string
+  expires_time: number
+  refresh_time: number
+  code?: string
 }
 
-// 菜单项
+// 菜单项（参考 tineco-ui）
 export interface MenuItem {
-  id: number | string
-  name: string
-  path: string
-  component?: string
-  redirect?: string
+  menuCode: string
+  menuName: string
+  menuUrl: string
   icon?: string
-  title: string
-  hidden?: boolean
-  keepAlive?: boolean
-  affix?: boolean
-  order?: number
-  parentId?: number | string | null
+  closable?: boolean
+  isDefault?: boolean
+  isOut?: boolean
+  type?: number // 1 为按钮，其他为菜单
   children?: MenuItem[]
 }
 

package/src/utils/auth.ts

@@ -5,13 +5,19 @@
 import { local } from './storage'
 
 const TOKEN_KEY = 'token'
+const TOKEN_TYPE_KEY = 'token_type'
 const REFRESH_TOKEN_KEY = 'refresh_token'
-const TOKEN_EXPIRE_KEY = 'token_expire'
+const TOKEN_EXPIRE_KEY = 'expires_time'
+const REFRESH_TIME_KEY = 'refresh_time'
+const CODE_KEY = 'code'
 
 export interface TokenInfo {
-  token: string
-  refreshToken: string
-  expireTime: number
+  access_token: string
+  token_type: string
+  refresh_token: string
+  expires_time: number
+  refresh_time: number
+  code?: string
 }
 
 export const getToken = (): string | null => {
@@ -22,6 +28,14 @@ export const setToken = (token: string): void => {
   local.set(TOKEN_KEY, token)
 }
 
+export const getTokenType = (): string | null => {
+  return local.get<string>(TOKEN_TYPE_KEY)
+}
+
+export const setTokenType = (tokenType: string): void => {
+  local.set(TOKEN_TYPE_KEY, tokenType)
+}
+
 export const getRefreshToken = (): string | null => {
   return local.get<string>(REFRESH_TOKEN_KEY)
 }
@@ -38,16 +52,40 @@ export const setTokenExpire = (expireTime: number): void => {
   local.set(TOKEN_EXPIRE_KEY, expireTime)
 }
 
+export const getRefreshTime = (): number | null => {
+  return local.get<number>(REFRESH_TIME_KEY)
+}
+
+export const setRefreshTime = (refreshTime: number): void => {
+  local.set(REFRESH_TIME_KEY, refreshTime)
+}
+
+export const getCode = (): string | null => {
+  return local.get<string>(CODE_KEY)
+}
+
+export const setCode = (code: string): void => {
+  local.set(CODE_KEY, code)
+}
+
 export const setTokenInfo = (info: TokenInfo): void => {
-  setToken(info.token)
-  setRefreshToken(info.refreshToken)
-  setTokenExpire(info.expireTime)
+  setToken(info.access_token)
+  setTokenType(info.token_type || 'Bearer')
+  setRefreshToken(info.refresh_token)
+  setTokenExpire(info.expires_time)
+  setRefreshTime(info.refresh_time)
+  if (info.code) {
+    setCode(info.code)
+  }
 }
 
 export const clearToken = (): void => {
   local.remove(TOKEN_KEY)
+  local.remove(TOKEN_TYPE_KEY)
   local.remove(REFRESH_TOKEN_KEY)
   local.remove(TOKEN_EXPIRE_KEY)
+  local.remove(REFRESH_TIME_KEY)
+  local.remove(CODE_KEY)
 }
 
 export const isTokenExpired = (): boolean => {

package/src/utils/permission.ts

@@ -1,42 +1,33 @@
 /**
  * 权限工具函数
+ * 注意：tineco-ui 不支持 permissions 和 roles 字段，这些函数暂时返回登录状态
  */
 
 import { useUserStore } from '@/stores/user'
 
 /**
  * 检查是否有权限
- * @param permission 权限标识
+ * @param _permission 权限标识（暂不使用）
  */
-export function hasPermission(permission: string | string[]): boolean {
+export function hasPermission(_permission: string | string[]): boolean {
   const userStore = useUserStore()
-  const permissions = userStore.permissions
-
-  if (Array.isArray(permission)) {
-    return permission.some(p => permissions.includes(p))
-  }
-
-  return permissions.includes(permission)
+  // tineco-ui 不支持 permissions 字段，暂时返回已登录状态
+  return userStore.isLoggedIn
 }
 
 /**
  * 检查是否有角色
- * @param role 角色标识
+ * @param _role 角色标识（暂不使用）
  */
-export function hasRole(role: string | string[]): boolean {
+export function hasRole(_role: string | string[]): boolean {
   const userStore = useUserStore()
-  const roles = userStore.roles
-
-  if (Array.isArray(role)) {
-    return role.some(r => roles.includes(r))
-  }
-
-  return roles.includes(role)
+  // tineco-ui 不支持 roles 字段，暂时返回已登录状态
+  return userStore.isLoggedIn
 }
 
 /**
  * 检查是否是管理员
  */
 export function isAdmin(): boolean {
-  return hasRole('admin')
+  return true // tineco-ui 不支持 roles 字段，暂时返回 true
 }

package/src/utils/request.ts

@@ -3,7 +3,7 @@
  */
 
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-import { getToken, clearToken } from './auth'
+import { getToken, getTokenType, clearToken } from './auth'
 import { Message } from '@xto/feedback'
 
 // 响应数据接口（Euler 框架 Result 格式）
@@ -39,8 +39,9 @@ const createRequest = (): AxiosInstance => {
   instance.interceptors.request.use(
     (config: InternalAxiosRequestConfig) => {
       const token = getToken()
+      const tokenType = getTokenType() || 'Bearer'
       if (token) {
-        config.headers.Authorization = `Bearer ${token}`
+        config.headers.Authorization = `${tokenType} ${token}`
       }
       return config
     },
@@ -54,7 +55,7 @@ const createRequest = (): AxiosInstance => {
     (response: AxiosResponse<ApiResponse>) => {
       const { data } = response
 
-      // Euler 框架返回 Result 包装格式，成功时直接返回 data 中的实际数据
+      // Euler 框架返回 Result 包装格式，成功时直接返回 data.data 中的实际数据
       if (data.code === 200 || data.code === 0) {
         return data.data as any
       }