@befly-addon/admin 1.6.0 → 1.6.1

package/apis/admin/ins.ts

@@ -6,7 +6,7 @@ export default {
     required: ["username", "password", "roleCode"],
     handler: async (befly, ctx) => {
         // 检查用户名是否已存在
-        const existingByUsername = await befly.db.getOne({
+        const existingByUsername = await befly.db.getOne<{ id: number }>({
             table: "addon_admin_admin",
             where: { username: ctx.body.username }
         });
@@ -17,7 +17,7 @@ export default {
 
         // 检查昵称是否已存在
         if (ctx.body.nickname) {
-            const existingByNickname = await befly.db.getOne({
+            const existingByNickname = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_admin",
                 where: { nickname: ctx.body.nickname }
             });
@@ -28,7 +28,7 @@ export default {
         }
 
         // 查询角色信息
-        const roleData = await befly.db.getOne({
+        const roleData = await befly.db.getOne<{ id: number }>({
             table: "addon_admin_role",
             where: { code: ctx.body.roleCode }
         });

package/apis/admin/upd.ts

@@ -8,7 +8,12 @@ export default {
         const { id, username, nickname, roleCode, ...updateData } = ctx.body;
 
         // 检查管理员是否存在
-        const admin = await befly.db.getOne({
+        const admin = await befly.db.getOne<{
+            id: number;
+            username?: string;
+            nickname?: string;
+            roleCode?: string;
+        }>({
             table: "addon_admin_admin",
             where: { id }
         });
@@ -19,7 +24,7 @@ export default {
 
         // 检查用户名是否已被其他管理员使用
         if (username && username !== admin.data.username) {
-            const existingUsername = await befly.db.getOne({
+            const existingUsername = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_admin",
                 where: { username, id: { $ne: id } }
             });
@@ -30,7 +35,7 @@ export default {
 
         // 检查昵称是否已被其他管理员使用
         if (nickname && nickname !== admin.data.nickname) {
-            const existingNickname = await befly.db.getOne({
+            const existingNickname = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_admin",
                 where: { nickname, id: { $ne: id } }
             });
@@ -41,7 +46,7 @@ export default {
 
         // 检查角色是否存在
         if (roleCode && roleCode !== admin.data.roleCode) {
-            const role = await befly.db.getOne({
+            const role = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_role",
                 where: { code: roleCode }
             });
@@ -51,7 +56,7 @@ export default {
         }
 
         // 构建更新数据
-        const dataToUpdate: Record<string, any> = { ...updateData };
+        const dataToUpdate: Record<string, unknown> = { ...updateData };
         if (username) dataToUpdate.username = username;
         if (nickname) dataToUpdate.nickname = nickname;
         if (roleCode) dataToUpdate.roleCode = roleCode;

package/apis/auth/login.ts

@@ -47,7 +47,7 @@ export default {
         };
 
         // 根据登录类型构建查询条件
-        const whereCondition: Record<string, any> = {};
+        const whereCondition: Record<string, unknown> = {};
         if (ctx.body.loginType === "username") {
             whereCondition.username = ctx.body.account;
         } else if (ctx.body.loginType === "email") {
@@ -57,7 +57,15 @@ export default {
         }
 
         // 查询管理员
-        const admin = await befly.db.getOne({
+        const admin = await befly.db.getOne<{
+            id: number;
+            username: string;
+            nickname?: string;
+            password: string;
+            state?: number;
+            roleCode?: string;
+            roleType?: string;
+        }>({
             table: "addon_admin_admin",
             where: whereCondition
         });
@@ -81,7 +89,7 @@ export default {
                 await befly.db.insData({ table: "addon_admin_login_log", data: logData });
                 return befly.tool.No("账号或密码错误");
             }
-        } catch (error: any) {
+        } catch (error: unknown) {
             befly.logger.error({ err: error, msg: "密码验证失败" });
             logData.failReason = "密码格式错误";
             await befly.db.insData({ table: "addon_admin_login_log", data: logData });

package/apis/dict/ins.ts

@@ -6,7 +6,7 @@ export default {
     required: ["typeCode", "key", "label"],
     handler: async (befly, ctx) => {
         // 验证 typeCode 是否存在
-        const dictType = await befly.db.getOne({
+        const dictType = await befly.db.getOne<{ id: number }>({
             table: "addon_admin_dict_type",
             where: { code: ctx.body.typeCode }
         });
@@ -16,7 +16,7 @@ export default {
         }
 
         // 检查 typeCode+key 是否已存在
-        const existing = await befly.db.getOne({
+        const existing = await befly.db.getOne<{ id: number }>({
             table: "addon_admin_dict",
             where: {
                 typeCode: ctx.body.typeCode,

package/apis/dict/items.ts

@@ -6,7 +6,7 @@ export default {
     required: ["typeCode"],
     handler: async (befly, ctx) => {
         // 验证 typeCode 是否存在
-        const dictType = await befly.db.getOne({
+        const dictType = await befly.db.getOne<{ id: number }>({
             table: "addon_admin_dict_type",
             where: { code: ctx.body.typeCode }
         });

package/apis/dict/upd.ts

@@ -12,7 +12,7 @@ export default {
 
         // 如果更新了 typeCode，验证其是否存在
         if (typeCode) {
-            const dictType = await befly.db.getOne({
+            const dictType = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_dict_type",
                 where: { code: typeCode }
             });
@@ -24,7 +24,7 @@ export default {
 
         // 如果更新了 typeCode 或 key，检查唯一性
         if (typeCode || key) {
-            const current = await befly.db.getOne({
+            const current = await befly.db.getOne<{ typeCode?: string; key?: string }>({
                 table: "addon_admin_dict",
                 where: { id: id }
             });
@@ -32,7 +32,7 @@ export default {
             const checkTypeCode = typeCode || current.data?.typeCode;
             const checkKey = key || current.data?.key;
 
-            const existing = await befly.db.getOne({
+            const existing = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_dict",
                 where: {
                     typeCode: checkTypeCode,
@@ -46,7 +46,7 @@ export default {
             }
         }
 
-        const updateData: Record<string, any> = {};
+        const updateData: Record<string, unknown> = {};
         if (typeCode !== undefined) updateData.typeCode = typeCode;
         if (key !== undefined) updateData.key = key;
         if (label !== undefined) updateData.label = label;

package/apis/dictType/del.ts

@@ -5,7 +5,7 @@ export default {
     handler: async (befly, ctx) => {
         const { id } = ctx.body;
 
-        const dictType = await befly.db.getOne({
+        const dictType = await befly.db.getOne<{ code?: string }>({
             table: "addon_admin_dict_type",
             where: { id: id }
         });
@@ -15,7 +15,7 @@ export default {
         }
 
         // 检查是否有字典项引用此类型
-        const dictItems = await befly.db.getOne({
+        const dictItems = await befly.db.getOne<{ id: number }>({
             table: "addon_admin_dict",
             where: {
                 typeCode: dictType.data.code

package/apis/email/config.ts

@@ -14,7 +14,7 @@ export default {
             user: config.user,
             pass: config.pass,
             fromName: config.fromName,
-            configured: !!config.user
+            configured: Boolean(config.user)
         });
     }
 };

package/apis/menu/all.ts

@@ -12,7 +12,7 @@ export default {
     handler: async (befly, ctx) => {
         try {
             // 2. 查询角色信息获取菜单权限（使用 roleCode 而非 roleId）
-            const role = await befly.db.getOne({
+            const role = await befly.db.getOne<{ id: number; menus?: unknown }>({
                 table: "addon_admin_role",
                 where: { code: ctx.user.roleCode }
             });
@@ -23,7 +23,7 @@ export default {
 
             // 3. 解析菜单路径列表（menu.path 数组，array_text）
             const rawMenuPaths = Array.isArray(role.data.menus) ? role.data.menus : [];
-            const menuPaths = rawMenuPaths.map((p: any) => (typeof p === "string" ? p.trim() : "")).filter((p: string) => p.length > 0);
+            const menuPaths = rawMenuPaths.map((p: unknown) => (typeof p === "string" ? p.trim() : "")).filter((p: string) => p.length > 0);
 
             if (menuPaths.length === 0) {
                 return befly.tool.Yes("菜单为空", { lists: [] });
@@ -46,11 +46,17 @@ export default {
 
             // 5. 根据角色权限过滤菜单（按 menu.path）
             const menuPathSet = new Set<string>(menuPaths);
-            const authorizedMenus = allMenus.filter((menu: any) => typeof menu?.path === "string" && menuPathSet.has(String(menu.path)));
+            const authorizedMenus = allMenus.filter((menu: unknown) => {
+                if (typeof menu !== "object" || menu === null) {
+                    return false;
+                }
+                const path = (menu as { path?: unknown }).path;
+                return typeof path === "string" && menuPathSet.has(path);
+            });
 
             // 6. 返回一维数组（由前端构建树形结构）
             return befly.tool.Yes("获取菜单成功", { lists: authorizedMenus });
-        } catch (error: any) {
+        } catch (error: unknown) {
             befly.logger.error({ err: error, msg: "获取用户菜单失败" });
             return befly.tool.No("获取菜单失败");
         }

package/apis/role/apiSave.ts

@@ -11,12 +11,13 @@ export default {
         let apiPaths: string[] = [];
         try {
             apiPaths = normalizePathnameListInput(ctx.body.apiPaths, "apiPaths", true);
-        } catch (error: any) {
-            return befly.tool.No(`参数不合法：${error?.message || "未知错误"}`);
+        } catch (error: unknown) {
+            const msg = error instanceof Error ? error.message : "未知错误";
+            return befly.tool.No(`参数不合法：${msg}`);
         }
 
         // 查询角色是否存在
-        const role = await befly.db.getOne({
+        const role = await befly.db.getOne<{ id: number; code: string }>({
             table: "addon_admin_role",
             where: { code: ctx.body.roleCode }
         });

package/apis/sysConfig/get.ts

@@ -5,7 +5,12 @@ export default {
         code: { name: "配置代码", type: "string", min: 1, max: 50 }
     },
     handler: async (befly, ctx) => {
-        const config = await befly.db.getOne({
+        const config = await befly.db.getOne<{
+            id: number;
+            code: string;
+            value: string;
+            valueType: string;
+        }>({
             table: "addon_admin_sys_config",
             where: { code: ctx.body.code }
         });

package/apis/sysConfig/ins.ts

@@ -6,7 +6,7 @@ export default {
     handler: async (befly, ctx) => {
         try {
             // 检查 code 是否已存在
-            const existing = await befly.db.getOne({
+            const existing = await befly.db.getOne<{ id: number }>({
                 table: "addon_admin_sys_config",
                 where: { code: ctx.body.code }
             });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.6.0",
-    "gitHead": "0d60e323a83a1fc53822147de877af19cdb972c0",
+    "version": "1.6.1",
+    "gitHead": "f836a457a4b5936d566051b629ed80eb264d6bf8",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [

package/utils/fieldClear.ts

@@ -38,7 +38,7 @@ export function fieldClear<T = any>(data: T | T[], options: FieldClearOptions =
             const value = obj[key];
 
             // 1. keepMap 优先
-            if (keepMap && Object.prototype.hasOwnProperty.call(keepMap, key)) {
+            if (keepMap && Object.hasOwn(keepMap, key)) {
                 if (Object.is(keepMap[key], value)) {
                     result[key] = value;
                     continue;