@befly-addon/admin 1.0.11 → 1.0.13

package/addon.config.json

@@ -8,6 +8,5 @@
     },
     "keywords": ["admin", "backend", "management"],
     "entry": "index.ts",
-    "enabled": true,
     "license": "MIT"
 }

package/apis/admin/list.ts

@@ -1,13 +1,8 @@
-/**
- * 获取管理员列表
- */
-
-import { Yes } from 'befly';
+import { Yes } from 'befly';
 
 export default {
     name: '获取管理员列表',
     handler: async (befly, ctx) => {
-        // 查询所有管理员（框架自动排除password字段，自动转换字段名为小驼峰）
         const result = await befly.db.getList({
             table: 'addon_admin_admin',
             page: ctx.body.page || 1,

package/apis/dashboard/environmentInfo.ts

@@ -11,11 +11,8 @@ export default {
         // 获取数据库版本
         let databaseVersion = 'Unknown';
         try {
-            const versionResult = await befly.db.query({
-                sql: 'SELECT VERSION() as version',
-                type: 'one'
-            });
-            databaseVersion = versionResult.version || 'Unknown';
+            const versionResult = await befly.db.query('SELECT VERSION() as version');
+            databaseVersion = versionResult?.[0]?.version || 'Unknown';
         } catch (error) {
             // 忽略错误
         }

package/apis/dict/list.ts

@@ -7,10 +7,7 @@ export default {
             fields: ['id', 'name', 'code', 'value', 'sort', 'pid', 'description', 'state', 'created_at', 'updated_at'],
             page: ctx.body.page,
             limit: ctx.body.limit,
-            orderBy: [
-                { field: 'sort', direction: 'ASC' },
-                { field: 'id', direction: 'ASC' }
-            ]
+            orderBy: ['sort#ASC', 'id#ASC']
         });
 
         return Yes('操作成功', result);

package/apis/menu/all.ts

@@ -40,7 +40,7 @@ export default {
             if (allMenus.length === 0) {
                 allMenus = await befly.db.getAll({
                     table: 'addon_admin_menu',
-                    fields: ['id', 'pid', 'name', 'path', 'icon', 'type', 'sort'],
+                    fields: ['id', 'pid', 'name', 'path', 'icon', 'sort'],
                     orderBy: ['sort#ASC', 'id#ASC']
                 });
             }

package/apis/menu/list.ts

@@ -5,11 +5,8 @@ export default {
         try {
             const menus = await befly.db.getAll({
                 table: 'addon_admin_menu',
-                fields: ['id', 'name', 'path', 'icon', 'sort', 'pid', 'type', 'state', 'created_at', 'updated_at'],
-                orderBy: [
-                    { field: 'sort', direction: 'ASC' },
-                    { field: 'id', direction: 'ASC' }
-                ]
+                fields: ['id', 'name', 'path', 'icon', 'sort', 'pid', 'state', 'created_at', 'updated_at'],
+                orderBy: ['sort#ASC', 'id#ASC']
             });
 
             return Yes('操作成功', menus);

package/apis/menu/upd.ts

@@ -14,8 +14,7 @@ export default {
                     path: ctx.body.path,
                     icon: ctx.body.icon,
                     sort: ctx.body.sort,
-                    pid: ctx.body.pid,
-                    type: ctx.body.type
+                    pid: ctx.body.pid
                     // state 字段不在此处更新，需要禁用/启用时单独处理
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.0.11",
+    "version": "1.0.13",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
     "private": false,
@@ -38,13 +38,8 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "51d86162e5f0b94ecc44a833a98ebf97c27f7bd6",
+    "gitHead": "82f9de50d3c014ba80f68556da05dadcdc8d4c92",
     "dependencies": {
-        "befly": "3.8.3"
-    },
-    "devDependencies": {
-        "@module-federation/vite": "^1.9.0",
-        "@vitejs/plugin-vue": "^6.0.1",
-        "rolldown-vite": "^7.2.2"
+        "befly": "3.8.5"
     }
 }

package/tables/menu.json

@@ -63,18 +63,5 @@
         "nullable": false,
         "unsigned": true,
         "regexp": null
-    },
-    "type": {
-        "name": "菜单类型",
-        "detail": "",
-        "type": "number",
-        "min": 1,
-        "max": 2,
-        "default": 1,
-        "index": true,
-        "unique": false,
-        "nullable": false,
-        "unsigned": true,
-        "regexp": "^(1|2)$"
     }
 }

package/util.ts

@@ -1,75 +1,71 @@
-/**
- * Admin 插件通用工具函数
- */
-
-import { Logger } from 'befly';
-import type { BeflyContext } from 'befly/types/befly';
-import { readdirSync, statSync, readFileSync } from 'node:fs';
-import path from 'node:path';
-
-/**
- * 输出同步统计信息
- * @param stats - 统计对象
- * @param deletedCount - 删除数量
- * @param resourceName - 资源名称（如：菜单、接口）
- */
-export function logSyncStats(stats: { created: number; updated: number }, deletedCount: number, resourceName: string = '记录'): void {
-    Logger.info(`\n=== ${resourceName}同步完成 ===`);
-    Logger.info(`新增${resourceName}: ${stats.created} 个`);
-    Logger.info(`更新${resourceName}: ${stats.updated} 个`);
-    Logger.info(`删除${resourceName}: ${deletedCount} 个`);
-}
+import type { RouteRecordRaw } from 'vue-router';
 
 /**
- * 获取插件列表
- * @returns 插件列表
+ * 自定义布局处理函数
+ * 根据文件名后缀判断使用哪个布局
+ * @param routes - 原始路由配置
+ * @param inheritLayout - 继承的布局名称（来自父级目录）
+ * @returns 处理后的路由配置
  */
-export function getAddonList(): Array<{ name: string; title: string; version: string; description: string; enabled: boolean }> {
-    const addonList: Array<{ name: string; title: string; version: string; description: string; enabled: boolean }> = [];
+export function Layouts(routes: RouteRecordRaw[], inheritLayout = ''): RouteRecordRaw[] {
+    const result: RouteRecordRaw[] = [];
 
-    // 获取 addons 目录路径
-    const addonsDir = path.join(process.cwd(), 'addons');
+    for (const route of routes) {
+        const currentPath = route.path || '';
 
-    try {
-        const addonNames = readdirSync(addonsDir);
+        // 检查当前路径是否有 _数字 格式
+        const pathMatch = currentPath.match(/_(\d+)$/);
+        const currentLayout = pathMatch ? pathMatch[1] : inheritLayout;
 
-        for (const addonName of addonNames) {
-            const addonPath = path.join(addonsDir, addonName);
-            const stat = statSync(addonPath);
+        // 如果有子路由，递归处理（传递当前布局给子级）
+        if (route.children && route.children.length > 0) {
+            // 清理路径：如果是 xxx_数字 格式，去掉 _数字
+            const cleanPath = pathMatch ? currentPath.replace(/_\d+$/, '') : currentPath;
 
-            // 只处理目录
-            if (!stat.isDirectory()) {
-                continue;
-            }
+            result.push({
+                ...route,
+                path: cleanPath,
+                children: Layouts(route.children, currentLayout)
+            });
+            continue;
+        }
 
-            // 读取插件配置文件
-            const configPath = path.join(addonPath, 'addon.config.json');
+        // 没有子路由的叶子节点，需要包裹布局
+        const lastPart = currentPath;
 
-            try {
-                const configContent = readFileSync(configPath, 'utf-8');
-                const config = JSON.parse(configContent);
+        // 匹配 _数字 格式（如 index_1, news_2）
+        const match = lastPart.match(/_(\d+)$/);
+        // 优先使用文件自己的布局，其次使用继承的布局，最后使用 default
+        const layoutName = match ? match[1] : currentLayout || 'default';
 
-                addonList.push({
-                    name: config.name || addonName,
-                    title: config.title || addonName,
-                    version: config.version || '1.0.0',
-                    description: config.description || '',
-                    enabled: true
-                });
-            } catch (error) {
-                // 配置文件不存在或解析失败，使用默认值
-                addonList.push({
-                    name: addonName,
-                    title: addonName,
-                    version: '1.0.0',
-                    description: '',
-                    enabled: true
-                });
-            }
+        // 计算清理后的路径
+        let cleanPath: string;
+        if (lastPart === 'index' || (lastPart.startsWith('index_') && match)) {
+            // index 或 index_数字 → 改为空路径（由父级路径表示）
+            cleanPath = '';
+        } else if (match) {
+            // xxx_数字 → 去掉 _数字 后缀
+            cleanPath = lastPart.replace(/_\d+$/, '');
+        } else {
+            // 其他 → 保持原样
+            cleanPath = lastPart;
         }
-    } catch (error: any) {
-        Logger.warn(`扫描插件目录失败:`, error?.message || '未知错误');
+
+        // 根据布局名称加载对应组件
+        const layoutComponent = layoutName === 'default' ? () => import('@/layouts/default.vue') : () => import(`@/layouts/${layoutName}.vue`);
+
+        // 包裹布局
+        result.push({
+            path: cleanPath,
+            component: layoutComponent,
+            children: [
+                {
+                    ...route,
+                    path: ''
+                }
+            ]
+        });
     }
 
-    return addonList;
+    return result;
 }

package/views/admin/components/edit.vue

@@ -124,7 +124,7 @@ const $Method = {
             const valid = await date$From.form.validate();
             if (!valid) return;
 
-            const res = await $Http($Prop.actionType === 'upd' ? '/addon/admin/adminUpd' : '/addon/admin/adminIns', $Data.formData);
+            const res = await $Http($Prop.actionType === 'upd' ? '/addon/admin/admin/upd' : '/addon/admin/admin/ins', $Data.formData);
 
             Modal.message({
                 message: $Prop.actionType === 'upd' ? '编辑成功' : '添加成功',

package/views/admin/components/role.vue

@@ -83,7 +83,7 @@ const $Method = {
         if (!$Prop.rowData.id) return;
 
         try {
-            const res = await $Http('/addon/admin/roleDetail', {
+            const res = await $Http('/addon/admin/admin/roleDetail', {
                 adminId: $Prop.rowData.id
             });
             $Data.checkedRoleCode = res.data.roleCode || '';
@@ -100,7 +100,7 @@ const $Method = {
         }
 
         try {
-            const res = await $Http('/addon/admin/roleSave', {
+            const res = await $Http('/addon/admin/admin/roleSave', {
                 adminId: $Prop.rowData.id,
                 roleCode: $Data.checkedRoleCode
             });

package/views/admin/index.vue

@@ -4,7 +4,7 @@
             <div class="left">
                 <tiny-button type="primary" @click="$Method.onAction('add', {})">
                     <template #icon>
-                        <i-lucide:plus style="width: 16px; height: 16px" />
+                        <i-lucide:plus />
                     </template>
                     添加管理员
                 </tiny-button>
@@ -12,14 +12,14 @@
             <div class="right">
                 <tiny-button @click="$Method.handleRefresh">
                     <template #icon>
-                        <i-lucide:rotate-cw style="width: 16px; height: 16px" />
+                        <i-lucide:rotate-cw />
                     </template>
                 </tiny-button>
             </div>
             <div class="right">
                 <tiny-button @click="$Method.handleRefresh">
                     <template #icon>
-                        <i-lucide:rotate-cw style="width: 16px; height: 16px" />
+                        <i-lucide:rotate-cw />
                     </template>
                     刷新
                 </tiny-button>
@@ -109,7 +109,7 @@ const $Method = {
     // 加载管理员列表
     async apiAdminList() {
         try {
-            const res = await $Http('/addon/admin/list', {
+            const res = await $Http('/addon/admin/admin/list', {
                 page: $Data.pagerConfig.currentPage,
                 limit: $Data.pagerConfig.pageSize
             });
@@ -132,7 +132,7 @@ const $Method = {
             status: 'warning'
         }).then(async () => {
             try {
-                const res = await $Http('/addon/admin/del', { id: row.id });
+                const res = await $Http('/addon/admin/admin/del', { id: row.id });
                 if (res.code === 0) {
                     Modal.message({ message: '删除成功', status: 'success' });
                     $Method.apiAdminList();

package/views/dict/index.vue

@@ -4,7 +4,7 @@
             <div class="left">
                 <tiny-button type="primary" @click="$Method.onAction('add', {})">
                     <template #icon>
-                        <i-lucide:plus style="width: 16px; height: 16px" />
+                        <i-lucide:plus />
                     </template>
                     添加字典
                 </tiny-button>
@@ -12,7 +12,7 @@
             <div class="right">
                 <tiny-button @click="$Method.handleRefresh">
                     <template #icon>
-                        <i-lucide:rotate-cw style="width: 16px; height: 16px" />
+                        <i-lucide:rotate-cw />
                     </template>
                     刷新
                 </tiny-button>

package/views/index/components/addonList.vue

@@ -1,13 +1,12 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
+        <div class="section-header flex items-center gap-2">
             <i-lucide:package style="width: 20px; height: 20px" />
             <h2>已安装插件</h2>
         </div>
         <div class="section-content">
             <div class="addon-list">
                 <div v-for="addon in addonList" :key="addon.name" class="addon-item">
-                    <div class="addon-status-badge" :class="{ active: addon.enabled }"></div>
                     <div class="addon-icon">
                         <i-lucide:box style="width: 20px; height: 20px" />
                     </div>

package/views/index/components/environmentInfo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
+        <div class="section-header flex items-center gap-2">
             <i-lucide:server style="width: 20px; height: 20px" />
             <h2>运行环境</h2>
         </div>

package/views/index/components/operationLogs.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
-            <i-lucide:list style="width: 20px; height: 20px" />
+        <div class="section-header flex items-center gap-2">
+            <i-lucide:file-text style="width: 20px; height: 20px" />
             <h2>操作日志</h2>
         </div>
         <div class="section-content">

package/views/index/components/performanceMetrics.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
-            <i-lucide:zap style="width: 20px; height: 20px" />
+        <div class="section-header flex items-center gap-2">
+            <i-lucide:activity style="width: 20px; height: 20px" />
             <h2>性能指标</h2>
         </div>
         <div class="section-content">

package/views/index/components/serviceStatus.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
-            <i-lucide:settings style="width: 20px; height: 20px" />
+        <div class="section-header flex items-center gap-2">
+            <i-lucide:check-circle style="width: 20px; height: 20px" />
             <h2>服务状态</h2>
         </div>
         <div class="section-content">

package/views/index/components/systemNotifications.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
+        <div class="section-header flex items-center gap-2">
             <i-lucide:bell style="width: 20px; height: 20px" />
             <h2>系统通知</h2>
         </div>
@@ -8,11 +8,11 @@
             <div class="notification-compact-list">
                 <div v-for="notification in notifications" :key="notification.id" class="notification-compact-item">
                     <div class="notification-icon" :class="`type-${notification.type}`">
-                        <i-lucide:info v-if="notification.type === 'info'" style="width: 16px; height: 16px" />
-                        <i-lucide:check-circle v-else-if="notification.type === 'success'" style="width: 16px; height: 16px" />
-                        <i-lucide:alert-triangle v-else-if="notification.type === 'warning'" style="width: 16px; height: 16px" />
-                        <i-lucide:x-circle v-else-if="notification.type === 'error'" style="width: 16px; height: 16px" />
-                        <i-lucide:bell v-else style="width: 16px; height: 16px" />
+                        <i-lucide:info v-if="notification.type === 'info'" />
+                        <i-lucide:check-circle v-else-if="notification.type === 'success'" />
+                        <i-lucide:alert-triangle v-else-if="notification.type === 'warning'" />
+                        <i-lucide:x-circle v-else-if="notification.type === 'error'" />
+                        <i-lucide:bell v-else />
                     </div>
                     <div class="notification-content">
                         <span class="notification-title">{{ notification.title }}</span>

package/views/index/components/systemOverview.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
+        <div class="section-header flex items-center gap-2">
             <i-lucide:info style="width: 20px; height: 20px" />
             <h2>系统概览</h2>
         </div>
         <div class="section-content">
-            <tiny-row :flex="true" :gap="12">
+            <tiny-row :flex="true">
                 <tiny-col :xs="24" :sm="12" :md="12" :lg="12">
                     <div class="info-block">
                         <div class="stats-grid">

package/views/index/components/systemResources.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="section-block">
-        <div class="section-header">
+        <div class="section-header flex items-center gap-2">
             <i-lucide:activity style="width: 20px; height: 20px" />
             <h2>系统资源</h2>
         </div>
@@ -8,7 +8,7 @@
             <div class="resource-compact-list">
                 <div class="resource-compact-item">
                     <div class="resource-compact-header">
-                        <i-lucide:cpu style="width: 16px; height: 16px" />
+                        <i-lucide:cpu />
                         <span class="resource-label">CPU</span>
                         <span class="resource-value">{{ systemResources.cpu.usage }}%</span>
                         <span class="resource-desc">{{ systemResources.cpu.cores }}核心</span>
@@ -17,7 +17,7 @@
                 </div>
                 <div class="resource-compact-item">
                     <div class="resource-compact-header">
-                        <i-lucide:hard-drive style="width: 16px; height: 16px" />
+                        <i-lucide:hard-drive />
                         <span class="resource-label">内存</span>
                         <span class="resource-value">{{ systemResources.memory.percentage }}%</span>
                         <span class="resource-desc">{{ systemResources.memory.used }}GB / {{ systemResources.memory.total }}GB</span>
@@ -26,7 +26,7 @@
                 </div>
                 <div class="resource-compact-item">
                     <div class="resource-compact-header">
-                        <i-lucide:disc style="width: 16px; height: 16px" />
+                        <i-lucide:disc />
                         <span class="resource-label">磁盘</span>
                         <span class="resource-value">{{ systemResources.disk.percentage }}%</span>
                         <span class="resource-desc">{{ systemResources.disk.used }}GB / {{ systemResources.disk.total }}GB</span>

package/views/index/index.vue

@@ -25,5 +25,8 @@ import EnvironmentInfo from './components/environmentInfo.vue';
     height: 100%;
     background-color: #fff;
     padding: 15px;
+    border: 1px solid #e8eaed;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+    border-radius: 8px;
 }
 </style>

package/views/menu/components/edit.vue

@@ -10,12 +10,6 @@
             <tiny-form-item label="图标" prop="icon">
                 <tiny-input v-model="$Data.formData.icon" placeholder="请输入图标名称，如：User" />
             </tiny-form-item>
-            <tiny-form-item label="菜单类型" prop="type">
-                <tiny-radio-group v-model="$Data.formData.type">
-                    <tiny-radio :label="0">目录</tiny-radio>
-                    <tiny-radio :label="1">菜单</tiny-radio>
-                </tiny-radio-group>
-            </tiny-form-item>
             <tiny-form-item label="排序" prop="sort">
                 <tiny-numeric v-model="$Data.formData.sort" :min="0" :max="9999" />
             </tiny-form-item>
@@ -66,8 +60,8 @@ const $Data = $ref({
         name: '',
         path: '',
         icon: '',
-        type: 1,
         sort: 0,
+        pid: 0,
         state: 1
     }
 });
@@ -75,8 +69,7 @@ const $Data = $ref({
 const $Data2 = $shallowRef({
     formRules: {
         name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
-        path: [{ required: true, message: '请输入菜单路径', trigger: 'blur' }],
-        type: [{ required: true, message: '请选择菜单类型', trigger: 'change' }]
+        path: [{ required: true, message: '请输入菜单路径', trigger: 'blur' }]
     }
 });
 
@@ -91,10 +84,9 @@ const $Method = {
         if ($Prop.actionType === 'upd' && $Prop.rowData) {
             $Data.formData.id = $Prop.rowData.id || 0;
             $Data.formData.name = $Prop.rowData.name || '';
-            $Data.formData.path = $Prop.rowData.path || '';
-            $Data.formData.icon = $Prop.rowData.icon || '';
-            $Data.formData.type = $Prop.rowData.type ?? 1;
-            $Data.formData.sort = $Prop.rowData.sort || 0;
+            $Data.formData.path = $Prop.rowData.path ?? '';
+            $Data.formData.icon = $Prop.rowData.icon ?? '';
+            $Data.formData.sort = $Prop.rowData.sort ?? 0;
             $Data.formData.state = $Prop.rowData.state ?? 1;
         } else {
             // 重置表单
@@ -102,7 +94,6 @@ const $Method = {
             $Data.formData.name = '';
             $Data.formData.path = '';
             $Data.formData.icon = '';
-            $Data.formData.type = 1;
             $Data.formData.sort = 0;
             $Data.formData.state = 1;
         }

package/views/menu/index.vue

@@ -4,7 +4,7 @@
             <div class="left">
                 <tiny-button type="primary" @click="$Method.onAction('add', {})">
                     <template #icon>
-                        <i-lucide:plus style="width: 16px; height: 16px" />
+                        <i-lucide:plus />
                     </template>
                     添加菜单
                 </tiny-button>
@@ -12,7 +12,7 @@
             <div class="right">
                 <tiny-button @click="$Method.handleRefresh">
                     <template #icon>
-                        <i-lucide:rotate-cw style="width: 16px; height: 16px" />
+                        <i-lucide:rotate-cw />
                     </template>
                     刷新
                 </tiny-button>
@@ -25,16 +25,10 @@
                 <tiny-grid-column field="path" title="路径" :width="200" />
                 <tiny-grid-column field="icon" title="图标" :width="100">
                     <template #default="{ row }">
-                        <i-lucide:square v-if="row.icon" style="width: 16px; height: 16px" />
+                        <i-lucide:square v-if="row.icon" />
                         <span v-else>-</span>
                     </template>
                 </tiny-grid-column>
-                <tiny-grid-column field="type" title="类型" :width="100">
-                    <template #default="{ row }">
-                        <tiny-tag v-if="row.type === 0" type="info">目录</tiny-tag>
-                        <tiny-tag v-else type="success">菜单</tiny-tag>
-                    </template>
-                </tiny-grid-column>
                 <tiny-grid-column field="sort" title="排序" :width="80" />
                 <tiny-grid-column field="state" title="状态" :width="100">
                     <template #default="{ row }">

package/views/role/index.vue

@@ -4,7 +4,7 @@
             <div class="left">
                 <tiny-button type="primary" @click="$Method.onAction('add', {})">
                     <template #icon>
-                        <i-lucide:plus style="width: 16px; height: 16px" />
+                        <i-lucide:plus />
                     </template>
                     添加角色
                 </tiny-button>
@@ -12,7 +12,7 @@
             <div class="right">
                 <tiny-button @click="$Method.handleRefresh">
                     <template #icon>
-                        <i-lucide:rotate-cw style="width: 16px; height: 16px" />
+                        <i-lucide:rotate-cw />
                     </template>
                     刷新
                 </tiny-button>

package/views/user/index.vue

@@ -5,7 +5,7 @@
             <div class="toolbar-left">
                 <t-button theme="primary" @click="$Method.handleAdd">
                     <template #icon>
-                        <i-lucide:plus style="width: 16px; height: 16px" />
+                        <i-lucide:plus />
                     </template>
                     添加管理员
                 </t-button>
@@ -16,13 +16,13 @@
                     <t-select v-model="$Data.searchState" placeholder="状态" clearable style="width: 120px" :options="$Data.stateOptions" @change="$Method.handleSearch" />
                     <t-button theme="default" @click="$Method.handleSearch">
                         <template #icon>
-                            <i-lucide:search style="width: 16px; height: 16px" />
+                            <i-lucide:search />
                         </template>
                         搜索
                     </t-button>
                     <t-button theme="default" @click="$Method.handleReset">
                         <template #icon>
-                            <i-lucide:rotate-cw style="width: 16px; height: 16px" />
+                            <i-lucide:rotate-cw />
                         </template>
                         重置
                     </t-button>