From af2e417adb25519ba7a492890240b745f130b186 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Sat, 27 Jul 2024 14:46:13 +0800
Subject: [PATCH] 1

---
 src/App.vue                             | 3 ++-
 src/components/ServiceConfiguration.vue | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b55ac20..2d43dbf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -37,8 +37,9 @@ async function mounted() {
     let client = ApiClient.getClient();
     let services = await client.call('service-config/service-list');
     for ( let item of services ) {
-        menuItems.value.push({id:item.key, key:item.key, label:item.name});
+        menuItems.value.push({id:item.key, key:item.key, label:item.name, order:item.order});
     }
+    menuItems.value.sort((a,b) => a.order - b.order);
 }
 
 // handle menu item click
diff --git a/src/components/ServiceConfiguration.vue b/src/components/ServiceConfiguration.vue
index ecabf6d..2668133 100644
--- a/src/components/ServiceConfiguration.vue
+++ b/src/components/ServiceConfiguration.vue
@@ -185,9 +185,9 @@ async function serviceActionReload() {
                 group.order = item.groupOrder;
             }
             group.items.push(item);
-            group.items.sort((a,b) => b.order - a.order || a.params.length - b.params.length);
+            group.items.sort((a,b) => a.order - b.order || a.params.length - b.params.length);
         }
-        actions.value.sort((a,b) => b.order - a.order || b.items.length - a.items.length || a.name.localeCompare(b.name));
+        actions.value.sort((a,b) => a.order - b.order || b.items.length - a.items.length || a.name.localeCompare(b.name));
     } catch ( e ) {/** nothing to do here */}
 }