From 4a0ffdd0f0fb628c00559265c7dcdf947678dc10 Mon Sep 17 00:00:00 2001
From: Hooray <304327508@qq.com>
Date: Mon, 10 Mar 2025 21:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/item.vue | 13 ++++---------
 src/layouts/components/Menu/sub.vue  | 11 +----------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/layouts/components/Menu/item.vue b/src/layouts/components/Menu/item.vue
index 3a2236be..b83bbeec 100644
--- a/src/layouts/components/Menu/item.vue
+++ b/src/layouts/components/Menu/item.vue
@@ -29,13 +29,6 @@ const isItemActive = computed(() => {
   return isActived.value && (!props.subMenu || rootMenu.isMenuPopup)
 })
 
-// 缩进样式
-const indentStyle = computed(() => {
-  return !rootMenu.isMenuPopup
-    ? `padding-left: ${20 * (props.level ?? 0)}px`
-    : ''
-})
-
 defineExpose({
   ref: itemRef,
 })
@@ -68,11 +61,13 @@ defineExpose({
           }"
         >
           <div
-            class="inline-flex flex-1 items-center justify-center gap-[12px]" :class="{
+            class="inline-flex flex-1 items-center justify-center gap-[12px] pl-[calc(var(--indent-level)*20px)]" :class="{
               'flex-col': rootMenu.isMenuPopup && level === 0 && rootMenu.props.mode === 'vertical',
               'gap-1!': rootMenu.isMenuPopup && level === 0 && rootMenu.props.showCollapseName,
               'w-full': rootMenu.isMenuPopup && level === 0 && rootMenu.props.showCollapseName && rootMenu.props.mode === 'vertical',
-            }" :style="indentStyle"
+            }" :style="{
+              '--indent-level': !rootMenu.isMenuPopup ? props.level ?? 0 : 0,
+            }"
           >
             <FaIcon v-if="props.item.meta?.icon" :name="props.item.meta.icon" class="menu-item-container-icon size-5 transition-transform group-hover-scale-120" />
             <span
diff --git a/src/layouts/components/Menu/sub.vue b/src/layouts/components/Menu/sub.vue
index 77958400..b76696ea 100644
--- a/src/layouts/components/Menu/sub.vue
+++ b/src/layouts/components/Menu/sub.vue
@@ -102,16 +102,7 @@ const transitionClass = computed(() => {
 })
 
 const hasChildren = computed(() => {
-  let flag = true
-  if (props.menu.children) {
-    if (props.menu.children.every((item: any) => item.meta?.menu === false)) {
-      flag = false
-    }
-  }
-  else {
-    flag = false
-  }
-  return flag
+  return props.menu.children?.some((item: any) => item.meta?.menu !== false) ?? false
 })
 
 function handleClick() {