Merge remote-tracking branch 'yudao/dev' into dev

2025-04-29 15:45:48 +08:00
parent 16140848b1 6794f1a7f7
commit ab60f8eb3a
189 changed files with 2174 additions and 1516 deletions
--- a/packages/@core/ui-kit/menu-ui/src/components/sub-menu-content.vue
+++ b/packages/@core/ui-kit/menu-ui/src/components/sub-menu-content.vue
@@ -10,7 +10,7 @@ import { VbenIcon } from '@vben-core/shadcn-ui';
 import { useMenuContext } from '../hooks';

 interface Props extends MenuItemProps {
-  isMenuMore: boolean;
+  isMenuMore?: boolean;
  isTopLevelMenuSubmenu: boolean;
  level?: number;
 }