@befly-addon/admin 1.1.32 → 1.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.1.32",
+    "version": "1.1.33",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [
@@ -65,6 +65,6 @@
         "access": "public",
         "registry": "https://registry.npmjs.org"
     },
-    "gitHead": "0ba53d2bbdc6a7f2659ef60256cda7302fe585b0",
+    "gitHead": "cd0f2c4451d6ec5ead541735e6ee086611a5b3f4",
     "title": "管理后台"
 }

package/views/permission/menu/index.vue

@@ -44,6 +44,7 @@ import { Button as TButton, Table as TTable, Tag as TTag, MessagePlugin } from "
 import ILucideRotateCw from "~icons/lucide/rotate-cw";
 import DetailPanel from "@/components/DetailPanel.vue";
 import { $Http } from "@/plugins/http";
+import { arrayToTree } from "befly-vite/utils/arrayToTree";
 import { withDefaultColumns } from "befly-vite/utils/withDefaultColumns";
 
 definePage({
@@ -58,7 +59,7 @@ const $Data = $ref({
     tableData: [],
     loading: false,
     columns: withDefaultColumns([
-        { colKey: "name", title: "菜单名称", fixed: "left" },
+        { colKey: "name", title: "菜单名称" },
         { colKey: "id", title: "序号" },
         { colKey: "path", title: "路由路径" },
         { colKey: "icon", title: "图标" },
@@ -79,9 +80,11 @@ const $Method = {
     async apiMenuList() {
         $Data.loading = true;
         try {
-            const res = await $Http("/addon/admin/menu/list");
+            const res = await $Http("/addon/admin/menu/all");
+            const lists = Array.isArray(res?.data?.lists) ? res.data.lists : [];
+
             // 构建树形结构
-            $Data.tableData = $Method.buildTree(res.data || []);
+            $Data.tableData = arrayToTree(lists);
 
             // 自动高亮第一行
             if ($Data.tableData.length > 0) {
@@ -98,43 +101,6 @@ const $Method = {
         }
     },
 
-    // 构建树形结构
-    buildTree(list) {
-        const map = {};
-        const roots = [];
-
-        // 先创建所有节点的映射
-        for (const item of list) {
-            map[item.id] = { ...item, children: [] };
-        }
-
-        // 构建树形结构
-        for (const item of list) {
-            const node = map[item.id];
-            if (item.pid === 0) {
-                roots.push(node);
-            } else if (map[item.pid]) {
-                map[item.pid].children.push(node);
-            } else {
-                roots.push(node);
-            }
-        }
-
-        // 移除空的 children 数组
-        const removeEmptyChildren = (nodes) => {
-            for (const node of nodes) {
-                if (node.children.length === 0) {
-                    delete node.children;
-                } else {
-                    removeEmptyChildren(node.children);
-                }
-            }
-        };
-        removeEmptyChildren(roots);
-
-        return roots;
-    },
-
     // 刷新
     handleRefresh() {
         $Method.apiMenuList();

package/views/permission/role/components/menu.vue

@@ -59,9 +59,8 @@ const $Method = {
     async apiMenuAll() {
         try {
             const res = await $Http("/addon/admin/menu/all");
-            // menuAll 返回的 data 直接就是菜单数组
-            const menuList = Array.isArray(res.data) ? res.data : [];
-            $Data.menuTreeData = arrayToTree(menuList);
+            const lists = Array.isArray(res?.data?.lists) ? res.data.lists : [];
+            $Data.menuTreeData = arrayToTree(lists);
         } catch (error) {
             MessagePlugin.error("加载菜单失败");
         }