@befly-addon/admin 1.1.13 → 1.1.16

package/apis/admin/cacheRefresh.ts

@@ -32,8 +32,8 @@ export default {
                     orderBy: ['addonName#ASC', 'path#ASC']
                 });
 
-                await befly.redis.setObject(RedisKeys.apisAll(), apis);
-                results.apis = { success: true, count: apis.length };
+                await befly.redis.setObject(RedisKeys.apisAll(), apis.lists);
+                results.apis = { success: true, count: apis.lists.length };
             } catch (error: any) {
                 befly.logger.error({ err: error }, '刷新接口缓存失败');
                 results.apis = { success: false, error: error.message };
@@ -47,14 +47,14 @@ export default {
                     orderBy: ['sort#ASC', 'id#ASC']
                 });
 
-                await befly.redis.setObject(RedisKeys.menusAll(), menus);
+                await befly.redis.setObject(RedisKeys.menusAll(), menus.lists);
 
-                const parentCount = menus.filter((m: any) => m.pid === 0).length;
-                const childCount = menus.filter((m: any) => m.pid !== 0).length;
+                const parentCount = menus.lists.filter((m: any) => m.pid === 0).length;
+                const childCount = menus.lists.filter((m: any) => m.pid !== 0).length;
 
                 results.menus = {
                     success: true,
-                    count: menus.length,
+                    count: menus.lists.length,
                     parentCount: parentCount,
                     childCount: childCount
                 };
@@ -67,19 +67,18 @@ export default {
             try {
                 const roles = await befly.db.getAll({
                     table: 'addon_admin_role',
-                    fields: ['id', 'name', 'code', 'apis', 'menus'],
-                    orderBy: ['id#ASC']
+                    fields: ['id', 'name', 'code', 'menus', 'apis']
                 });
 
-                // 使用 setBatch 批量缓存所有角色（利用 Bun Redis auto-pipeline）
-                await befly.redis.setBatch(
-                    roles.map((role: any) => ({
+                // 使用 setBatch 批量缓存所有角色
+                const count = await befly.redis.setBatch(
+                    roles.lists.map((role: any) => ({
                         key: RedisKeys.roleInfo(role.code),
                         value: role
                     }))
                 );
 
-                results.roles = { success: true, count: roles.length };
+                results.roles = { success: true, count: count };
             } catch (error: any) {
                 befly.logger.error({ err: error }, '刷新角色缓存失败');
                 results.roles = { success: false, error: error.message };

package/apis/api/all.ts

@@ -7,11 +7,12 @@
 
             // 如果缓存不存在，从数据库查询
             if (allApis.length === 0) {
-                allApis = await befly.db.getAll({
+                const result = await befly.db.getAll({
                     table: 'addon_admin_api',
                     fields: ['id', 'name', 'path', 'method', 'description', 'addonName', 'addonTitle'],
                     orderBy: ['addonName#ASC', 'path#ASC']
                 });
+                allApis = result.lists;
             }
 
             return befly.tool.Yes('操作成功', { lists: allApis });

package/apis/dict/all.ts

@@ -1,20 +1,12 @@
 export default {
     name: '获取所有字典',
-    handler: async (befly, ctx) => {
-        try {
-            const dicts = await befly.db.getAll({
-                table: 'addon_admin_dict',
-                fields: ['id', 'name', 'code', 'value', 'sort', 'pid', 'description', 'state', 'created_at', 'updated_at'],
-                orderBy: [
-                    { field: 'sort', direction: 'ASC' },
-                    { field: 'id', direction: 'ASC' }
-                ]
-            });
+    handler: async (befly) => {
+        const dicts = await befly.db.getAll({
+            table: 'addon_admin_dict',
+            fields: ['id', 'code', 'name', 'value'],
+            orderBy: ['id#ASC']
+        });
 
-            return befly.tool.Yes('操作成功', dicts);
-        } catch (error) {
-            befly.logger.error({ err: error }, '获取所有字典失败');
-            return befly.tool.No('操作失败');
-        }
+        return befly.tool.Yes('操作成功', { lists: dicts.lists });
     }
 };

package/apis/menu/all.ts

@@ -18,7 +18,7 @@ export default {
             });
 
             if (!role) {
-                return befly.tool.No('角色不存在', []);
+                return befly.tool.No('角色不存在', { lists: [] });
             }
 
             // 3. 解析菜单ID列表（逗号分隔的字符串）
@@ -28,7 +28,7 @@ export default {
                 .filter((id: number) => !isNaN(id));
 
             if (menuIds.length === 0) {
-                return befly.tool.Yes('菜单为空', []);
+                return befly.tool.Yes('菜单为空', { lists: [] });
             }
 
             // 4. 从缓存获取所有菜单
@@ -36,15 +36,16 @@ export default {
 
             // 如果缓存不存在，从数据库查询
             if (allMenus.length === 0) {
-                allMenus = await befly.db.getAll({
+                const result = await befly.db.getAll({
                     table: 'addon_admin_menu',
-                    fields: ['id', 'pid', 'name', 'path', 'icon', 'sort'],
+                    fields: ['id', 'pid', 'name', 'path', 'sort'],
                     orderBy: ['sort#ASC', 'id#ASC']
                 });
+                allMenus = result.lists;
             }
 
             if (allMenus.length === 0) {
-                return befly.tool.Yes('菜单为空', []);
+                return befly.tool.Yes('菜单为空', { lists: [] });
             }
 
             // 5. 根据角色权限过滤菜单
@@ -52,7 +53,7 @@ export default {
             const authorizedMenus = allMenus.filter((menu: any) => menuIdSet.has(String(menu.id)));
 
             // 6. 返回一维数组（由前端构建树形结构）
-            return befly.tool.Yes('获取菜单成功', authorizedMenus);
+            return befly.tool.Yes('获取菜单成功', { lists: authorizedMenus });
         } catch (error: any) {
             befly.logger.error({ err: error }, '获取用户菜单失败');
             return befly.tool.No('获取菜单失败');

package/apis/menu/list.ts

@@ -10,11 +10,11 @@
         try {
             const menus = await befly.db.getAll({
                 table: 'addon_admin_menu',
-                fields: ['id', 'name', 'path', 'icon', 'sort', 'pid', 'state', 'created_at', 'updated_at'],
+                fields: ['*'],
                 orderBy: ['sort#ASC', 'id#ASC']
             });
 
-            return befly.tool.Yes('操作成功', menus);
+            return befly.tool.Yes('操作成功', { lists: menus.lists });
         } catch (error) {
             befly.logger.error({ err: error }, '获取菜单列表失败');
             return befly.tool.No('操作失败');

package/apis/role/all.ts

@@ -11,6 +11,6 @@
             orderBy: ['sort#ASC', 'id#ASC']
         });
 
-        return befly.tool.Yes('操作成功', roles);
+        return befly.tool.Yes('操作成功', { lists: roles.lists, total: roles.total });
     }
 };

package/apis/sysConfig/all.ts

@@ -1,12 +1,12 @@
 export default {
-    name: '获取全部系统配置',
+    name: '获取所有系统配置',
     handler: async (befly, ctx) => {
         const result = await befly.db.getAll({
             table: 'addon_admin_sys_config',
-            fields: ['id', 'name', 'code', 'value', 'valueType', 'group', 'sort', 'isSystem', 'description'],
-            orderBy: ['group#ASC', 'sort#ASC', 'id#ASC']
+            fields: ['*'],
+            orderBy: ['id#ASC']
         });
 
-        return befly.tool.Yes('操作成功', result);
+        return befly.tool.Yes('操作成功', { lists: result.lists });
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.1.13",
+    "version": "1.1.16",
     "title": "管理后台",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
@@ -44,9 +44,9 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "b589687f38d5057f1dd06602e823be2afe59e433",
+    "gitHead": "752a66ec3d1b092c333b501fb40f8421809899c5",
     "dependencies": {
-        "befly": "^3.9.25",
+        "befly": "^3.9.27",
         "befly-shared": "^1.2.3",
         "nodemailer": "^7.0.11",
         "ua-parser-js": "^2.0.7"