diff --git a/.changeset/fancy-ears-walk.md b/.changeset/fancy-ears-walk.md index 38b077f35..f73cb596b 100644 --- a/.changeset/fancy-ears-walk.md +++ b/.changeset/fancy-ears-walk.md @@ -1,7 +1,7 @@ --- -"@vben/styles": patch -"@vben-core/form-ui": patch -"@vben/web-naive": patch +'@vben/styles': patch +'@vben-core/form-ui': patch +'@vben/web-naive': patch --- feat(@core/form-ui): 新增 useVbenForm 数组编辑器 VbenFormFieldArray diff --git a/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue b/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue index e9236aaf4..017026423 100644 --- a/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue +++ b/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue @@ -37,7 +37,7 @@ const menuIcon = computed(() => const isHttp = computed(() => isHttpUrl(item.parentPaths.at(-1))); const isTopLevelMenuItem = computed( - () => parentMenu.value?.type.name === 'Menu', + () => parentMenu.value?.type.name === 'MenuUI', ); const collapseShowTitle = computed( diff --git a/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue b/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue index 5c8c8a860..afc0afa16 100644 --- a/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue +++ b/packages/@core/ui-kit/menu-ui/src/components/sub-menu.vue @@ -54,7 +54,7 @@ const opened = computed(() => { return rootMenu?.openedMenus.includes(props.path); }); const isTopLevelMenuSubmenu = computed( - () => parentMenu.value?.type.name === 'Menu', + () => parentMenu.value?.type.name === 'MenuUI', ); const mode = computed(() => rootMenu?.props.mode ?? 'vertical'); const rounded = computed(() => rootMenu?.props.rounded); diff --git a/packages/@core/ui-kit/menu-ui/src/hooks/use-menu-context.ts b/packages/@core/ui-kit/menu-ui/src/hooks/use-menu-context.ts index 357b296b9..1e3955dcd 100644 --- a/packages/@core/ui-kit/menu-ui/src/hooks/use-menu-context.ts +++ b/packages/@core/ui-kit/menu-ui/src/hooks/use-menu-context.ts @@ -42,7 +42,7 @@ function useSubMenuContext() { if (!instance) { throw new Error('instance is required'); } - const parentMenu = findComponentUpward(instance, ['Menu', 'SubMenu']); + const parentMenu = findComponentUpward(instance, ['MenuUI', 'SubMenu']); const subMenu = inject(`subMenu:${parentMenu?.uid}`) as SubMenuProvider; return subMenu; } diff --git a/packages/@core/ui-kit/menu-ui/src/hooks/use-menu.ts b/packages/@core/ui-kit/menu-ui/src/hooks/use-menu.ts index 9207445f9..0ee93fd9a 100644 --- a/packages/@core/ui-kit/menu-ui/src/hooks/use-menu.ts +++ b/packages/@core/ui-kit/menu-ui/src/hooks/use-menu.ts @@ -16,7 +16,7 @@ function useMenu() { const parentPaths = computed(() => { let parent = instance.parent; const paths: string[] = [instance.props.path as string]; - while (parent?.type.name !== 'Menu') { + while (parent?.type.name !== 'MenuUI') { if (parent?.props.path) { paths.unshift(parent.props.path as string); } @@ -27,7 +27,7 @@ function useMenu() { }); const parentMenu = computed(() => { - return findComponentUpward(instance, ['Menu', 'SubMenu']); + return findComponentUpward(instance, ['MenuUI', 'SubMenu']); }); return {