From 862ac250574e8da3c3746b28b3d1e453e965db49 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Sat, 10 May 2025 23:12:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/custom/menu-tree.vue | 21 ++++++++++++++++++---
 src/views/monitor/online/index.vue  |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/custom/menu-tree.vue b/src/components/custom/menu-tree.vue
index 7368cad3..c55e34e5 100644
--- a/src/components/custom/menu-tree.vue
+++ b/src/components/custom/menu-tree.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { onMounted, ref, useAttrs } from 'vue';
+import { onMounted, ref, useAttrs, watch } from 'vue';
 import type { TreeOption, TreeSelectInst, TreeSelectProps } from 'naive-ui';
 import { useBoolean } from '@sa/hooks';
 import { fetchGetMenuTreeSelect } from '@/service/api/system';
@@ -40,6 +40,7 @@ async function getMenuList() {
       children: data
     }
   ] as Api.System.MenuList;
+  // 折叠到只显示根节点
   loading.value = false;
 }
 
@@ -49,6 +50,21 @@ onMounted(() => {
   }
 });
 
+// 添加 watch 监听 expandAll 的变化,options有值后，计算expandedKeys
+watch(
+  [expandAll, options],
+  ([newVal]) => {
+    if (newVal) {
+      // 展开所有节点
+      expandedKeys.value = getAllMenuIds(options.value);
+    } else {
+      // 折叠到只显示根节点
+      expandedKeys.value = [0];
+    }
+  },
+  { immediate: true }
+);
+
 function renderPrefix({ option }: { option: TreeOption }) {
   const renderLocalIcon = String(option.icon).startsWith('icon-');
   let icon = renderLocalIcon ? undefined : String(option.icon ?? 'material-symbols:buttons-alt-outline-rounded');
@@ -62,7 +78,7 @@ function renderPrefix({ option }: { option: TreeOption }) {
 function getAllMenuIds(menu: Api.System.MenuList) {
   const menuIds: CommonType.IdType[] = [];
   menu.forEach(item => {
-    menuIds.push(item.menuId);
+    menuIds.push(item.id!);
     if (item.children) {
       menuIds.push(...getAllMenuIds(item.children));
     }
@@ -123,7 +139,6 @@ defineExpose({
         :loading="loading"
         virtual-scroll
         check-strategy="all"
-        :default-expand-all="expandAll"
         :render-prefix="renderPrefix"
         v-bind="attrs"
       />
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 4ddd8f43..80b3f7e1 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -116,7 +116,7 @@ const { columns, columnChecks, data, getData, loading, searchParams, resetSearch
             <ButtonIcon
               text
               type="error"
-              icon="material-symbols:person-remove-outline-rounded"
+              icon="material-symbols:delete-outline"
               class="text-20px"
               tooltipContent="强制下线"
               popconfirmContent="确认强制下线吗？"