From a3ca41aa1a7352452e6fbfbfdf5cd9c0031c77f7 Mon Sep 17 00:00:00 2001 From: btea <2356281422@qq.com> Date: Wed, 12 Feb 2025 12:36:47 +0800 Subject: [PATCH] refactor: [menu] add necessary braces (#19840) --- packages/components/menu/src/sub-menu.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/components/menu/src/sub-menu.ts b/packages/components/menu/src/sub-menu.ts index f9aad11b5e..b65eb96061 100644 --- a/packages/components/menu/src/sub-menu.ts +++ b/packages/components/menu/src/sub-menu.ts @@ -177,10 +177,10 @@ export default defineComponent({ ] ) const opened = computed(() => rootMenu.openedMenus.includes(props.index)) - const active = computed( - () => - Object.values(items.value).some(({ active }) => active) || - Object.values(subMenus.value).some(({ active }) => active) + const active = computed(() => + [...Object.values(items.value), ...Object.values(subMenus.value)].some( + ({ active }) => active + ) ) const mode = computed(() => rootMenu.props.mode) @@ -212,7 +212,11 @@ export default defineComponent({ const doDestroy = () => vPopper.value?.popperRef?.popperInstanceRef?.destroy() - const handleCollapseToggle = (value: boolean) => !value && doDestroy() + const handleCollapseToggle = (value: boolean) => { + if (!value) { + doDestroy() + } + } const handleClick = () => { if (