@befly-addon/admin 1.5.2 → 1.6.1

package/adminViews/permission/api/index.vue

@@ -75,7 +75,7 @@ const $Data = $ref({
     columns: withDefaultColumns([
         { colKey: "name", title: "接口名称" },
         { colKey: "auth", title: "登录" },
-        { colKey: "routePath", title: "接口路径" },
+        { colKey: "path", title: "接口路径" },
         { colKey: "method", title: "请求方法" },
         { colKey: "addonName", title: "所属组件" }
     ]),
@@ -125,7 +125,7 @@ const $Method = {
             return;
         }
         const keyword = $Data.searchKeyword.toLowerCase();
-        $Data.tableData = $Data.allData.filter((item) => item.name?.toLowerCase().includes(keyword) || item.routePath?.toLowerCase().includes(keyword));
+        $Data.tableData = $Data.allData.filter((item) => item.name?.toLowerCase().includes(keyword) || item.path?.toLowerCase().includes(keyword));
     },
 
     // 高亮行变化

package/adminViews/permission/role/components/api.vue

@@ -12,10 +12,10 @@
 
             <!-- 接口分组列表 -->
             <div class="api-container">
-                <div class="api-group" v-for="group in $Data.filteredApiData" :key="group.name">
-                    <div class="group-header">{{ group.title }}</div>
-                    <div class="api-checkbox-list">
-                        <TCheckboxGroup v-model="$Data.checkedApiPaths">
+                <TCheckboxGroup v-model="$Data.checkedApiPaths">
+                    <div class="api-group" v-for="group in $Data.filteredApiData" :key="group.name">
+                        <div class="group-header">{{ group.title }}</div>
+                        <div class="api-checkbox-list">
                             <TCheckbox v-for="api in group.apis" :key="api.value" :value="api.value">
                                 <div class="api-checkbox-label">
                                     <div class="api-label-main">
@@ -23,25 +23,25 @@
                                     </div>
                                 </div>
                             </TCheckbox>
-                        </TCheckboxGroup>
+                        </div>
                     </div>
-                </div>
+                </TCheckboxGroup>
             </div>
         </div>
 
         <template #footer>
             <div class="dialog-footer">
-                <t-space>
+                <TSpace>
                     <TButton theme="default" @click="$Method.onClose">取消</TButton>
                     <TButton theme="primary" :loading="$Data.submitting" @click="$Method.onSubmit">保存</TButton>
-                </t-space>
+                </TSpace>
             </div>
         </template>
     </TDialog>
 </template>
 
 <script setup lang="ts">
-import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, MessagePlugin } from "tdesign-vue-next";
+import { Dialog as TDialog, Input as TInput, CheckboxGroup as TCheckboxGroup, Checkbox as TCheckbox, Button as TButton, Space as TSpace, MessagePlugin } from "tdesign-vue-next";
 import ILucideSearch from "~icons/lucide/search";
 import { $Http } from "@/plugins/http";
 
@@ -85,7 +85,8 @@ const $Method = {
             const apis = group && group.apis;
             const list = Array.isArray(apis) ? apis : [];
             for (const api of list) {
-                if (api && api.auth === 0 && typeof api.value === "string" && api.value) {
+                const isPublic = api && (api.auth === 0 || api.auth === "0" || api.auth === false);
+                if (isPublic && typeof api.value === "string" && api.value) {
                     merged.add(api.value);
                 }
             }
@@ -113,32 +114,54 @@ const $Method = {
         try {
             const res = await $Http("/addon/admin/api/all");
 
-            // 将接口列表按 addonTitle 分组
+            // 将接口列表按 parentPath 分组展示（routePath 已迁移为 path）
             const apiMap = new Map();
 
-            res.data.lists.forEach((api) => {
-                const addonTitle = api.addonTitle || api.addonName || "项目接口";
-                const addonName = api.addonName || "app";
+            const lists = res && res.data && Array.isArray(res.data.lists) ? res.data.lists : [];
+            for (const api of lists) {
+                const apiPath = api && typeof api.path === "string" ? api.path : "";
+                if (!apiPath) {
+                    continue;
+                }
+
+                const parentPath = api && typeof api.parentPath === "string" ? api.parentPath : "";
+                const groupKey = parentPath || "(未分组)";
 
-                if (!apiMap.has(addonName)) {
-                    apiMap.set(addonName, {
-                        name: addonName,
-                        title: addonTitle,
+                if (!apiMap.has(groupKey)) {
+                    apiMap.set(groupKey, {
+                        name: groupKey,
+                        title: groupKey,
                         apis: []
                     });
                 }
 
-                apiMap.get(addonName).apis.push({
-                    value: api.routePath,
-                    name: api.name || "",
-                    path: api.routePath || "",
-                    label: `${api.name || ""} ${api.routePath ? `(${api.routePath})` : ""}`.trim(),
-                    description: api.description,
-                    auth: api.auth
+                apiMap.get(groupKey).apis.push({
+                    value: apiPath,
+                    name: (api && typeof api.name === "string" ? api.name : "") || apiPath,
+                    path: apiPath,
+                    label: `${(api && typeof api.name === "string" ? api.name : "") || ""} ${apiPath ? `(${apiPath})` : ""}`.trim(),
+                    description: api ? api.description : undefined,
+                    auth: api ? api.auth : undefined,
+                    parentPath: parentPath
+                });
+            }
+
+            const groups = Array.from(apiMap.values());
+            for (const group of groups) {
+                group.apis.sort((a, b) => {
+                    const ap = typeof a.path === "string" ? a.path : "";
+                    const bp = typeof b.path === "string" ? b.path : "";
+                    return ap.localeCompare(bp);
                 });
+            }
+
+            groups.sort((a, b) => {
+                const at = typeof a.title === "string" ? a.title : "";
+                const bt = typeof b.title === "string" ? b.title : "";
+                return at.localeCompare(bt);
             });
 
-            $Data.apiData = Array.from(apiMap.values());
+            $Data.apiData = groups;
         } catch (error) {
             MessagePlugin.error("加载接口失败");
         }
@@ -169,7 +192,12 @@ const $Method = {
         const searchLower = $Data.searchText.toLowerCase();
         $Data.filteredApiData = $Data.apiData
             .map((group) => {
-                const apis = group.apis.filter((api) => api.label.toLowerCase().includes(searchLower));
+                const apis = group.apis.filter((api) => {
+                    const label = api && typeof api.label === "string" ? api.label : "";
+                    const name = api && typeof api.name === "string" ? api.name : "";
+                    const path = api && typeof api.path === "string" ? api.path : "";
+                    return label.toLowerCase().includes(searchLower) || name.toLowerCase().includes(searchLower) || path.toLowerCase().includes(searchLower);
+                });
                 return {
                     name: group.name,
                     title: group.title,
@@ -218,6 +246,12 @@ $Method.initData();
         flex: 1;
         overflow-y: auto;
 
+        /* CheckboxGroup 默认可能是 inline 布局，容易被内容撑开；这里强制占满容器宽度 */
+        :deep(.t-checkbox-group) {
+            display: block;
+            width: 100%;
+        }
+
         .api-group {
             margin-bottom: 16px;
             border: 1px solid var(--border-color);
@@ -225,7 +259,22 @@ $Method.initData();
             overflow: hidden;
 
             .api-checkbox-list {
-                padding: 10px;
+                padding: 12px 16px;
+                display: flex;
+                flex-wrap: wrap;
+                gap: 12px;
+
+                :deep(.t-checkbox) {
+                    margin: 0;
+                    flex: 0 0 calc(33.333% - 8px);
+                    min-width: 0;
+
+                    .t-checkbox__label {
+                        white-space: nowrap;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                    }
+                }
             }
 
             &:last-child {

package/adminViews/permission/role/components/edit.vue

@@ -135,8 +135,3 @@ const $Method = {
 
 $Method.initData();
 </script>
-
-<style scoped lang="scss">
-.comp-role-edit {
-}
-</style>

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/api/list.ts

@@ -11,7 +11,7 @@ export default {
             const result = await befly.db.getList({
                 table: "addon_admin_api",
                 where: {
-                    $or: ctx.body.keyword ? [{ name$like: `%${ctx.body.keyword}%` }, { routePath$like: `%${ctx.body.keyword}%` }] : undefined
+                    $or: ctx.body.keyword ? [{ name$like: `%${ctx.body.keyword}%` }, { path$like: `%${ctx.body.keyword}%` }] : undefined
                 },
                 orderBy: ["id#ASC"],
                 page: ctx.body.page,

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.5.2",
-    "gitHead": "990c7108a9a791b9816c447309ec586d08b96ab4",
+    "version": "1.6.1",
+    "gitHead": "f836a457a4b5936d566051b629ed80eb264d6bf8",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [

package/tables/api.json

@@ -14,13 +14,20 @@
         "default": 1,
         "detail": "0=免登录，1=需登录"
     },
-    "routePath": {
+    "path": {
         "name": "接口路径",
         "type": "string",
         "min": 1,
         "max": 200,
         "index": true
     },
+    "parentPath": {
+        "name": "父级路径",
+        "type": "string",
+        "min": 1,
+        "max": 200,
+        "index": true
+    },
     "addonName": {
         "name": "所属插件",
         "type": "string",

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;