@befly-addon/admin 1.0.54 → 1.0.55

package/apis/admin/cacheRefresh.ts

@@ -4,7 +4,7 @@
  * 功能：
  * 1. 刷新接口缓存（apis:all）
  * 2. 刷新菜单缓存（menus:all）
- * 3. 刷新角色权限缓存（role:{code}）
+ * 3. 刷新角色权限缓存（role:info:{code}）
  *
  * 使用场景：
  * - 执行数据库同步后
@@ -12,6 +12,8 @@
  * - 缓存出现异常需要重建
  */
 
+import { RedisKeys } from 'befly-shared/redisKeys';
+
 export default {
     name: '刷新全部缓存',
     handler: async (befly, ctx) => {
@@ -30,10 +32,10 @@ export default {
                     orderBy: ['addonName#ASC', 'path#ASC']
                 });
 
-                await befly.redis.setObject('apis:all', apis);
+                await befly.redis.setObject(RedisKeys.apisAll(), apis);
                 results.apis = { success: true, count: apis.length };
             } catch (error: any) {
-                befly.logger.error('刷新接口缓存失败:', error);
+                befly.logger.error({ err: error }, '刷新接口缓存失败');
                 results.apis = { success: false, error: error.message };
             }
 
@@ -45,7 +47,7 @@ export default {
                     orderBy: ['sort#ASC', 'id#ASC']
                 });
 
-                await befly.redis.setObject('menus:all', menus);
+                await befly.redis.setObject(RedisKeys.menusAll(), menus);
 
                 const parentCount = menus.filter((m: any) => m.pid === 0).length;
                 const childCount = menus.filter((m: any) => m.pid !== 0).length;
@@ -57,7 +59,7 @@ export default {
                     childCount: childCount
                 };
             } catch (error: any) {
-                befly.logger.error('刷新菜单缓存失败:', error);
+                befly.logger.error({ err: error }, '刷新菜单缓存失败');
                 results.menus = { success: false, error: error.message };
             }
 
@@ -69,16 +71,17 @@ export default {
                     orderBy: ['id#ASC']
                 });
 
-                // 为每个角色单独缓存
-                let cachedCount = 0;
-                for (const role of roles) {
-                    await befly.redis.setObject(`role:${role.code}`, role);
-                    cachedCount++;
-                }
+                // 使用 setBatch 批量缓存所有角色（利用 Bun Redis auto-pipeline）
+                await befly.redis.setBatch(
+                    roles.map((role: any) => ({
+                        key: RedisKeys.roleInfo(role.code),
+                        value: role
+                    }))
+                );
 
-                results.roles = { success: true, count: cachedCount };
+                results.roles = { success: true, count: roles.length };
             } catch (error: any) {
-                befly.logger.error('刷新角色缓存失败:', error);
+                befly.logger.error({ err: error }, '刷新角色缓存失败');
                 results.roles = { success: false, error: error.message };
             }
 
@@ -91,7 +94,7 @@ export default {
                 return befly.tool.No('部分缓存刷新失败', results);
             }
         } catch (error: any) {
-            befly.logger.error('刷新全部缓存失败:', error);
+            befly.logger.error({ err: error }, '刷新全部缓存失败');
             return befly.tool.No('刷新全部缓存失败', { error: error.message });
         }
     }

package/apis/api/all.ts

@@ -16,7 +16,7 @@
 
             return befly.tool.Yes('操作成功', { lists: allApis });
         } catch (error: any) {
-            befly.logger.error('获取接口列表失败:', error);
+            befly.logger.error({ err: error }, '获取接口列表失败');
             return befly.tool.No('获取接口列表失败');
         }
     }

package/apis/api/list.ts

@@ -0,0 +1,30 @@
+import type { ApiRoute } from 'befly';
+
+export default {
+    name: '获取接口列表（分页）',
+    handler: async (befly, ctx) => {
+        try {
+            const { page = 1, limit = 30, keyword = '' } = ctx.body;
+
+            // 构建查询条件
+            const where: Record<string, any> = {};
+            if (keyword) {
+                where.$or = [{ name: { $like: `%${keyword}%` } }, { path: { $like: `%${keyword}%` } }];
+            }
+
+            const result = await befly.db.getList({
+                table: 'addon_admin_api',
+                fields: ['id', 'name', 'path', 'method', 'description', 'addon_name', 'addon_title'],
+                where: where,
+                orderBy: ['addon_name#ASC', 'path#ASC'],
+                page: page,
+                limit: limit
+            });
+
+            return befly.tool.Yes('操作成功', result);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '获取接口列表失败');
+            return befly.tool.No('获取接口列表失败');
+        }
+    }
+} as ApiRoute;

package/apis/auth/login.ts

@@ -32,8 +32,8 @@ export default {
             if (!isValid) {
                 return befly.tool.No('账号或密码错误2');
             }
-        } catch (error) {
-            befly.logger.error('密码验证失败', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '密码验证失败');
             return befly.tool.No('密码格式错误，请重新设置密码');
         }
 

package/apis/dashboard/serviceStatus.ts

@@ -14,7 +14,7 @@
                 responseTime: `${responseTime}ms`
             });
         } catch (error) {
-            befly.logger.error('数据库状态检测失败:', error);
+            befly.logger.error({ err: error }, '数据库状态检测失败');
             services.push({
                 name: '数据库',
                 status: 'stopped',
@@ -34,7 +34,7 @@
                     responseTime: `${responseTime}ms`
                 });
             } catch (error) {
-                befly.logger.error('Redis状态检测失败:', error);
+                befly.logger.error({ err: error }, 'Redis状态检测失败');
                 services.push({
                     name: 'Redis',
                     status: 'stopped',

package/apis/dashboard/systemResources.ts

@@ -87,7 +87,7 @@ export default {
                 befly.logger.warn('fs.statfs 不可用，无法获取磁盘信息');
             }
         } catch (error) {
-            befly.logger.warn('获取磁盘信息失败', error);
+            befly.logger.warn({ err: error }, '获取磁盘信息失败');
             // 获取失败时返回 0
             diskPercentage = 0;
             diskUsed = 0;

package/apis/dict/all.ts

@@ -13,7 +13,7 @@
 
             return befly.tool.Yes('操作成功', dicts);
         } catch (error) {
-            befly.logger.error('获取所有字典失败:', error);
+            befly.logger.error({ err: error }, '获取所有字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/del.ts

@@ -11,7 +11,7 @@
 
             return befly.tool.Yes('操作成功');
         } catch (error) {
-            befly.logger.error('删除字典失败:', error);
+            befly.logger.error({ err: error }, '删除字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/detail.ts

@@ -11,8 +11,8 @@
             });
 
             return befly.tool.Yes('操作成功', dict);
-        } catch (error) {
-            befly.logger.error('获取字典详情失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '获取字典详情失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/ins.ts

@@ -19,7 +19,7 @@ export default {
 
             return befly.tool.Yes('操作成功', { id: dictId });
         } catch (error) {
-            befly.logger.error('添加字典失败:', error);
+            befly.logger.error({ err: error }, '添加字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/dict/upd.ts

@@ -23,7 +23,7 @@ export default {
 
             return befly.tool.Yes('操作成功');
         } catch (error) {
-            befly.logger.error('更新字典失败:', error);
+            befly.logger.error({ err: error }, '更新字典失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/menu/all.ts

@@ -53,8 +53,8 @@ export default {
 
             // 6. 返回一维数组（由前端构建树形结构）
             return befly.tool.Yes('获取菜单成功', authorizedMenus);
-        } catch (error) {
-            befly.logger.error('获取用户菜单失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '获取用户菜单失败');
             return befly.tool.No('获取菜单失败');
         }
     }

package/apis/menu/list.ts

@@ -10,7 +10,7 @@
 
             return befly.tool.Yes('操作成功', menus);
         } catch (error) {
-            befly.logger.error('获取菜单列表失败:', error);
+            befly.logger.error({ err: error }, '获取菜单列表失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/role/del.ts

@@ -30,8 +30,8 @@
             }
 
             return befly.tool.Yes('操作成功');
-        } catch (error) {
-            befly.logger.error('删除角色失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '删除角色失败');
             return befly.tool.No('操作失败');
         }
     }

package/apis/role/save.ts

@@ -36,8 +36,8 @@
             });
 
             return befly.tool.Yes('操作成功');
-        } catch (error) {
-            befly.logger.error('保存用户角色失败:', error);
+        } catch (error: any) {
+            befly.logger.error({ err: error }, '保存用户角色失败');
             return befly.tool.No('操作失败');
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.0.54",
+    "version": "1.0.55",
     "title": "管理后台",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
@@ -38,8 +38,8 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "1f3cacbe4134ee60654b75338bcaeda535898a84",
+    "gitHead": "2031550167896390ac58c50aeb52b8c23426844e",
     "dependencies": {
-        "befly-util": "^1.0.7"
+        "befly-shared": "^1.1.1"
     }
 }

package/styles/variables.scss

@@ -64,7 +64,7 @@
     --footer-height: 48px;
     --search-height: 56px;
     --pagination-height: 56px;
-    --detail-width: 320px;
+    --detail-width: 280px;
     --transition-duration: 0.3s;
 
     // 登录页配色

package/views/admin/components/edit.vue

@@ -3,7 +3,7 @@
         <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.roleOptions" placeholder="请选择角色" />
+                    <TSelect v-model="$Data.formData.roleId" :options="$Data.allRoleLists" placeholder="请选择角色" />
                 </TFormItem>
                 <TFormItem label="用户名" prop="username">
                     <TInput v-model="$Data.formData.username" placeholder="请输入用户名" :disabled="$Prop.actionType === 'upd'" />
@@ -32,7 +32,7 @@
             <div class="dialog-footer">
                 <t-space>
                     <TButton theme="default" @click="$Method.onClose">取消</TButton>
-                    <TButton theme="primary" @click="$Method.onSubmit">确定</TButton>
+                    <TButton theme="primary" :loading="$Data.submitting" @click="$Method.onSubmit">确定</TButton>
                 </t-space>
             </div>
         </template>
@@ -53,7 +53,7 @@ import {
     MessagePlugin
 } from 'tdesign-vue-next';
 import { $Http } from '@/plugins/http';
-import { fieldClear } from 'befly-util/fieldClear';
+import { fieldClear } from 'befly-shared/fieldClear';
 
 const $Prop = defineProps({
     modelValue: {
@@ -79,7 +79,8 @@ const $From = $shallowRef({
 
 const $Data = $ref({
     visible: false,
-    roleOptions: [],
+    submitting: false,
+    allRoleLists: [],
     formData: {
         id: 0,
         username: '',
@@ -115,7 +116,7 @@ const $Data2 = $shallowRef({
 const $Method = {
     async initData() {
         $Method.onShow();
-        await $Method.loadRoles();
+        $Data.allRoleLists = await $Http('/addon/admin/role/all');
         if ($Prop.actionType === 'upd' && $Prop.rowData.id) {
             // 编辑模式：直接赋值
             $Data.formData = { ...$Prop.rowData };
@@ -135,25 +136,12 @@ const $Method = {
         }, 300);
     },
 
-    async loadRoles() {
-        try {
-            const result = await $Http('/addon/admin/role/all');
-            $Data.roleOptions = result
-                .filter((role) => role.state === 1)
-                .map((role) => ({
-                    label: role.name,
-                    value: role.id
-                }));
-        } catch (error) {
-            MessagePlugin.error(error.msg || '加载角色列表失败');
-        }
-    },
-
     async onSubmit() {
         try {
             const valid = await $From.form.validate();
             if (!valid) return;
 
+            $Data.submitting = true;
             const submitData = $Prop.actionType === 'add' ? fieldClear($Data.formData, { omitKeys: ['id', 'state'] }) : fieldClear($Data.formData, { omitKeys: ['password'] });
 
             await $Http($Prop.actionType === 'upd' ? '/addon/admin/admin/upd' : '/addon/admin/admin/ins', submitData);
@@ -163,6 +151,8 @@ const $Method = {
             $Method.onClose();
         } catch (error) {
             MessagePlugin.error(error.msg || '提交失败');
+        } finally {
+            $Data.submitting = false;
         }
     }
 };

package/views/admin/index.vue

@@ -19,7 +19,7 @@
 
         <div class="main-content">
             <div class="main-table">
-                <TTable :data="$Data.tableData" :columns="$Data.columns" row-key="id" :selected-row-keys="$Data.selectedRowKeys" active-row-type="single" :active-row-keys="$Data.activeRowKeys" @select-change="$Method.onSelectChange" @active-change="$Method.onActiveChange">
+                <TTable v-bind="withTableProps()" :data="$Data.tableData" :columns="$Data.columns" :loading="$Data.loading" select-on-row-click :selected-row-keys="$Data.selectedRowKeys" :active-row-keys="$Data.activeRowKeys" @select-change="$Method.onSelectChange" @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>
@@ -44,45 +44,22 @@
             </div>
 
             <div class="main-detail">
-                <div class="detail-content">
-                    <div v-if="$Data.currentRow">
-                        <div style="margin-bottom: 16px">
-                            <div style="color: var(--text-secondary); margin-bottom: 4px">ID</div>
-                            <div>{{ $Data.currentRow.id }}</div>
-                        </div>
-                        <div style="margin-bottom: 16px">
-                            <div style="color: var(--text-secondary); margin-bottom: 4px">用户名</div>
-                            <div>{{ $Data.currentRow.username }}</div>
-                        </div>
-                        <div style="margin-bottom: 16px">
-                            <div style="color: var(--text-secondary); margin-bottom: 4px">邮箱</div>
-                            <div>{{ $Data.currentRow.email }}</div>
-                        </div>
-                        <div style="margin-bottom: 16px">
-                            <div style="color: var(--text-secondary); margin-bottom: 4px">昵称</div>
-                            <div>{{ $Data.currentRow.nickname || '-' }}</div>
-                        </div>
-                        <div style="margin-bottom: 16px">
-                            <div style="color: var(--text-secondary); margin-bottom: 4px">角色</div>
-                            <div>{{ $Data.currentRow.roleCode || '-' }}</div>
-                        </div>
-                        <div style="margin-bottom: 16px">
-                            <div style="color: var(--text-secondary); margin-bottom: 4px">状态</div>
-                            <TTag v-if="$Data.currentRow.state === 1" shape="round" theme="success" variant="light-outline">正常</TTag>
-                            <TTag v-else-if="$Data.currentRow.state === 2" shape="round" theme="warning" variant="light-outline">禁用</TTag>
-                            <TTag v-else-if="$Data.currentRow.state === 0" shape="round" theme="danger" variant="light-outline">已删除</TTag>
-                        </div>
-                    </div>
-                    <div v-else style="text-align: center; padding: 48px 0; color: var(--text-placeholder)">
-                        <div style="font-size: 48px; margin-bottom: 8px">📋</div>
-                        <div>暂无数据</div>
-                    </div>
-                </div>
+                <DetailPanel
+                    :data="$Data.currentRow"
+                    :fields="[
+                        { key: 'id', label: 'ID' },
+                        { key: 'username', label: '用户名' },
+                        { key: 'email', label: '邮箱' },
+                        { key: 'nickname', label: '昵称' },
+                        { key: 'roleCode', label: '角色' },
+                        { key: 'state', label: '状态' }
+                    ]"
+                />
             </div>
         </div>
 
         <div class="main-page">
-            <TPagination :current-page="$Data.pagerConfig.currentPage" :page-size="$Data.pagerConfig.pageSize" :total="$Data.pagerConfig.total" @current-change="$Method.onPageChange" @size-change="$Method.handleSizeChange" />
+            <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>
 
         <!-- 编辑对话框组件 -->
@@ -97,30 +74,34 @@ import ILucideRotateCw from '~icons/lucide/rotate-cw';
 import ILucidePencil from '~icons/lucide/pencil';
 import ILucideTrash2 from '~icons/lucide/trash-2';
 import EditDialog from './components/edit.vue';
+import DetailPanel from '@/components/DetailPanel.vue';
 import { $Http } from '@/plugins/http';
+import { withDefaultColumns, withTableProps } from '@/utils';
 
 // 响应式数据
 const $Data = $ref({
     tableData: [],
-    columns: [
+    loading: false,
+    columns: withDefaultColumns([
         {
             colKey: 'row-select',
             type: 'single',
             width: 50,
             fixed: 'left',
-            checkProps: { allowUncheck: true }
+            checkProps: { allowUncheck: true },
+            ellipsis: false
         },
         { colKey: 'username', title: '用户名', width: 150, fixed: 'left' },
         { colKey: 'id', title: '序号', width: 150, align: 'center' },
         { colKey: 'email', title: '邮箱', width: 200 },
         { colKey: 'nickname', title: '昵称', width: 150 },
         { colKey: 'roleCode', title: '角色', width: 120 },
-        { colKey: 'state', title: '状态', width: 100 },
-        { colKey: 'operation', title: '操作', width: 80, align: 'center', fixed: 'right' }
-    ],
+        { colKey: 'state', title: '状态', width: 100, ellipsis: false },
+        { colKey: 'operation', title: '操作', width: 80, align: 'center', fixed: 'right', ellipsis: false }
+    ]),
     pagerConfig: {
         currentPage: 1,
-        pageSize: 30,
+        limit: 30,
         total: 0,
         align: 'right',
         layout: 'total, prev, pager, next, jumper'
@@ -141,10 +122,11 @@ const $Method = {
 
     // 加载管理员列表
     async apiAdminList() {
+        $Data.loading = true;
         try {
             const res = await $Http('/addon/admin/admin/list', {
                 page: $Data.pagerConfig.currentPage,
-                limit: $Data.pagerConfig.pageSize
+                limit: $Data.pagerConfig.limit
             });
             $Data.tableData = res.data.lists || [];
             $Data.pagerConfig.total = res.data.total || 0;
@@ -161,10 +143,9 @@ const $Method = {
             }
         } catch (error) {
             console.error('加载管理员列表失败:', error);
-            MessagePlugin.info({
-                message: '加载数据失败',
-                status: 'error'
-            });
+            MessagePlugin.error('加载数据失败');
+        } finally {
+            $Data.loading = false;
         }
     },
 
@@ -172,20 +153,20 @@ const $Method = {
     async apiAdminDel(row) {
         DialogPlugin.confirm({
             header: '确认删除',
-            body: `确定要删除管理员"${row.username}" 吗？`,
+            body: `确定要删除管理员“${row.username}” 吗？`,
             status: 'warning'
         }).then(async () => {
             try {
                 const res = await $Http('/addon/admin/admin/del', { id: row.id });
                 if (res.code === 0) {
-                    MessagePlugin.info({ message: '删除成功', status: 'success' });
+                    MessagePlugin.success('删除成功');
                     $Method.apiAdminList();
                 } else {
-                    MessagePlugin.info({ message: res.msg || '删除失败', status: 'error' });
+                    MessagePlugin.error(res.msg || '删除失败');
                 }
             } catch (error) {
                 console.error('删除失败:', error);
-                MessagePlugin.info({ message: '删除失败', status: 'error' });
+                MessagePlugin.error('删除失败');
             }
         });
     },
@@ -203,7 +184,7 @@ const $Method = {
 
     // 每页条数改变
     handleSizeChange({ pageSize }) {
-        $Data.pagerConfig.pageSize = pageSize;
+        $Data.pagerConfig.limit = pageSize;
         $Data.pagerConfig.currentPage = 1;
         $Method.apiAdminList();
     },