From 3867e536b2ebd058162813064912b28e9880fad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com> Date: Wed, 18 Jun 2025 17:18:57 +0800 Subject: [PATCH] fix: Fix menu sorting (#9172) --- core/init/migration/helper/menu.go | 2 +- core/init/migration/migrations/init.go | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/init/migration/helper/menu.go b/core/init/migration/helper/menu.go index dad26e4e3..cc92f2376 100644 --- a/core/init/migration/helper/menu.go +++ b/core/init/migration/helper/menu.go @@ -33,8 +33,8 @@ func LoadMenus() string { {ID: "76", Disabled: false, Title: "menu.ssh", IsShow: true, Label: "SSH", Path: "/hosts/ssh/ssh"}, }}, {ID: "8", Disabled: false, Title: "menu.terminal", IsShow: true, Label: "Terminal-Menu", Path: "/hosts/terminal"}, - {ID: "9", Disabled: false, Title: "menu.toolbox", IsShow: true, Label: "Toolbox-Menu", Path: "/toolbox"}, {ID: "10", Disabled: false, Title: "menu.cronjob", IsShow: true, Label: "Cronjob-Menu", Path: "/cronjobs"}, + {ID: "9", Disabled: false, Title: "menu.toolbox", IsShow: true, Label: "Toolbox-Menu", Path: "/toolbox"}, {ID: "11", Disabled: false, Title: "xpack.menu", IsShow: true, Label: "Xpack-Menu", Children: []dto.ShowMenu{ {ID: "118", Disabled: false, Title: "xpack.app.app", IsShow: true, Label: "XApp", Path: "/xpack/app"}, diff --git a/core/init/migration/migrations/init.go b/core/init/migration/migrations/init.go index 9f9d93dd1..5dac55706 100644 --- a/core/init/migration/migrations/init.go +++ b/core/init/migration/migrations/init.go @@ -416,6 +416,19 @@ var UpdateXpackHideMenu = &gormigrate.Migration{ } } + var idx9, idx10 = -1, -1 + for i, menu := range menus { + if menu.ID == "9" && menu.Path == "/toolbox" { + idx9 = i + } + if menu.ID == "10" && menu.Path == "/cronjobs" { + idx10 = i + } + } + if idx9 != -1 && idx10 != -1 && idx10 > idx9 { + menus[idx9], menus[idx10] = menus[idx10], menus[idx9] + } + for i, menu := range menus { if menu.ID == "7" { for j, child := range menu.Children {