Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

2024-08-13 22:12:15 +08:00
parent 895b5bc8d0 3b0f72330a
commit abf863dcda
44 changed files with 150 additions and 187 deletions
--- a/packages/@core/base/typings/src/menu-record.ts
+++ b/packages/@core/base/typings/src/menu-record.ts
@@ -1,5 +1,7 @@
 import type { RouteRecordRaw } from 'vue-router';

+import type { Component } from 'vue';
+
 /**
 * 扩展路由原始对象
 */
@@ -44,7 +46,7 @@ interface MenuRecordRaw extends MenuRecordBadgeRaw {
  /**
   * 图标名
   */
-  icon?: string;
+  icon?: Component | string;
  /**
   * 菜单名
   */
--- a/packages/@core/base/typings/src/vue-router.d.ts
+++ b/packages/@core/base/typings/src/vue-router.d.ts
@@ -68,7 +68,7 @@ interface RouteMeta {
  /**
   * 图标（菜单/tab）
   */
-  icon?: string;
+  icon?: Component | string;
  /**
   * iframe 地址
   */