修改后台菜单逻辑，默认显示用户全部可见菜单

2026-06-26 09:09:33 +08:00
parent 9f8aca5f0d
commit 4efb360b93
4 changed files with 80 additions and 41 deletions
@@ -485,8 +485,16 @@ const AppLayout: React.FC = () => {
            };

            // Render groups with children
-            groups.sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0)).forEach(g => {
-              const children = (childMap[g.id] || []).sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0));
+            groups.sort((a, b) => {
+              const orderA = a.sortOrder !== undefined ? a.sortOrder : Infinity;
+              const orderB = b.sortOrder !== undefined ? b.sortOrder : Infinity;
+              return orderA - orderB;
+            }).forEach(g => {
+              const children = (childMap[g.id] || []).sort((a, b) => {
+                const orderA = a.sortOrder !== undefined ? a.sortOrder : Infinity;
+                const orderB = b.sortOrder !== undefined ? b.sortOrder : Infinity;
+                return orderA - orderB;
+              });
              items.push(
                <div key={g.id}>
                  <div style={{
@@ -501,7 +509,11 @@ const AppLayout: React.FC = () => {
            });

            // Render top-level pages
-            topLevel.sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0)).forEach(m => {
+            topLevel.sort((a, b) => {
+              const orderA = a.sortOrder !== undefined ? a.sortOrder : Infinity;
+              const orderB = b.sortOrder !== undefined ? b.sortOrder : Infinity;
+              return orderA - orderB;
+            }).forEach(m => {
              items.push(renderMenuItem(m));
            });