xto-fronted 0.4.90 → 0.4.91

package/src/router/layoutRoute.ts

@@ -1,60 +1,60 @@
-/**
- * 布局路由工厂函数
- */
-
-import { createRouter as vueCreateRouter, createWebHistory } from 'vue-router'
-import type { RouteRecordRaw, Router } from 'vue-router'
-import Layout from '@/components/Layout/index.vue'
-
-interface LayoutRouteOptions {
-  indexPath?: string
-}
-
-interface CreateRouterOptions {
-  base?: string
-}
-
-/**
- * 创建布局路由
- * @param children 子路由配置
- * @param options 配置选项
- * @returns 布局路由配置
- */
-export function createLayoutRoute(
-  children: RouteRecordRaw[],
-  options: LayoutRouteOptions = {}
-): RouteRecordRaw {
-  const indexPath = options.indexPath || '/dashboard'
-
-  // 添加 catch-all 路由，让404在Layout内部渲染，保持左侧菜单显示
-  const catchAllRoute: RouteRecordRaw = {
-    path: '/:pathMatch(.*)*',
-    name: 'CatchAll',
-    component: () => import('@/views/error/404.vue'),
-    meta: {
-      title: '404'
-    }
-  }
-
-  return {
-    path: '/',
-    name: 'Layout',
-    component: Layout,
-    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 Layout from '@/components/Layout/index.vue'
+
+interface LayoutRouteOptions {
+  indexPath?: string
+}
+
+interface CreateRouterOptions {
+  base?: string
+}
+
+/**
+ * 创建布局路由
+ * @param children 子路由配置
+ * @param options 配置选项
+ * @returns 布局路由配置
+ */
+export function createLayoutRoute(
+  children: RouteRecordRaw[],
+  options: LayoutRouteOptions = {}
+): RouteRecordRaw {
+  const indexPath = options.indexPath || '/dashboard'
+
+  // 添加 catch-all 路由，让404在Layout内部渲染，保持左侧菜单显示
+  const catchAllRoute: RouteRecordRaw = {
+    path: '/:pathMatch(.*)*',
+    name: 'CatchAll',
+    component: () => import('@/views/error/404.vue'),
+    meta: {
+      title: '404'
+    }
+  }
+
+  return {
+    path: '/',
+    name: 'Layout',
+    component: Layout,
+    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/menu.ts

@@ -8,6 +8,7 @@ import type { MenuItem } from '@/types/api'
 import { local } from '@/utils/storage'
 
 const MENU_LIST_KEY = 'menu_list'
+const PERMISSION_LIST_KEY = 'permission_list'
 
 // 首页菜单（参考 tineco-ui）
 const indexMenu: MenuItem = {
@@ -20,30 +21,90 @@ const indexMenu: MenuItem = {
   isOut: false
 }
 
+/**
+ * 过滤菜单项，只保留菜单（type !== 1），过滤掉功能按钮（type === 1）
+ * @param menus 原始菜单列表
+ * @returns 过滤后的菜单列表
+ */
+function filterMenus(menus: MenuItem[]): MenuItem[] {
+  return menus
+    .filter(menu => menu.type !== 1) // 过滤掉功能按钮
+    .map(menu => ({
+      ...menu,
+      children: menu.children ? filterMenus(menu.children) : undefined
+    }))
+}
+
+/**
+ * 提取所有功能权限（type === 1 的项）
+ * @param menus 原始菜单列表
+ * @returns 权限标识列表
+ */
+function extractPermissions(menus: MenuItem[]): string[] {
+  const permissions: string[] = []
+
+  function traverse(items: MenuItem[]) {
+    items.forEach(item => {
+      // type === 1 表示功能按钮
+      if (item.type === 1 && item.menuCode) {
+        permissions.push(item.menuCode)
+      }
+      // 递归处理子项
+      if (item.children) {
+        traverse(item.children)
+      }
+    })
+  }
+
+  traverse(menus)
+  return permissions
+}
+
 export const useMenuStore = defineStore('menu', () => {
   // 状态
   const menuList = ref<MenuItem[]>(local.get<MenuItem[]>(MENU_LIST_KEY) || [])
+  // 功能权限列表
+  const permissions = ref<string[]>(local.get<string[]>(PERMISSION_LIST_KEY) || [])
 
   // 计算属性
   const hasMenu = computed(() => menuList.value.length > 0)
 
-  // 设置菜单
+  // 设置菜单（会自动过滤功能项，并提取权限）
   const setMenuList = (menus: MenuItem[]) => {
+    // 提取功能权限
+    permissions.value = extractPermissions(menus)
+    local.set(PERMISSION_LIST_KEY, permissions.value)
+
+    // 过滤菜单，只保留菜单项（type !== 1）
+    const filteredMenus = filterMenus(menus)
+
     // 添加首页菜单到开头
-    menuList.value = [indexMenu, ...menus]
+    menuList.value = [indexMenu, ...filteredMenus]
     local.set(MENU_LIST_KEY, menuList.value)
   }
 
   // 清除菜单
   const clearMenu = () => {
     menuList.value = []
+    permissions.value = []
     local.remove(MENU_LIST_KEY)
+    local.remove(PERMISSION_LIST_KEY)
+  }
+
+  // 检查是否有某个权限
+  const hasPermission = (permission: string | string[]): boolean => {
+    if (Array.isArray(permission)) {
+      return permission.some(p => permissions.value.includes(p))
+    }
+    return permissions.value.includes(permission)
   }
 
   return {
     menuList,
+    permissions,
     hasMenu,
     setMenuList,
-    clearMenu
+    clearMenu,
+    hasPermission
   }
 })

package/src/types/json-bigint.d.ts

@@ -1,18 +1,18 @@
-declare module 'json-bigint' {
-  interface JSONBigintOptions {
-    storeAsString?: boolean
-    alwaysParseAsBig?: boolean
-    useNativeBigInt?: boolean
-    protoAction?: 'error' | 'ignore' | 'preserve'
-    constructorAction?: 'error' | 'ignore' | 'preserve'
-  }
-
-  interface JSONBigint {
-    parse(text: string): any
-    stringify(value: any, replacer?: any, space?: string | number): string
-  }
-
-  function JSONBig(options?: JSONBigintOptions): JSONBigint
-
-  export = JSONBig
-}
+declare module 'json-bigint' {
+  interface JSONBigintOptions {
+    storeAsString?: boolean
+    alwaysParseAsBig?: boolean
+    useNativeBigInt?: boolean
+    protoAction?: 'error' | 'ignore' | 'preserve'
+    constructorAction?: 'error' | 'ignore' | 'preserve'
+  }
+
+  interface JSONBigint {
+    parse(text: string): any
+    stringify(value: any, replacer?: any, space?: string | number): string
+  }
+
+  function JSONBig(options?: JSONBigintOptions): JSONBigint
+
+  export = JSONBig
+}

package/src/utils/permission.ts

@@ -1,18 +1,25 @@
 /**
  * 权限工具函数
- * 注意：tineco-ui 不支持 permissions 和 roles 字段，这些函数暂时返回登录状态
  */
 
+import { useMenuStore } from '@/stores/menu'
 import { useUserStore } from '@/stores/user'
 
 /**
  * 检查是否有权限
- * @param _permission 权限标识（暂不使用）
+ * @param permission 权限标识（菜单 code）
  */
-export function hasPermission(_permission: string | string[]): boolean {
+export function hasPermission(permission: string | string[]): boolean {
   const userStore = useUserStore()
-  // tineco-ui 不支持 permissions 字段，暂时返回已登录状态
-  return userStore.isLoggedIn
+  const menuStore = useMenuStore()
+
+  // 未登录则无权限
+  if (!userStore.isLoggedIn) {
+    return false
+  }
+
+  // 使用菜单 store 中的权限判断
+  return menuStore.hasPermission(permission)
 }
 
 /**