@befly-addon/admin 1.1.35 → 1.2.0

package/apis/admin/cacheRefresh.ts

@@ -46,8 +46,8 @@ export default {
 
                 await befly.redis.setObject(CacheKeys.menusAll(), menus.lists);
 
-                const parentCount = menus.lists.filter((m: any) => m.pid === 0).length;
-                const childCount = menus.lists.filter((m: any) => m.pid !== 0).length;
+                const parentCount = menus.lists.filter((m: any) => typeof m.parentPath !== "string" || m.parentPath.length === 0).length;
+                const childCount = menus.lists.filter((m: any) => typeof m.parentPath === "string" && m.parentPath.length > 0).length;
 
                 results.menus = {
                     success: true,

package/apis/menu/all.ts

@@ -21,11 +21,11 @@ export default {
                 return befly.tool.No("角色不存在", { lists: [] });
             }
 
-            // 3. 解析菜单ID列表（数组，数据库字段已改为 array 存储）
-            const rawMenuIds = Array.isArray(role.menus) ? role.menus : [];
-            const menuIds = rawMenuIds.map((id: any) => Number(id)).filter((id: number) => Number.isFinite(id));
+            // 3. 解析菜单路径列表（menu.path 数组，array_text）
+            const rawMenuPaths = Array.isArray(role.menus) ? role.menus : [];
+            const menuPaths = rawMenuPaths.map((p: any) => (typeof p === "string" ? p.trim() : "")).filter((p: string) => p.length > 0);
 
-            if (menuIds.length === 0) {
+            if (menuPaths.length === 0) {
                 return befly.tool.Yes("菜单为空", { lists: [] });
             }
 
@@ -35,8 +35,7 @@ export default {
             // 如果缓存不存在，从数据库查询
             if (allMenus.length === 0) {
                 const result = await befly.db.getAll({
-                    table: "addon_admin_menu",
-                    orderBy: ["sort#ASC", "id#ASC"]
+                    table: "addon_admin_menu"
                 });
                 allMenus = result.lists;
             }
@@ -45,9 +44,9 @@ export default {
                 return befly.tool.Yes("菜单为空", { lists: [] });
             }
 
-            // 5. 根据角色权限过滤菜单
-            const menuIdSet = new Set<number>(menuIds);
-            const authorizedMenus = allMenus.filter((menu: any) => menuIdSet.has(Number(menu.id)));
+            // 5. 根据角色权限过滤菜单（按 menu.path）
+            const menuPathSet = new Set<string>(menuPaths);
+            const authorizedMenus = allMenus.filter((menu: any) => typeof menu?.path === "string" && menuPathSet.has(String(menu.path)));
 
             // 6. 返回一维数组（由前端构建树形结构）
             return befly.tool.Yes("获取菜单成功", { lists: authorizedMenus });

package/apis/menu/list.ts

@@ -9,8 +9,7 @@ export default {
     handler: async (befly) => {
         try {
             const menus = await befly.db.getAll({
-                table: "addon_admin_menu",
-                orderBy: ["sort#ASC", "id#ASC"]
+                table: "addon_admin_menu"
             });
 
             return befly.tool.Yes("操作成功", { lists: menus.lists });

package/apis/role/apiSave.ts

@@ -4,7 +4,7 @@ export default {
     name: "保存角色接口权限",
     fields: {
         roleCode: adminRoleTable.code,
-        apiIds: adminRoleTable.apis
+        apiPaths: adminRoleTable.apis
     },
     handler: async (befly, ctx) => {
         // 查询角色是否存在
@@ -22,12 +22,12 @@ export default {
             table: "addon_admin_role",
             where: { code: ctx.body.roleCode },
             data: {
-                apis: ctx.body.apiIds
+                apis: ctx.body.apiPaths
             }
         });
 
         // 增量刷新 Redis 权限缓存
-        await befly.cache.refreshRoleApiPermissions(role.code, ctx.body.apiIds || []);
+        await befly.cache.refreshRoleApiPermissions(role.code, ctx.body.apiPaths || []);
 
         return befly.tool.Yes("操作成功");
     }

package/apis/role/apis.ts

@@ -16,9 +16,9 @@ export default {
             return befly.tool.No("角色不存在");
         }
 
-        // 数据库自动将 array_number_string 转换为数组
-        const apiIds = role.apis || [];
+        // 数据库自动将 array_text 转换为数组
+        const apiPaths = role.apis || [];
 
-        return befly.tool.Yes("操作成功", { apiIds });
+        return befly.tool.Yes("操作成功", { apiPaths: apiPaths });
     }
 };

package/apis/role/menuSave.ts

@@ -4,7 +4,7 @@ export default {
     name: "保存角色菜单权限",
     fields: {
         roleCode: adminRoleTable.code,
-        menuIds: adminRoleTable.menus
+        menuPaths: adminRoleTable.menus
     },
     handler: async (befly, ctx) => {
         // 查询角色是否存在
@@ -22,7 +22,7 @@ export default {
             table: "addon_admin_role",
             where: { code: ctx.body.roleCode },
             data: {
-                menus: ctx.body.menuIds
+                menus: ctx.body.menuPaths
             }
         });
 

package/apis/role/menus.ts

@@ -16,9 +16,9 @@ export default {
             return befly.tool.No("角色不存在");
         }
 
-        // 数据库自动将 array_number_string 转换为数组
-        const menuIds = role.menus || [];
+        // 数据库自动将 array_text 转换为数组
+        const menuPaths = role.menus || [];
 
-        return befly.tool.Yes("操作成功", menuIds);
+        return befly.tool.Yes("操作成功", menuPaths);
     }
 };

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.1.35",
+    "version": "1.2.0",
+    "gitHead": "faa8189c7d23cf45885c03d1425cba8f5bf45df9",
     "private": false,
     "description": "Befly - 管理后台功能组件",
     "keywords": [
@@ -11,42 +12,46 @@
         "rbac",
         "typescript"
     ],
+    "license": "Apache-2.0",
+    "author": "chenbimo",
     "repository": {
         "type": "git",
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "author": "chenbimo",
-    "license": "Apache-2.0",
-    "type": "module",
-    "main": "package.json",
-    "exports": {
-        ".": "./package.json",
-        "./styles/*": "./styles/*"
-    },
     "files": [
-        "README.md",
         "apis",
         "libs",
         "package.json",
         "plugins",
+        "README.md",
         "styles",
         "tables",
         "views"
     ],
+    "type": "module",
+    "main": "package.json",
+    "exports": {
+        ".": "./package.json",
+        "./styles/*": "./styles/*"
+    },
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
     "scripts": {
         "dev": "vite",
         "build": "vite build",
         "preview": "vite preview"
     },
     "dependencies": {
-        "befly": "^3.9.40",
-        "befly-vite": "^1.1.13",
-        "nodemailer": "^7.0.11",
+        "befly": "^3.10.0",
+        "befly-vite": "^1.2.0",
+        "nodemailer": "^7.0.12",
         "ua-parser-js": "^2.0.7"
     },
     "devDependencies": {
-        "@iconify-json/lucide": "^1.2.80",
+        "@iconify-json/lucide": "^1.2.82",
         "@types/nodemailer": "^7.0.4",
         "@types/ua-parser-js": "^0.7.39",
         "pinia": "^3.0.4",
@@ -55,16 +60,11 @@
         "vue-router": "^4.6.4"
     },
     "peerDependencies": {
-        "@iconify-json/lucide": "^1.2.80",
+        "@iconify-json/lucide": "^1.2.82",
         "pinia": "^3.0.4",
         "tdesign-vue-next": "^1.17.7",
         "vue": "^3.5.26",
         "vue-router": "^4.6.4"
     },
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
-    },
-    "gitHead": "3a0df4a847cf3da97bb2d09455fabba62027e6c0",
-    "title": "管理后台"
+    "addonName": "管理后台"
 }

package/plugins/email.ts

@@ -19,11 +19,8 @@ const defaultConfig: EmailConfig = {
     fromName: "Befly System"
 };
 
-/**
- * 邮件插件
- */
-const emailPlugin: Plugin = {
-    after: ["db", "logger", "config"],
+export default {
+    deps: ["db", "logger", "config"],
     async handler(befly: BeflyContext): Promise<EmailHelper> {
         // 从 befly.config.addons.admin.email 获取配置
         const addonEmailConfig = befly.config?.addons?.admin?.email || {};
@@ -34,6 +31,4 @@ const emailPlugin: Plugin = {
 
         return new EmailHelper(befly, emailConfig);
     }
-};
-
-export default emailPlugin;
+} satisfies Plugin;

package/tables/api.json

@@ -6,35 +6,16 @@
         "max": 100,
         "index": true
     },
-    "path": {
+    "routePath": {
         "name": "接口路径",
         "type": "string",
         "min": 1,
         "max": 200,
         "index": true
     },
-    "method": {
-        "name": "请求方法",
-        "type": "string",
-        "min": 3,
-        "max": 10,
-        "default": "POST",
-        "index": true,
-        "regexp": "^(GET|POST|PUT|DELETE|PATCH)$"
-    },
-    "description": {
-        "name": "接口描述",
-        "type": "string",
-        "max": 500
-    },
     "addonName": {
         "name": "所属插件",
         "type": "string",
         "max": 50
-    },
-    "addonTitle": {
-        "name": "插件标题",
-        "type": "string",
-        "max": 100
     }
 }

package/tables/menu.json

@@ -11,12 +11,7 @@
         "type": "string",
         "min": 1,
         "max": 200,
-        "index": true
-    },
-    "icon": {
-        "name": "图标名称",
-        "type": "string",
-        "max": 50
+        "unique": true
     },
     "sort": {
         "name": "排序",
@@ -25,11 +20,11 @@
         "max": 9999,
         "default": 0
     },
-    "pid": {
-        "name": "父级ID",
-        "type": "number",
-        "min": 0,
-        "default": 0,
+    "parentPath": {
+        "name": "父级路径",
+        "type": "string",
+        "max": 200,
+        "default": "",
         "index": true
     }
 }

package/tables/role.json

@@ -21,13 +21,13 @@
     },
     "menus": {
         "name": "菜单权限",
-        "type": "array_number_text",
-        "detail": "菜单ID数组，如 [1,2,3]"
+        "type": "array_text",
+        "detail": "菜单路径数组（menu.path），如 [\"/permission/role\",\"/dashboard\"]"
     },
     "apis": {
         "name": "接口权限",
-        "type": "array_number_text",
-        "detail": "接口ID数组，如 [1,2,3]"
+        "type": "array_text",
+        "detail": "接口路径数组（url.pathname），如 [\"/api/addon/addonAdmin/auth/login\"]"
     },
     "sort": {
         "name": "排序",

package/views/403_1/index.vue

@@ -1,75 +0,0 @@
-<template>
-    <div class="error-page">
-        <div class="error-content">
-            <div class="error-code">403</div>
-            <h1 class="error-title">无权限访问</h1>
-            <p class="error-description">抱歉，您没有访问该页面的权限</p>
-            <div class="error-actions">
-                <TButton theme="primary" @click="$Method.goHome">返回首页</TButton>
-                <TButton @click="$Method.goBack">返回上一页</TButton>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { useRouter } from "vue-router";
-import { Button as TButton } from "tdesign-vue-next";
-
-definePage({
-    meta: {
-        title: "403",
-        order: 101
-    }
-});
-
-const router = useRouter();
-
-const $Method = {
-    goHome() {
-        router.push("/");
-    },
-    goBack() {
-        router.back();
-    }
-};
-</script>
-
-<style scoped lang="scss">
-.error-page {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    min-height: 100vh;
-    background: var(--bg-color-page);
-
-    .error-code {
-        font-size: 120px;
-        font-weight: 700;
-        background: linear-gradient(135deg, var(--primary-color) 0%, #764ba2 100%);
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
-        background-clip: text;
-        margin: 0;
-    }
-
-    .error-message {
-        font-size: 24px;
-        color: var(--text-primary);
-        margin: 20px 0;
-    }
-
-    .error-description {
-        font-size: 16px;
-        color: var(--text-secondary);
-        margin: 8px 0 24px;
-    }
-
-    .error-actions {
-        display: flex;
-        gap: 12px;
-        justify-content: center;
-    }
-}
-</style>

package/views/config/dict/components/edit.vue

@@ -1,109 +0,0 @@
-<template>
-    <TDialog v-model:visible="visible" :header="actionType === 'add' ? '添加字典项' : '编辑字典项'" width="600px" @confirm="$Method.handleSubmit" @close="$Method.handleClose">
-        <TForm ref="formRef" :data="$Data.formData" :rules="$Data.rules" label-width="100px">
-            <TFormItem label="字典类型" name="typeCode">
-                <TSelect v-model="$Data.formData.typeCode" placeholder="请选择字典类型" filterable>
-                    <TOption v-for="item in typeList" :key="item.code" :value="item.code" :label="item.name" />
-                </TSelect>
-            </TFormItem>
-            <TFormItem label="键值" name="key">
-                <TInput v-model="$Data.formData.key" placeholder="请输入键名（英文/数字/下划线）" />
-            </TFormItem>
-            <TFormItem label="标签" name="label">
-                <TInput v-model="$Data.formData.label" placeholder="请输入标签（显示名称）" />
-            </TFormItem>
-            <TFormItem label="排序" name="sort">
-                <TInputNumber v-model="$Data.formData.sort" :min="0" placeholder="请输入排序值" />
-            </TFormItem>
-            <TFormItem label="备注" name="remark">
-                <TTextarea v-model="$Data.formData.remark" placeholder="请输入备注信息" :autosize="{ minRows: 3, maxRows: 6 }" />
-            </TFormItem>
-        </TForm>
-    </TDialog>
-</template>
-
-<script setup>
-import { computed } from "vue";
-
-import { Dialog as TDialog, Form as TForm, FormItem as TFormItem, Input as TInput, Select as TSelect, Option as TOption, Textarea as TTextarea, InputNumber as TInputNumber, MessagePlugin } from "tdesign-vue-next";
-import { $Http } from "@/plugins/http";
-
-const props = defineProps({
-    modelValue: Boolean,
-    actionType: String,
-    rowData: Object,
-    typeList: Array
-});
-
-const emit = defineEmits(["update:modelValue", "success"]);
-
-const visible = computed({
-    get: () => props.modelValue,
-    set: (val) => emit("update:modelValue", val)
-});
-
-const formRef = $ref(null);
-
-const $Data = $ref({
-    formData: {
-        typeCode: "",
-        key: "",
-        label: "",
-        sort: 0,
-        remark: ""
-    },
-    rules: {
-        typeCode: [{ required: true, message: "请选择字典类型" }],
-        key: [{ required: true, message: "请输入键值" }],
-        label: [{ required: true, message: "请输入标签" }]
-    }
-});
-
-const $Method = {
-    async handleSubmit() {
-        try {
-            const valid = await formRef.validate();
-            const apiUrl = props.actionType === "add" ? "/addon/admin/dict/ins" : "/addon/admin/dict/upd";
-            const params = {
-                typeCode: $Data.formData.typeCode,
-                key: $Data.formData.key,
-                label: $Data.formData.label,
-                sort: $Data.formData.sort,
-                remark: $Data.formData.remark
-            };
-            if (props.actionType === "upd") {
-                params.id = props.rowData.id;
-            }
-
-            const res = await $Http(apiUrl, params);
-            if (res.code === 0) {
-                MessagePlugin.success(props.actionType === "add" ? "添加成功" : "更新成功");
-                visible.value = false;
-                emit("success");
-            } else {
-                MessagePlugin.error(res.msg || "操作失败");
-            }
-        } catch (error) {
-            MessagePlugin.error("操作失败");
-        }
-    },
-    handleClose() {
-        visible.value = false;
-    }
-};
-
-// 该组件由父组件 v-if 控制挂载/卸载，因此无需 watch：创建时初始化一次即可
-if (props.actionType === "upd" && props.rowData) {
-    $Data.formData.typeCode = props.rowData.typeCode || "";
-    $Data.formData.key = props.rowData.key || "";
-    $Data.formData.label = props.rowData.label || "";
-    $Data.formData.sort = props.rowData.sort || 0;
-    $Data.formData.remark = props.rowData.remark || "";
-} else {
-    $Data.formData.typeCode = "";
-    $Data.formData.key = "";
-    $Data.formData.label = "";
-    $Data.formData.sort = 0;
-    $Data.formData.remark = "";
-}
-</script>