@befly-addon/admin 1.1.29 → 1.1.30

package/apis/dict/upd.ts

@@ -2,29 +2,63 @@
 
 export default {
     name: '更新字典',
-    fields: adminDictTable,
+    fields: {
+        ...adminDictTable,
+        '@id': true
+    },
+    required: ['id'],
     handler: async (befly, ctx) => {
-        try {
-            await befly.db.updData({
+        const { id, typeCode, key, label, sort, remark } = ctx.body;
+
+        // 如果更新了 typeCode，验证其是否存在
+        if (typeCode) {
+            const dictType = await befly.db.getOne({
+                table: 'addon_admin_dict_type',
+                where: { code: typeCode }
+            });
+
+            if (!dictType?.id) {
+                return befly.tool.No('字典类型不存在');
+            }
+        }
+
+        // 如果更新了 typeCode 或 key，检查唯一性
+        if (typeCode || key) {
+            const current = await befly.db.getOne({
+                table: 'addon_admin_dict',
+                where: { id: id }
+            });
+
+            const checkTypeCode = typeCode || current?.typeCode;
+            const checkKey = key || current?.key;
+
+            const existing = await befly.db.getOne({
                 table: 'addon_admin_dict',
-                data: {
-                    name: ctx.body.name,
-                    code: ctx.body.code,
-                    value: ctx.body.value,
-                    sort: ctx.body.sort,
-                    pid: ctx.body.pid,
-                    description: ctx.body.description,
-                    state: ctx.body.state
-                },
                 where: {
-                    id: ctx.body.id
+                    typeCode: checkTypeCode,
+                    key: checkKey,
+                    id$ne: id
                 }
             });
 
-            return befly.tool.Yes('操作成功');
-        } catch (error) {
-            befly.logger.error({ err: error }, '更新字典失败');
-            return befly.tool.No('操作失败');
+            if (existing?.id) {
+                return befly.tool.No('该类型下已存在相同的键名');
+            }
         }
+
+        const updateData: Record<string, any> = {};
+        if (typeCode !== undefined) updateData.typeCode = typeCode;
+        if (key !== undefined) updateData.key = key;
+        if (label !== undefined) updateData.label = label;
+        if (sort !== undefined) updateData.sort = sort;
+        if (remark !== undefined) updateData.remark = remark;
+
+        await befly.db.updData({
+            table: 'addon_admin_dict',
+            data: updateData,
+            where: { id: id }
+        });
+
+        return befly.tool.Yes('更新成功');
     }
 };

package/apis/dictType/all.ts

@@ -0,0 +1,11 @@
+export default {
+    name: '获取所有字典类型',
+    handler: async (befly, ctx) => {
+        const result = await befly.db.getAll({
+            table: 'addon_admin_dict_type',
+            orderBy: ['sort#ASC', 'id#ASC']
+        });
+
+        return befly.tool.Yes('操作成功', { lists: result.lists });
+    }
+};

package/apis/dictType/del.ts

@@ -0,0 +1,32 @@
+export default {
+    name: '删除字典类型',
+    fields: { '@id': true },
+    required: ['id'],
+    handler: async (befly, ctx) => {
+        const { id } = ctx.body;
+
+        // 检查是否有字典项引用此类型
+        const dictItems = await befly.db.getOne({
+            table: 'addon_admin_dict',
+            where: {
+                typeCode: (
+                    await befly.db.getOne({
+                        table: 'addon_admin_dict_type',
+                        where: { id: id }
+                    })
+                )?.code
+            }
+        });
+
+        if (dictItems?.id) {
+            return befly.tool.No('该类型下存在字典项，无法删除');
+        }
+
+        await befly.db.delData({
+            table: 'addon_admin_dict_type',
+            where: { id: id }
+        });
+
+        return befly.tool.Yes('删除成功');
+    }
+};

package/apis/dictType/detail.ts

@@ -0,0 +1,17 @@
+export default {
+    name: '字典类型详情',
+    fields: { '@id': true },
+    required: ['id'],
+    handler: async (befly, ctx) => {
+        const detail = await befly.db.getDetail({
+            table: 'addon_admin_dict_type',
+            where: { id: ctx.body.id }
+        });
+
+        if (!detail?.id) {
+            return befly.tool.No('字典类型不存在');
+        }
+
+        return befly.tool.Yes('获取成功', detail);
+    }
+};

package/apis/dictType/ins.ts

@@ -0,0 +1,30 @@
+import dictTypeTable from '../../tables/dictType.json';
+
+export default {
+    name: '添加字典类型',
+    fields: dictTypeTable,
+    required: ['code', 'name'],
+    handler: async (befly, ctx) => {
+        // 检查代码是否已存在
+        const existing = await befly.db.getOne({
+            table: 'addon_admin_dict_type',
+            where: { code: ctx.body.code }
+        });
+
+        if (existing?.id) {
+            return befly.tool.No('类型代码已存在');
+        }
+
+        const typeId = await befly.db.insData({
+            table: 'addon_admin_dict_type',
+            data: {
+                code: ctx.body.code,
+                name: ctx.body.name,
+                description: ctx.body.description,
+                sort: ctx.body.sort
+            }
+        });
+
+        return befly.tool.Yes('添加成功', { id: typeId });
+    }
+};

package/apis/dictType/list.ts

@@ -0,0 +1,24 @@
+import dictTypeTable from '../../tables/dictType.json';
+
+export default {
+    name: '获取字典类型列表',
+    fields: {
+        page: '@page',
+        limit: '@limit',
+        keyword: '@keyword',
+        state: '@state'
+    },
+    handler: async (befly, ctx) => {
+        const result = await befly.db.getList({
+            table: 'addon_admin_dict_type',
+            where: {
+                name$like: ctx.body.keyword ? `%${ctx.body.keyword}%` : undefined
+            },
+            orderBy: ['sort#ASC', 'id#ASC'],
+            page: ctx.body.page,
+            limit: ctx.body.limit
+        });
+
+        return befly.tool.Yes('操作成功', result);
+    }
+};

package/apis/dictType/upd.ts

@@ -0,0 +1,42 @@
+import dictTypeTable from '../../tables/dictType.json';
+
+export default {
+    name: '更新字典类型',
+    fields: {
+        ...dictTypeTable,
+        '@id': true
+    },
+    required: ['id'],
+    handler: async (befly, ctx) => {
+        const { id, code, name, description, sort } = ctx.body;
+
+        // 如果更新了 code，需要检查是否已被使用
+        if (code) {
+            const existing = await befly.db.getOne({
+                table: 'addon_admin_dict_type',
+                where: {
+                    code: code,
+                    id$ne: id
+                }
+            });
+
+            if (existing?.id) {
+                return befly.tool.No('类型代码已被使用');
+            }
+        }
+
+        const updateData: Record<string, any> = {};
+        if (code !== undefined) updateData.code = code;
+        if (name !== undefined) updateData.name = name;
+        if (description !== undefined) updateData.description = description;
+        if (sort !== undefined) updateData.sort = sort;
+
+        await befly.db.updData({
+            table: 'addon_admin_dict_type',
+            data: updateData,
+            where: { id: id }
+        });
+
+        return befly.tool.Yes('更新成功');
+    }
+};

package/apis/email/logList.ts

@@ -9,8 +9,8 @@ export default {
     handler: async (befly, ctx) => {
         const result = await befly.db.getList({
             table: 'addon_admin_email_log',
-            page: ctx.body.page || 1,
-            limit: ctx.body.limit || 30,
+            page: ctx.body.page,
+            limit: ctx.body.limit,
             orderBy: ['sendTime#DESC']
         });
 

package/apis/loginLog/list.ts

@@ -9,8 +9,8 @@ export default {
     handler: async (befly, ctx) => {
         const result = await befly.db.getList({
             table: 'addon_admin_login_log',
-            page: ctx.body.page || 1,
-            limit: ctx.body.limit || 30,
+            page: ctx.body.page,
+            limit: ctx.body.limit,
             orderBy: ['loginTime#DESC']
         });
 

package/apis/menu/all.ts

@@ -17,7 +17,7 @@ export default {
                 where: { code: ctx.user.roleCode }
             });
 
-            if (!role) {
+            if (!role?.id) {
                 return befly.tool.No('角色不存在', { lists: [] });
             }
 
@@ -38,7 +38,6 @@ export default {
             if (allMenus.length === 0) {
                 const result = await befly.db.getAll({
                     table: 'addon_admin_menu',
-                    fields: ['id', 'pid', 'name', 'path', 'sort'],
                     orderBy: ['sort#ASC', 'id#ASC']
                 });
                 allMenus = result.lists;

package/apis/menu/list.ts

@@ -10,7 +10,6 @@
         try {
             const menus = await befly.db.getAll({
                 table: 'addon_admin_menu',
-                fields: ['*'],
                 orderBy: ['sort#ASC', 'id#ASC']
             });
 

package/apis/operateLog/list.ts

@@ -9,8 +9,8 @@ export default {
     handler: async (befly, ctx) => {
         const result = await befly.db.getList({
             table: 'addon_admin_operate_log',
-            page: ctx.body.page || 1,
-            limit: ctx.body.limit || 30,
+            page: ctx.body.page,
+            limit: ctx.body.limit,
             orderBy: ['operateTime#DESC']
         });
 

package/apis/role/apiSave.ts

@@ -3,16 +3,17 @@
 export default {
     name: '保存角色接口权限',
     fields: {
+        roleCode: adminRoleTable.code,
         apiIds: adminRoleTable.apis
     },
     handler: async (befly, ctx) => {
         // 查询角色是否存在
         const role = await befly.db.getOne({
             table: 'addon_admin_role',
-            where: { id: ctx.body.roleId }
+            where: { code: ctx.body.roleCode }
         });
 
-        if (!role) {
+        if (!role?.id) {
             return befly.tool.No('角色不存在');
         }
 
@@ -22,7 +23,7 @@ export default {
         // 更新角色的接口权限
         await befly.db.updData({
             table: 'addon_admin_role',
-            where: { id: ctx.body.roleId },
+            where: { code: ctx.body.roleCode },
             data: {
                 apis: apiIdsStr
             }

package/apis/role/{apiDetail.ts → apis.ts}

@@ -1,13 +1,18 @@
-export default {
+import adminRoleTable from '../../tables/role.json';
+
+export default {
     name: '获取角色接口权限',
+    fields: {
+        roleCode: adminRoleTable.code
+    },
     handler: async (befly, ctx) => {
         // 查询角色信息
         const role = await befly.db.getOne({
             table: 'addon_admin_role',
-            where: { id: ctx.body.roleId }
+            where: { code: ctx.body.roleCode }
         });
 
-        if (!role) {
+        if (!role?.id) {
             return befly.tool.No('角色不存在');
         }
 

package/apis/role/del.ts

@@ -6,21 +6,31 @@
     handler: async (befly, ctx) => {
         try {
             // 检查是否有用户使用此角色（使用 getList 代替 getAll）
+            const role = await befly.db.getOne({
+                table: 'addon_admin_role',
+                where: { id: ctx.body.id },
+                fields: ['code']
+            });
+
+            if (!role?.code) {
+                return befly.tool.No('角色不存在');
+            }
+
+            // 禁止删除系统角色
+            const systemRoles = ['dev', 'user', 'admin', 'guest'];
+            if (systemRoles.includes(role.code)) {
+                return befly.tool.No(`系统角色 [${role.code}] 不允许删除`);
+            }
+
             const adminList = await befly.db.getList({
                 table: 'addon_admin_admin',
-                where: { roleId: ctx.body.id }
+                where: { roleCode: role.code }
             });
 
             if (adminList.total > 0) {
                 return befly.tool.No('该角色已分配给用户，无法删除');
             }
 
-            // 获取角色信息（用于删除缓存）
-            const role = await befly.db.getDetail({
-                table: 'addon_admin_role',
-                where: { id: ctx.body.id }
-            });
-
             // 删除角色
             await befly.db.delData({
                 table: 'addon_admin_role',
@@ -28,9 +38,7 @@
             });
 
             // 删除角色权限缓存
-            if (role?.code) {
-                await befly.cache.deleteRolePermissions(befly, role.code);
-            }
+            await befly.cache.deleteRolePermissions(befly, role.code);
 
             return befly.tool.Yes('操作成功');
         } catch (error: any) {

package/apis/role/detail.ts

@@ -13,7 +13,6 @@
         }
 
         return befly.tool.Yes('操作成功', {
-            roleId: ctx.body.id,
             roleCode: ctx.body.id,
             role: roleInfo
         });

package/apis/role/menuSave.ts

@@ -3,16 +3,17 @@
 export default {
     name: '保存角色菜单权限',
     fields: {
+        roleCode: adminRoleTable.code,
         menuIds: adminRoleTable.menus
     },
     handler: async (befly, ctx) => {
         // 查询角色是否存在
         const role = await befly.db.getOne({
             table: 'addon_admin_role',
-            where: { id: ctx.body.roleId }
+            where: { code: ctx.body.roleCode }
         });
 
-        if (!role) {
+        if (!role?.id) {
             return befly.tool.No('角色不存在');
         }
 
@@ -22,7 +23,7 @@ export default {
         // 更新角色的菜单权限
         await befly.db.updData({
             table: 'addon_admin_role',
-            where: { id: ctx.body.roleId },
+            where: { code: ctx.body.roleCode },
             data: {
                 menus: menuIdsStr
             }

package/apis/role/{menuDetail.ts → menus.ts}

@@ -1,13 +1,18 @@
-export default {
+import adminRoleTable from '../../tables/role.json';
+
+export default {
     name: '获取角色菜单权限',
+    fields: {
+        roleCode: adminRoleTable.code
+    },
     handler: async (befly, ctx) => {
         // 查询角色信息
         const role = await befly.db.getOne({
             table: 'addon_admin_role',
-            where: { id: ctx.body.roleId }
+            where: { code: ctx.body.roleCode }
         });
 
-        if (!role) {
+        if (!role?.id) {
             return befly.tool.No('角色不存在');
         }
 

package/apis/role/save.ts

@@ -17,19 +17,18 @@
                 where: { code: ctx.body.roleCode }
             });
 
-            if (!role) {
+            if (!role?.id) {
                 return befly.tool.No('角色不存在');
             }
 
             // 根据角色编码判断角色类型（硬编码规则）
             const roleType = role.code === 'dev' || role.code === 'admin' ? 'admin' : 'user';
 
-            // 更新管理员的角色ID、角色编码和角色类型
+            // 更新管理员的角色编码和角色类型
             await befly.db.updData({
                 table: 'addon_admin_admin',
                 where: { id: ctx.body.adminId },
                 data: {
-                    roleId: role.id,
                     roleCode: role.code,
                     roleType: roleType
                 }

package/apis/sysConfig/all.ts

@@ -3,7 +3,6 @@ export default {
     handler: async (befly, ctx) => {
         const result = await befly.db.getAll({
             table: 'addon_admin_sys_config',
-            fields: ['*'],
             orderBy: ['id#ASC']
         });
 

package/apis/sysConfig/del.ts

@@ -11,7 +11,7 @@ export default {
                 where: { id: ctx.body.id }
             });
 
-            if (!config) {
+            if (!config?.id) {
                 return befly.tool.No('配置不存在');
             }
 

package/apis/sysConfig/get.ts

@@ -7,11 +7,10 @@ export default {
     handler: async (befly, ctx) => {
         const config = await befly.db.getDetail({
             table: 'addon_admin_sys_config',
-            fields: ['code', 'value', 'valueType'],
             where: { code: ctx.body.code }
         });
 
-        if (!config) {
+        if (!config?.id) {
             return befly.tool.No('配置不存在');
         }
 

package/apis/sysConfig/upd.ts

@@ -14,7 +14,7 @@ export default {
                 where: { id: ctx.body.id }
             });
 
-            if (!config) {
+            if (!config?.id) {
                 return befly.tool.No('配置不存在');
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.1.29",
+    "version": "1.1.30",
     "title": "管理后台",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
@@ -44,9 +44,9 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "e078b94f087ddf21f289b55ab86c0b8dce105807",
+    "gitHead": "8cb371928961c63d6c3c416c6dd667f8fe285376",
     "dependencies": {
-        "befly": "^3.9.37",
+        "befly": "^3.9.38",
         "befly-shared": "^1.2.8",
         "nodemailer": "^7.0.11",
         "ua-parser-js": "^2.0.7"

package/tables/admin.json

@@ -35,12 +35,6 @@
         "type": "string",
         "max": 500
     },
-    "roleId": {
-        "name": "角色ID",
-        "type": "number",
-        "min": 1,
-        "index": true
-    },
     "roleCode": {
         "name": "角色编码",
         "type": "string",

package/tables/dict.json

@@ -1,24 +1,25 @@
 {
-    "name": {
-        "name": "字典名称",
+    "typeCode": {
+        "name": "字典类型代码",
         "type": "string",
         "min": 2,
         "max": 50,
-        "index": true
+        "index": true,
+        "regexp": "@alphanumeric_"
     },
-    "code": {
-        "name": "字典代码",
+    "key": {
+        "name": "字典键",
         "type": "string",
-        "min": 2,
+        "min": 1,
         "max": 50,
         "index": true,
         "regexp": "@alphanumeric_"
     },
-    "value": {
-        "name": "字典值",
+    "label": {
+        "name": "字典标签",
         "type": "string",
-        "max": 200,
-        "index": true
+        "min": 1,
+        "max": 100
     },
     "sort": {
         "name": "排序",
@@ -27,15 +28,8 @@
         "max": 9999,
         "default": 0
     },
-    "pid": {
-        "name": "父级ID",
-        "type": "number",
-        "min": 0,
-        "default": 0,
-        "index": true
-    },
-    "description": {
-        "name": "描述",
+    "remark": {
+        "name": "备注",
         "type": "string",
         "max": 200
     }

package/tables/dictType.json

@@ -0,0 +1,28 @@
+{
+    "code": {
+        "name": "类型代码",
+        "type": "string",
+        "min": 2,
+        "max": 50,
+        "unique": true,
+        "regexp": "@alphanumeric_"
+    },
+    "name": {
+        "name": "类型名称",
+        "type": "string",
+        "min": 2,
+        "max": 50
+    },
+    "description": {
+        "name": "描述",
+        "type": "string",
+        "max": 200
+    },
+    "sort": {
+        "name": "排序",
+        "type": "number",
+        "min": 0,
+        "max": 9999,
+        "default": 0
+    }
+}