@befly-addon/admin 1.1.28 → 1.1.30

package/views/config/dictType/index.vue

@@ -0,0 +1,206 @@
+<template>
+    <div class="page-dict-type page-table">
+        <div class="main-tool">
+            <div class="left">
+                <TButton theme="primary" @click="$Method.onAction('add', {})">
+                    <template #icon>
+                        <ILucidePlus />
+                    </template>
+                </TButton>
+            </div>
+            <div class="right">
+                <TInput v-model="$Data.searchKeyword" placeholder="搜索类型名称" clearable @enter="$Method.handleSearch" @clear="$Method.handleSearch">
+                    <template #suffix-icon>
+                        <ILucideSearch />
+                    </template>
+                </TInput>
+                <TButton shape="circle" @click="$Method.handleRefresh">
+                    <template #icon>
+                        <ILucideRotateCw />
+                    </template>
+                </TButton>
+            </div>
+        </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">
+                    <template #operation="{ row }">
+                        <TDropdown trigger="click" placement="bottom-right" @click="(data) => $Method.onAction(data.value, row)">
+                            <TButton theme="primary" size="small">
+                                操作
+                                <template #suffix> <ILucideChevronDown /></template>
+                            </TButton>
+                            <TDropdownMenu slot="dropdown">
+                                <TDropdownItem value="upd">
+                                    <ILucidePencil />
+                                    编辑
+                                </TDropdownItem>
+                                <TDropdownItem value="del" :divider="true">
+                                    <ILucideTrash2 style="width: 14px; height: 14px; margin-right: 6px" />
+                                    删除
+                                </TDropdownItem>
+                            </TDropdownMenu>
+                        </TDropdown>
+                    </template>
+                </TTable>
+            </div>
+
+            <div class="main-detail">
+                <DetailPanel :data="$Data.currentRow" :fields="$Data.columns" />
+            </div>
+        </div>
+
+        <div class="main-page">
+            <TPagination :current-page="$Data.pagerConfig.currentPage" :page-size="$Data.pagerConfig.limit" :total="$Data.pagerConfig.total" @current-change="$Method.onPageChange" @page-size-change="$Method.handleSizeChange" />
+        </div>
+
+        <EditDialog v-if="$Data.editVisible" v-model="$Data.editVisible" :action-type="$Data.actionType" :row-data="$Data.rowData" @success="$Method.apiDictTypeList" />
+    </div>
+</template>
+
+<script setup>
+import { Button as TButton, Table as TTable, Input as TInput, 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 ILucideSearch from '~icons/lucide/search';
+import ILucidePencil from '~icons/lucide/pencil';
+import ILucideTrash2 from '~icons/lucide/trash-2';
+import ILucideChevronDown from '~icons/lucide/chevron-down';
+import EditDialog from './components/edit.vue';
+import DetailPanel from '@/components/DetailPanel.vue';
+import { $Http } from '@/plugins/http';
+import { withDefaultColumns } from 'befly-shared/withDefaultColumns';
+
+const $Data = $ref({
+    tableData: [],
+    loading: false,
+    activeRowKeys: [],
+    currentRow: null,
+    searchKeyword: '',
+    columns: withDefaultColumns([
+        { colKey: 'id', title: 'ID' },
+        { colKey: 'code', title: '类型代码' },
+        { colKey: 'name', title: '类型名称' },
+        { colKey: 'description', title: '描述' },
+        { colKey: 'sort', title: '排序' },
+        { colKey: 'operation', title: '操作' }
+    ]),
+    pagerConfig: {
+        currentPage: 1,
+        limit: 30,
+        total: 0,
+        align: 'right',
+        layout: 'total, prev, pager, next, jumper'
+    },
+    editVisible: false,
+    actionType: 'add',
+    rowData: {}
+});
+
+const $Method = {
+    async initData() {
+        await $Method.apiDictTypeList();
+    },
+    async apiDictTypeList() {
+        $Data.loading = true;
+        try {
+            const res = await $Http('/addon/admin/dictType/list', {
+                page: $Data.pagerConfig.currentPage,
+                limit: $Data.pagerConfig.limit,
+                keyword: $Data.searchKeyword
+            });
+            $Data.tableData = res.data.lists || [];
+            $Data.pagerConfig.total = res.data.total || 0;
+
+            if ($Data.tableData.length > 0) {
+                $Data.currentRow = $Data.tableData[0];
+                $Data.activeRowKeys = [$Data.tableData[0].id];
+            } else {
+                $Data.currentRow = null;
+                $Data.activeRowKeys = [];
+            }
+        } catch (error) {
+            console.error('加载字典类型列表失败:', error);
+            MessagePlugin.error('加载数据失败');
+        } finally {
+            $Data.loading = false;
+        }
+    },
+    async apiDictTypeDel(row) {
+        DialogPlugin.confirm({
+            header: '确认删除',
+            body: `确定要删除类型"${row.name}"吗？删除前会检查是否有字典项引用此类型。`,
+            status: 'warning'
+        }).then(async () => {
+            try {
+                const res = await $Http('/addon/admin/dictType/del', { id: row.id });
+                if (res.code === 0) {
+                    MessagePlugin.success('删除成功');
+                    $Method.apiDictTypeList();
+                } else {
+                    MessagePlugin.error(res.msg || '删除失败');
+                }
+            } catch (error) {
+                console.error('删除失败:', error);
+                MessagePlugin.error('删除失败');
+            }
+        });
+    },
+    handleSearch() {
+        $Data.pagerConfig.currentPage = 1;
+        $Method.apiDictTypeList();
+    },
+    handleRefresh() {
+        $Data.searchKeyword = '';
+        $Data.pagerConfig.currentPage = 1;
+        $Method.apiDictTypeList();
+    },
+    onPageChange({ currentPage }) {
+        $Data.pagerConfig.currentPage = currentPage;
+        $Method.apiDictTypeList();
+    },
+    handleSizeChange({ pageSize }) {
+        $Data.pagerConfig.limit = pageSize;
+        $Data.pagerConfig.currentPage = 1;
+        $Method.apiDictTypeList();
+    },
+    onActiveChange(value, context) {
+        if (value.length === 0 && $Data.activeRowKeys.length > 0) {
+            return;
+        }
+        $Data.activeRowKeys = value;
+        $Data.currentRow = context.currentRowData;
+    },
+    onAction(type, row) {
+        if (type === 'add') {
+            $Data.actionType = 'add';
+            $Data.rowData = {};
+            $Data.editVisible = true;
+        } else if (type === 'upd') {
+            $Data.actionType = 'upd';
+            $Data.rowData = { ...row };
+            $Data.editVisible = true;
+        } else if (type === 'del') {
+            $Method.apiDictTypeDel(row);
+        }
+    }
+};
+
+onMounted(() => {
+    $Method.initData();
+});
+</script>
+
+<style scoped lang="scss">
+.page-dict-type {
+    .main-tool .right {
+        display: flex;
+        gap: 8px;
+        align-items: center;
+
+        .t-input {
+            width: 240px;
+        }
+    }
+}
+</style>

package/views/config/dictType/meta.json

@@ -0,0 +1,4 @@
+{
+    "name": "字典类型",
+    "order": 0
+}

package/views/login_1/index.vue

@@ -21,7 +21,39 @@
                     <p class="login-subtitle">请登录您的账户</p>
                 </div>
 
-                <EmailLoginForm />
+                <TForm :model="$Data.formData" :rules="$Data2.formRules" :ref="(el) => ($From.form = el)" class="login-form" :show-message="false" label-width="0">
+                    <TFormItem prop="account">
+                        <TInputAdornment>
+                            <template #prepend>
+                                <TSelect v-model="$Data.formData.loginType" :style="{ width: '110px' }" size="large" :popup-props="{ overlayClassName: 'login-type-select-popup' }">
+                                    <TOption value="username" label="用户名" />
+                                    <TOption value="email" label="邮箱" />
+                                    <TOption value="phone" label="手机号" />
+                                </TSelect>
+                            </template>
+                            <TInput v-model="$Data.formData.account" :placeholder="$Data.formData.loginType === 'username' ? '请输入用户名' : $Data.formData.loginType === 'email' ? '请输入邮箱' : '请输入手机号'" size="large" clearable @enter="$Method.apiLogin">
+                                <template #prefix-icon>
+                                    <ILucideUser />
+                                </template>
+                            </TInput>
+                        </TInputAdornment>
+                    </TFormItem>
+
+                    <TFormItem prop="password">
+                        <TInput v-model="$Data.formData.password" type="password" placeholder="密码" size="large" clearable @enter="$Method.apiLogin">
+                            <template #prefix-icon>
+                                <ILucideLock />
+                            </template>
+                        </TInput>
+                    </TFormItem>
+
+                    <div class="form-options">
+                        <TCheckbox v-model="$Data.rememberMe">记住我</TCheckbox>
+                        <a href="#" class="link-text">忘记密码？</a>
+                    </div>
+
+                    <TButton theme="primary" class="login-btn" size="large" block :loading="$Data.loading" @click="$Method.apiLogin"> 登录 </TButton>
+                </TForm>
 
                 <div class="login-footer">
                     <p class="copyright">© 2024 Befly. All rights reserved.</p>
@@ -32,7 +64,75 @@
 </template>
 
 <script setup>
-import EmailLoginForm from './components/emailLoginForm.vue';
+import { useRouter } from 'vue-router';
+import { Form as TForm, FormItem as TFormItem, Input as TInput, Button as TButton, Checkbox as TCheckbox, InputAdornment as TInputAdornment, Select as TSelect, Option as TOption, MessagePlugin } from 'tdesign-vue-next';
+import ILucideUser from '~icons/lucide/user';
+import ILucideLock from '~icons/lucide/lock';
+import { $Http } from '@/plugins/http';
+import { $Storage } from '@/plugins/storage';
+import { hashPassword } from 'befly-shared/hashPassword';
+
+const router = useRouter();
+
+// 表单引用
+const $From = $shallowRef({
+    form: null
+});
+
+// 数据定义
+const $Data = $ref({
+    loading: false,
+    rememberMe: false,
+    formData: {
+        loginType: 'username',
+        account: '',
+        password: ''
+    }
+});
+
+const $Data2 = $shallowRef({
+    formRules: {
+        account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }]
+    }
+});
+
+// 方法定义
+const $Method = {
+    async apiLogin() {
+        try {
+            const valid = await $From.form.validate();
+
+            $Data.loading = true;
+
+            // 对密码进行 SHA-256 加密
+            const hashedPassword = await hashPassword($Data.formData.password);
+
+            const res = await $Http('/addon/admin/auth/login', {
+                loginType: $Data.formData.loginType,
+                account: $Data.formData.account,
+                password: hashedPassword
+            });
+
+            // 先保存 token
+            $Storage.local.set('token', res.data.token);
+
+            // 如果返回用户信息,也可以存储
+            if (res.data.userInfo) {
+                $Storage.local.set('userInfo', res.data.userInfo);
+            }
+
+            MessagePlugin.success(res.msg || '登录成功');
+
+            // 跳转到首页，路由守卫会自动加载菜单
+            await router.push('/');
+        } catch (error) {
+            console.log('🔥[ error ]-77', error);
+        } finally {
+            $Data.loading = false;
+        }
+    }
+};
 </script>
 
 <style scoped lang="scss">
@@ -170,6 +270,88 @@ import EmailLoginForm from './components/emailLoginForm.vue';
     color: var(--login-subtitle);
 }
 
+.login-form {
+    width: 100%;
+
+    :deep(.t-form__item) {
+        margin-bottom: 1.25rem;
+    }
+
+    :deep(.t-form__controls) {
+        width: 100%;
+    }
+
+    :deep(.t-input-adornment) {
+        width: 100%;
+    }
+
+    :deep(.t-input-adornment__prepend) {
+        padding: 0;
+        border-right: 1px solid var(--login-card-border);
+    }
+
+    :deep(.t-input) {
+        width: 100%;
+        border-radius: 8px;
+        transition: all 0.3s;
+
+        &:hover {
+            border-color: #667eea;
+        }
+
+        &:focus-within {
+            border-color: #667eea;
+            box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+        }
+    }
+
+    :deep(.t-input__wrap) {
+        width: 100%;
+    }
+}
+
+.form-options {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 1.5rem;
+    font-size: 0.875rem;
+
+    .link-text {
+        color: var(--login-link);
+        text-decoration: none;
+        transition: color 0.3s;
+
+        &:hover {
+            color: var(--login-link-hover);
+        }
+    }
+}
+
+.login-btn {
+    width: 100%;
+    height: 48px;
+    border-radius: 8px;
+    font-size: 1rem;
+    font-weight: 600;
+    background: linear-gradient(135deg, var(--login-btn-gradient-start) 0%, var(--login-btn-gradient-end) 100%);
+    border: none;
+    transition: all 0.3s;
+
+    &:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 8px 20px var(--login-btn-shadow);
+    }
+
+    &:active {
+        transform: translateY(0);
+    }
+
+    :deep(.t-button__text) {
+        color: #fff;
+    }
+}
+
 // 响应式设计
 @media (max-width: 1024px) {
     .login-container {

package/views/people/admin/components/edit.vue

@@ -2,8 +2,8 @@
     <TDialog v-model:visible="$Data.visible" :header="$Prop.actionType === 'upd' ? '编辑管理员' : '添加管理员'" width="600px" :append-to-body="true" :show-footer="true" :esc-closable="false" top="10vh" @close="$Method.onClose">
         <div class="dialog-wrapper">
             <TForm :model="$Data.formData" label-width="80px" label-position="left" label-align="left" :rules="$Data2.formRules" :ref="(el) => ($From.form = el)">
-                <TFormItem label="角色" prop="roleId">
-                    <TSelect v-model="$Data.formData.roleId" :options="$Data.allRoleLists" :keys="$Data.keys" placeholder="请选择角色" />
+                <TFormItem label="角色" prop="roleCode">
+                    <TSelect v-model="$Data.formData.roleCode" :options="$Data.allRoleLists" :keys="$Data.keys" placeholder="请选择角色" />
                 </TFormItem>
                 <TFormItem label="用户名" prop="username">
                     <TInput v-model="$Data.formData.username" placeholder="请输入用户名" :disabled="$Prop.actionType === 'upd'" />
@@ -78,14 +78,14 @@ const $Data = $ref({
     allRoleLists: [],
     keys: {
         label: 'name',
-        value: 'id'
+        value: 'code'
     },
     formData: {
         id: null,
         username: '',
         password: '',
         nickname: '',
-        roleId: null,
+        roleCode: null,
         state: 1
     }
 });
@@ -97,7 +97,7 @@ const $Data2 = $shallowRef({
             { required: true, message: '请输入密码', trigger: 'blur' },
             { min: 6, message: '密码至少6位', trigger: 'blur' }
         ],
-        roleId: [{ required: true, message: '请选择角色', trigger: 'change' }],
+        roleCode: [{ required: true, message: '请选择角色', trigger: 'change' }],
         nickname: [{ min: 2, max: 50, message: '昵称长度在 2 到 50 个字符', trigger: 'blur' }]
     }
 });

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

@@ -121,8 +121,8 @@ const $Method = {
         if (!$Prop.rowData.id) return;
 
         try {
-            const res = await $Http('/addon/admin/role/apiDetail', {
-                roleId: $Prop.rowData.id
+            const res = await $Http('/addon/admin/role/apis', {
+                roleCode: $Prop.rowData.code
             });
 
             $Data.checkedApiIds = res.data.apiIds || [];
@@ -153,7 +153,7 @@ const $Method = {
             $Data.submitting = true;
 
             const res = await $Http('/addon/admin/role/apiSave', {
-                roleId: $Prop.rowData.id,
+                roleCode: $Prop.rowData.code,
                 apiIds: $Data.checkedApiIds
             });
 

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

@@ -73,11 +73,11 @@ 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);
@@ -90,7 +90,7 @@ const $Method = {
             $Data.submitting = true;
 
             const res = await $Http('/addon/admin/role/menuSave', {
-                roleId: $Prop.rowData.id,
+                roleCode: $Prop.rowData.code,
                 menuIds: $Data.menuTreeCheckedKeys
             });
 

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
-        });
-    }
-};