From 7367d47d276271c3a563b820094ba9ccb1fd521d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Thu, 16 Oct 2025 17:17:16 +0800
Subject: [PATCH] feat: Optimize menu display sorting (#10666)

---
 frontend/src/components/file-list/index.vue        |  5 ++++-
 frontend/src/layout/components/Sidebar/index.vue   | 14 +++++++++++---
 .../views/host/file-management/favorite/index.vue  |  4 ++--
 frontend/src/views/host/file-management/index.vue  |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/file-list/index.vue b/frontend/src/components/file-list/index.vue
index 84c0238fd..d7d3f4753 100644
--- a/frontend/src/components/file-list/index.vue
+++ b/frontend/src/components/file-list/index.vue
@@ -51,7 +51,7 @@
                 highlight-current-row
                 height="40vh"
                 @row-click="handleRowClick"
-                class="cursor-pointer"
+                class="cursor-pointer dialog-file-list"
             >
                 <el-table-column prop="name" show-overflow-tooltip fix>
                     <template #default="{ row }">
@@ -442,4 +442,7 @@ defineExpose({
         text-overflow: ellipsis;
     }
 }
+:deep(.dialog-file-list .el-table__body tr.current-row > td.el-table__cell) {
+    background-color: var(--panel-main-bg-color-4);
+}
 </style>
diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue
index db89fb887..71e30f6fc 100644
--- a/frontend/src/layout/components/Sidebar/index.vue
+++ b/frontend/src/layout/components/Sidebar/index.vue
@@ -100,7 +100,8 @@ const search = async () => {
     });
     let rstMenuList: RouteRecordRaw[] = [];
     let resMenuList: RouteRecordRaw[] = [];
-    for (const menu of menuStore.menuList) {
+    resMenuList = adjustAndCleanMenu(hideMenu, menuStore.menuList);
+    for (const menu of resMenuList) {
         let menuItem = JSON.parse(JSON.stringify(menu));
         if (!showMap[menuItem.name]) {
             continue;
@@ -133,8 +134,7 @@ const search = async () => {
         const indexB = rootMap.get(labelB) ?? Infinity;
         return indexA - indexB;
     });
-    resMenuList = adjustAndCleanMenu(hideMenu, rstMenuList);
-    menuStore.menuList = resMenuList;
+    menuStore.menuList = rstMenuList;
 };
 
 function buildIndexMap(list: any[]): Map<string, number> {
@@ -177,7 +177,15 @@ function adjustAndCleanMenu(menuItem, list) {
             if (!matched) continue;
 
             if (Array.isArray(ref.children) && ref.children.length > 0) {
+                const childMap = buildIndexMap(ref.children || []);
                 matched.children = buildTree(ref.children);
+                matched.children.sort((a, b) => {
+                    const labelA = a.name;
+                    const labelB = b.name;
+                    const indexA = childMap.get(labelA) ?? Infinity;
+                    const indexB = childMap.get(labelB) ?? Infinity;
+                    return indexA - indexB;
+                });
             } else {
                 delete matched.children;
             }
diff --git a/frontend/src/views/host/file-management/favorite/index.vue b/frontend/src/views/host/file-management/favorite/index.vue
index 0353e165d..4e7469431 100644
--- a/frontend/src/views/host/file-management/favorite/index.vue
+++ b/frontend/src/views/host/file-management/favorite/index.vue
@@ -37,7 +37,7 @@ const req = reactive({
 });
 const open = ref(false);
 const data = ref([]);
-const em = defineEmits(['close', 'jump', 'toFavorite']);
+const em = defineEmits(['close', 'jump', 'to-favorite']);
 
 const handleClose = () => {
     open.value = false;
@@ -46,7 +46,7 @@ const handleClose = () => {
 
 const toFavorite = (row: File.Favorite) => {
     open.value = false;
-    em('toFavorite', row);
+    em('to-favorite', row);
 };
 const openDir = (url: string) => {
     open.value = false;
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index 55f8c9093..7e1f9cd49 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -642,7 +642,7 @@
         <Detail ref="detailRef" />
         <DeleteFile ref="deleteRef" @close="search" />
         <RecycleBin ref="recycleBinRef" @close="search" />
-        <Favorite ref="favoriteRef" @close="search" @jump="jump" @toFavorite="toFavorite" />
+        <Favorite ref="favoriteRef" @close="search" @jump="jump" @to-favorite="toFavorite" />
         <BatchRole ref="batchRoleRef" @close="search" />
         <VscodeOpenDialog ref="dialogVscodeOpenRef" />
         <Preview ref="previewRef" />