diff --git a/package.json b/package.json index b0e988c63..ed51c17b7 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "changeset": "pnpm exec changeset", "check": "pnpm run check:circular && pnpm run check:dep && pnpm run check:type && pnpm check:cspell", "check:circular": "vsh check-circular", - "check:cspell": "cspell lint **/*.ts **/README.md .changeset/*.md --no-progress", + "check:cspell": "cspell lint \"**/*.ts\" \"**/README.md\" \".changeset/*.md\" --no-progress", "check:dep": "vsh check-dep", "check:type": "turbo run typecheck", "clean": "node ./scripts/clean.mjs", @@ -59,7 +59,7 @@ "reinstall": "pnpm clean --del-lock && pnpm install", "test:unit": "vitest run --dom", "test:e2e": "turbo run test:e2e", - "update:deps": "npx taze -r -w", + "up te:deps": "npx taze -r -w", "version": "pnpm exec changeset version && pnpm install --no-frozen-lockfile", "catalog": "pnpx codemod pnpm/catalog" }, diff --git a/packages/@core/base/typings/src/menu-record.ts b/packages/@core/base/typings/src/menu-record.ts index 21f6ab516..8c4509957 100644 --- a/packages/@core/base/typings/src/menu-record.ts +++ b/packages/@core/base/typings/src/menu-record.ts @@ -1,6 +1,8 @@ import type { Component } from 'vue'; import type { RouteRecordRaw } from 'vue-router'; +import type { Recordable } from './helper'; + /** * 扩展路由原始对象 */ @@ -66,6 +68,10 @@ interface MenuRecordRaw extends MenuRecordBadgeRaw { * 菜单路径,唯一,可当作key */ path: string; + /** + * 菜单参数 + */ + query?: Recordable; /** * 是否显示菜单 * @default true diff --git a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue index e717c9056..a4a93949f 100644 --- a/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue +++ b/packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue @@ -306,13 +306,13 @@ const handleDragSidebar = (e: MouseEvent) => { ref="asideRef" :style="style" class="fixed left-0 top-0 h-full transition-all duration-150" + :class="theme" @mouseenter="handleMouseenter" @mouseleave="handleMouseleave" >
{ }); diff --git a/packages/@core/ui-kit/menu-ui/src/components/menu.vue b/packages/@core/ui-kit/menu-ui/src/components/menu.vue index d7894a177..acb243fc8 100644 --- a/packages/@core/ui-kit/menu-ui/src/components/menu.vue +++ b/packages/@core/ui-kit/menu-ui/src/components/menu.vue @@ -212,15 +212,15 @@ const enableScroll = computed( () => props.scrollToActive && props.mode === 'vertical' && !props.collapse, ); -const { scrollToActiveItem } = useMenuScroll(activePath, { +useMenuScroll(activePath, { enable: enableScroll, delay: 320, }); // 监听 activePath 变化,自动滚动到激活项 -watch(activePath, () => { - scrollToActiveItem(); -}); +// watch(activePath, () => { +// scrollToActiveItem(); +// }); // 默认展开菜单 function initMenu() { diff --git a/packages/@core/ui-kit/menu-ui/src/sub-menu.vue b/packages/@core/ui-kit/menu-ui/src/sub-menu.vue index e4d471fb0..f8a1d222a 100644 --- a/packages/@core/ui-kit/menu-ui/src/sub-menu.vue +++ b/packages/@core/ui-kit/menu-ui/src/sub-menu.vue @@ -41,6 +41,7 @@ const hasChildren = computed(() => { :badge-variants="menu.badgeVariants" :icon="menu.icon" :path="menu.path" + :query="menu.query" >