@befly-addon/admin 1.1.29 → 1.1.31

package/views/permission/role/components/menu.vue

@@ -11,9 +11,9 @@
 </template>
 
 <script setup>
-import { Dialog as TDialog, Tree as TTree, Button as TButton, MessagePlugin } from 'tdesign-vue-next';
-import { arrayToTree } from '@/utils';
-import { $Http } from '@/plugins/http';
+import { Dialog as TDialog, Tree as TTree, Button as TButton, MessagePlugin } from "tdesign-vue-next";
+import { arrayToTree } from "befly-vite/utils/arrayToTree";
+import { $Http } from "@/plugins/http";
 
 const $Prop = defineProps({
     modelValue: {
@@ -26,7 +26,7 @@ const $Prop = defineProps({
     }
 });
 
-const $Emit = defineEmits(['update:modelValue', 'success']);
+const $Emit = defineEmits(["update:modelValue", "success"]);
 
 const $Data = $ref({
     visible: false,
@@ -51,20 +51,19 @@ const $Method = {
     onClose() {
         $Data.visible = false;
         setTimeout(() => {
-            $Emit('update:modelValue', false);
+            $Emit("update:modelValue", false);
         }, 300);
     },
 
     // 加载菜单树（用于配置权限）
     async apiMenuAll() {
         try {
-            const res = await $Http('/addon/admin/menu/all');
+            const res = await $Http("/addon/admin/menu/all");
             // menuAll 返回的 data 直接就是菜单数组
             const menuList = Array.isArray(res.data) ? res.data : [];
             $Data.menuTreeData = arrayToTree(menuList);
         } catch (error) {
-            console.error('加载菜单失败:', error);
-            MessagePlugin.error('加载菜单失败');
+            MessagePlugin.error("加载菜单失败");
         }
     },
 
@@ -73,14 +72,14 @@ const $Method = {
         if (!$Prop.rowData.id) return;
 
         try {
-            const res = await $Http('/addon/admin/role/menuDetail', {
-                roleId: $Prop.rowData.id
+            const res = await $Http("/addon/admin/role/menus", {
+                roleCode: $Prop.rowData.code
             });
 
-            // roleMenuDetail 返回的 data 直接就是菜单 ID 数组
+            // menus 返回的 data 直接就是菜单 ID 数组
             $Data.menuTreeCheckedKeys = Array.isArray(res.data) ? res.data : [];
         } catch (error) {
-            console.error('加载角色菜单失败:', error);
+            MessagePlugin.error("加载数据失败");
         }
     },
 
@@ -89,21 +88,20 @@ const $Method = {
         try {
             $Data.submitting = true;
 
-            const res = await $Http('/addon/admin/role/menuSave', {
-                roleId: $Prop.rowData.id,
+            const res = await $Http("/addon/admin/role/menuSave", {
+                roleCode: $Prop.rowData.code,
                 menuIds: $Data.menuTreeCheckedKeys
             });
 
             if (res.code === 0) {
-                MessagePlugin.success('保存成功');
+                MessagePlugin.success("保存成功");
                 $Data.visible = false;
-                $Emit('success');
+                $Emit("success");
             } else {
-                MessagePlugin.error(res.msg || '保存失败');
+                MessagePlugin.error(res.msg || "保存失败");
             }
         } catch (error) {
-            console.error('保存失败:', error);
-            MessagePlugin.error('保存失败');
+            MessagePlugin.error("保存失败");
         } finally {
             $Data.submitting = false;
         }

package/views/permission/role/index.vue

@@ -18,7 +18,16 @@
         </div>
         <div class="main-content">
             <div class="main-table">
-                <TTable :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" :active-row-keys="$Data.activeRowKeys" row-key="id" height="calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)" active-row-type="single" @active-change="$Method.onActiveChange">
+                <TTable
+                    :data="$Data.tableData"
+                    :columns="$Data.columns"
+                    :loading="$Data.loading"
+                    :active-row-keys="$Data.activeRowKeys"
+                    row-key="id"
+                    height="calc(100vh - var(--search-height) - var(--pagination-height) - var(--layout-gap) * 4)"
+                    active-row-type="single"
+                    @active-change="$Method.onActiveChange"
+                >
                     <template #state="{ row }">
                         <TTag v-if="row.state === 1" shape="round" theme="success" variant="light-outline">正常</TTag>
                         <TTag v-else-if="row.state === 2" shape="round" theme="warning" variant="light-outline">禁用</TTag>
@@ -74,20 +83,27 @@
 </template>
 
 <script setup>
-import { Button as TButton, Table as TTable, Tag as TTag, Dropdown as TDropdown, DropdownMenu as TDropdownMenu, DropdownItem as TDropdownItem, Pagination as TPagination, MessagePlugin, DialogPlugin } from 'tdesign-vue-next';
-import ILucidePlus from '~icons/lucide/plus';
-import ILucideRotateCw from '~icons/lucide/rotate-cw';
-import ILucidePencil from '~icons/lucide/pencil';
-import ILucideSettings from '~icons/lucide/settings';
-import ILucideCode from '~icons/lucide/code';
-import ILucideTrash2 from '~icons/lucide/trash-2';
-import ILucideChevronDown from '~icons/lucide/chevron-down';
-import EditDialog from './components/edit.vue';
-import MenuDialog from './components/menu.vue';
-import ApiDialog from './components/api.vue';
-import DetailPanel from '@/components/DetailPanel.vue';
-import { $Http } from '@/plugins/http';
-import { withDefaultColumns } from 'befly-shared/withDefaultColumns';
+import { Button as TButton, Table as TTable, Tag as TTag, Dropdown as TDropdown, DropdownMenu as TDropdownMenu, DropdownItem as TDropdownItem, Pagination as TPagination, MessagePlugin, DialogPlugin } from "tdesign-vue-next";
+import ILucidePlus from "~icons/lucide/plus";
+import ILucideRotateCw from "~icons/lucide/rotate-cw";
+import ILucidePencil from "~icons/lucide/pencil";
+import ILucideSettings from "~icons/lucide/settings";
+import ILucideCode from "~icons/lucide/code";
+import ILucideTrash2 from "~icons/lucide/trash-2";
+import ILucideChevronDown from "~icons/lucide/chevron-down";
+import EditDialog from "./components/edit.vue";
+import MenuDialog from "./components/menu.vue";
+import ApiDialog from "./components/api.vue";
+import DetailPanel from "@/components/DetailPanel.vue";
+import { $Http } from "@/plugins/http";
+import { withDefaultColumns } from "befly-vite/utils/withDefaultColumns";
+
+definePage({
+    meta: {
+        title: "角色管理",
+        order: 1
+    }
+});
 
 // 响应式数据
 const $Data = $ref({
@@ -96,25 +112,25 @@ const $Data = $ref({
     activeRowKeys: [],
     currentRow: null,
     columns: withDefaultColumns([
-        { colKey: 'id', title: 'ID' },
-        { colKey: 'name', title: '角色名称' },
-        { colKey: 'code', title: '角色代码' },
-        { colKey: 'description', title: '描述' },
-        { colKey: 'sort', title: '排序' },
-        { colKey: 'state', title: '状态' },
-        { colKey: 'operation', title: '操作' }
+        { colKey: "id", title: "ID" },
+        { colKey: "name", title: "角色名称" },
+        { colKey: "code", title: "角色代码" },
+        { colKey: "description", title: "描述" },
+        { colKey: "sort", title: "排序" },
+        { colKey: "state", title: "状态" },
+        { colKey: "operation", title: "操作" }
     ]),
     pagerConfig: {
         currentPage: 1,
         limit: 30,
         total: 0,
-        align: 'right',
-        layout: 'total, prev, pager, next, jumper'
+        align: "right",
+        layout: "total, prev, pager, next, jumper"
     },
     editVisible: false,
     menuVisible: false,
     apiVisible: false,
-    actionType: 'add',
+    actionType: "add",
     rowData: {}
 });
 
@@ -127,7 +143,7 @@ const $Method = {
     async apiRoleList() {
         $Data.loading = true;
         try {
-            const res = await $Http('/addon/admin/role/list', {
+            const res = await $Http("/addon/admin/role/list", {
                 page: $Data.pagerConfig.currentPage,
                 limit: $Data.pagerConfig.limit
             });
@@ -143,8 +159,7 @@ const $Method = {
                 $Data.activeRowKeys = [];
             }
         } catch (error) {
-            console.error('加载角色列表失败:', error);
-            MessagePlugin.error('加载数据失败');
+            MessagePlugin.error("加载数据失败");
         } finally {
             $Data.loading = false;
         }
@@ -152,22 +167,43 @@ const $Method = {
 
     // 删除角色
     async apiRoleDel(row) {
-        DialogPlugin.confirm({
-            header: '确认删除',
-            body: `确定要删除角色“${row.name}” 吗？`,
-            status: 'warning'
-        }).then(async () => {
-            try {
-                const res = await $Http('/addon/admin/role/del', { id: row.id });
-                if (res.code === 0) {
-                    MessagePlugin.success('删除成功');
-                    $Method.apiRoleList();
-                } else {
-                    MessagePlugin.error(res.msg || '删除失败');
+        let dialog = null;
+        let destroyed = false;
+
+        const destroy = () => {
+            if (destroyed) return;
+            destroyed = true;
+            if (dialog && typeof dialog.destroy === "function") {
+                dialog.destroy();
+            }
+        };
+
+        dialog = DialogPlugin.confirm({
+            header: "确认删除",
+            body: `确认删除角色“${row.name}”吗？`,
+            status: "warning",
+            confirmBtn: "删除",
+            cancelBtn: "取消",
+            onConfirm: async () => {
+                if (dialog && typeof dialog.setConfirmLoading === "function") {
+                    dialog.setConfirmLoading(true);
+                }
+
+                try {
+                    await $Http("/addon/admin/role/del", { id: row.id });
+                    MessagePlugin.success("删除成功");
+                    destroy();
+                    await $Method.apiRoleList();
+                } catch (error) {
+                    MessagePlugin.error("删除失败");
+                } finally {
+                    if (dialog && typeof dialog.setConfirmLoading === "function") {
+                        dialog.setConfirmLoading(false);
+                    }
                 }
-            } catch (error) {
-                console.error('删除失败:', error);
-                MessagePlugin.error('删除失败');
+            },
+            onClose: () => {
+                destroy();
             }
         });
     },
@@ -207,13 +243,13 @@ const $Method = {
     onAction(command, rowData) {
         $Data.actionType = command;
         $Data.rowData = rowData;
-        if (command === 'add' || command === 'upd') {
+        if (command === "add" || command === "upd") {
             $Data.editVisible = true;
-        } else if (command === 'menu') {
+        } else if (command === "menu") {
             $Data.menuVisible = true;
-        } else if (command === 'api') {
+        } else if (command === "api") {
             $Data.apiVisible = true;
-        } else if (command === 'del') {
+        } else if (command === "del") {
             $Method.apiRoleDel(rowData);
         }
     }
@@ -223,6 +259,5 @@ $Method.initData();
 </script>
 
 <style scoped lang="scss">
-.page-role {
-}
+/* page styles */
 </style>

package/apis/admin/roleDetail.ts

@@ -1,29 +0,0 @@
-export default {
-    name: '获取管理员角色',
-    handler: async (befly, ctx) => {
-        // 查询管理员信息（框架自动转换为小驼峰）
-        const admin = await befly.db.getOne({
-            table: 'addon_admin_admin',
-            where: { id: ctx.body.adminId }
-        });
-
-        if (!admin) {
-            return befly.tool.No('管理员不存在');
-        }
-
-        // 如果有角色编码，查询角色详细信息（使用 roleCode 而非 roleId）
-        let roleInfo = null;
-        if (admin.roleCode) {
-            roleInfo = await befly.db.getOne({
-                table: 'addon_admin_role',
-                where: { code: admin.roleCode }
-            });
-        }
-
-        return befly.tool.Yes('操作成功', {
-            roleId: admin.roleId,
-            roleCode: admin.roleCode,
-            role: roleInfo
-        });
-    }
-};

package/apis/admin/roleSave.ts

@@ -1,39 +0,0 @@
-export default {
-    name: '管理员角色保存',
-    fields: {
-        roleCode: {
-            name: '角色编码',
-            type: 'string',
-            min: 2,
-            max: 50,
-            regexp: '^[a-zA-Z0-9_]+$'
-        }
-    },
-    handler: async (befly, ctx) => {
-        // 查询角色是否存在（使用 roleCode 而非 roleId）
-        const role = await befly.db.getOne({
-            table: 'addon_admin_role',
-            where: { code: ctx.body.roleCode }
-        });
-
-        if (!role) {
-            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.id },
-            data: {
-                roleId: role.id,
-                roleCode: role.code,
-                roleType: roleType
-            }
-        });
-
-        return befly.tool.Yes('操作成功');
-    }
-};

package/apis/auth/logout.ts

@@ -1,17 +0,0 @@
-export default {
-    name: '退出登录',
-    handler: async (befly, ctx) => {
-        // JWT token 是无状态的,前端删除 token 即可
-        // 如果需要实现 token 黑名单,可以在这里将 token 加入 Redis 黑名单
-
-        const token = ctx.headers.authorization?.replace('Bearer ', '');
-
-        if (token && befly.redis) {
-            // 将 token 加入黑名单,有效期设置为 token 的剩余有效期
-            const key = `token_blacklist:${token}`;
-            await befly.redis.set(key, '1', 'EX', 7 * 24 * 60 * 60); // 7天
-        }
-
-        return befly.tool.Yes('退出成功');
-    }
-};

package/apis/auth/register.ts

@@ -1,43 +0,0 @@
-import adminTable from '../../tables/admin.json';
-
-export default {
-    name: '管理员注册',
-    auth: false,
-    fields: {
-        name: adminTable.name,
-        email: adminTable.email,
-        password: adminTable.password
-    },
-    required: ['name', 'email', 'password'],
-    handler: async (befly, ctx) => {
-        // 检查邮箱是否已存在
-        const existingAdmin = await befly.db.getOne({
-            table: 'addon_admin_admin',
-            where: { email: ctx.body.email }
-        });
-
-        if (existingAdmin) {
-            return befly.tool.No('该邮箱已被注册');
-        }
-
-        // 加密密码
-        const hashedPassword = await befly.cipher.hashPassword(ctx.body.password);
-
-        // 创建管理员
-        const adminId = await befly.db.insData({
-            table: 'addon_admin_admin',
-            data: {
-                name: ctx.body.name,
-                email: ctx.body.email,
-                password: hashedPassword,
-                role: 'user' // 默认为普通用户，state 由框架自动设置为 1
-            }
-        });
-
-        return befly.tool.Yes('注册成功', {
-            id: adminId,
-            name: ctx.body.name,
-            email: ctx.body.email
-        });
-    }
-};

package/apis/dashboard/changelog.ts

@@ -1,31 +0,0 @@
-export default {
-    name: '获取更新日志',
-    handler: async (befly, ctx) => {
-        // 更新日志数据（实际项目中可以从配置文件或数据库读取）
-        const changelog = [
-            {
-                version: 'v1.0.0',
-                date: '2025-10-25',
-                changes: ['新增角色权限管理功能', '新增菜单权限分配功能', '新增接口权限管理功能', '优化菜单同步性能', '优化字段类型验证', '修复数组类型字段验证bug']
-            },
-            {
-                version: 'v0.9.0',
-                date: '2025-10-20',
-                changes: ['初始版本发布', '完成基础框架搭建', '实现用户认证功能', '实现RBAC权限系统']
-            },
-            {
-                version: 'v0.8.0',
-                date: '2025-10-15',
-                changes: ['完成数据库设计', '实现核心API', '添加字段验证器', '集成Redis缓存']
-            }
-        ];
-
-        // 根据 limit 参数返回指定数量的日志
-        const limit = ctx.body.limit || 5;
-        const lists = changelog.slice(0, limit);
-
-        return befly.tool.Yes('获取成功', {
-            lists: lists
-        });
-    }
-};

package/apis/role/apiDetail.ts

@@ -1,24 +0,0 @@
-export default {
-    name: '获取角色接口权限',
-    handler: async (befly, ctx) => {
-        // 查询角色信息
-        const role = await befly.db.getOne({
-            table: 'addon_admin_role',
-            where: { id: ctx.body.roleId }
-        });
-
-        if (!role) {
-            return befly.tool.No('角色不存在');
-        }
-
-        // 解析接口ID列表（逗号分隔的字符串转为数组）
-        const apiIds = role.apis
-            ? role.apis
-                  .split(',')
-                  .map((id: string) => parseInt(id.trim()))
-                  .filter((id: number) => !isNaN(id))
-            : [];
-
-        return befly.tool.Yes('操作成功', { apiIds });
-    }
-};

package/apis/role/menuDetail.ts

@@ -1,24 +0,0 @@
-export default {
-    name: '获取角色菜单权限',
-    handler: async (befly, ctx) => {
-        // 查询角色信息
-        const role = await befly.db.getOne({
-            table: 'addon_admin_role',
-            where: { id: ctx.body.roleId }
-        });
-
-        if (!role) {
-            return befly.tool.No('角色不存在');
-        }
-
-        // 解析菜单ID列表（逗号分隔的字符串转为数组）
-        const menuIds = role.menus
-            ? role.menus
-                  .split(',')
-                  .map((id: string) => parseInt(id.trim()))
-                  .filter((id: number) => !isNaN(id))
-            : [];
-
-        return befly.tool.Yes('操作成功', menuIds);
-    }
-};

package/views/403_1/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "403",
-    "order": 101
-}

package/views/config/dict/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "字典配置",
-    "order": 1
-}

package/views/config/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "配置管理",
-    "order": 30
-}

package/views/config/system/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "系统配置",
-    "order": 2
-}

package/views/index/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "首页",
-    "order": 0
-}

package/views/log/email/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "邮件日志",
-    "order": 2
-}

package/views/log/login/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "登录日志",
-    "order": 1
-}

package/views/log/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "日志管理",
-    "order": 40
-}

package/views/log/operate/meta.json

@@ -1,4 +0,0 @@
-{
-    "name": "操作日志",
-    "order": 3
-}