@befly-addon/admin 1.0.26 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.0.26",
+    "version": "1.0.28",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
     "private": false,
@@ -18,8 +18,9 @@
         "apis/",
         "tables/",
         "views/",
+        "utils/",
+        "types/",
         "addon.config.json",
-        "util.ts",
         "README.md",
         "package.json",
         "menu.json"
@@ -39,7 +40,7 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "ca96814c3b67376809086cd8bef8e7816b736483",
+    "gitHead": "62797bf96f317ff0e666db73b4edac4435a6ed35",
     "dependencies": {
         "befly": "3.8.12"
     }

package/types/layout.ts

@@ -0,0 +1,12 @@
+import type { RouteRecordRaw, Component } from 'vue-router';
+
+/**
+ * 布局配置接口
+ */
+export interface LayoutConfig {
+    path: string;
+    layoutName: string;
+    component: Component;
+    children?: LayoutConfig[];
+    meta?: Record<string, any>;
+}

package/{util.ts → utils/layouts.ts}

@@ -1,15 +1,5 @@
-import type { RouteRecordRaw, Component } from 'vue-router';
-
-/**
- * 布局配置接口
- */
-export interface LayoutConfig {
-    path: string;
-    layoutName: string;
-    component: Component;
-    children?: LayoutConfig[];
-    meta?: Record<string, any>;
-}
+import type { RouteRecordRaw } from 'vue-router';
+import type { LayoutConfig } from '../types/layout';
 
 /**
  * 自定义布局处理函数
@@ -28,18 +18,21 @@ export function Layouts(routes: RouteRecordRaw[], inheritLayout = ''): LayoutCon
         const pathMatch = currentPath.match(/_(\d+)$/);
         const currentLayout = pathMatch ? pathMatch[1] : inheritLayout;
 
-        // 如果有子路由，递归处理（传递当前布局给子级）
+        // 如果有子路由，说明这是中间节点（目录），不包裹布局，只递归处理子路由
         if (route.children && route.children.length > 0) {
             // 清理路径：如果是 xxx_数字 格式，去掉 _数字
             const cleanPath = pathMatch ? currentPath.replace(/_\d+$/, '') : currentPath;
 
-            result.push({
-                path: cleanPath,
-                layoutName: currentLayout || 'default',
-                component: route.component!,
-                children: Layouts(route.children, currentLayout),
-                meta: route.meta
-            });
+            // 直接递归处理子路由，不添加当前层级到结果
+            const childConfigs = Layouts(route.children, currentLayout);
+
+            // 将子路由的路径前缀加上当前路径
+            for (const child of childConfigs) {
+                result.push({
+                    ...child,
+                    path: cleanPath ? `${cleanPath}/${child.path}`.replace(/\/+/g, '/') : child.path
+                });
+            }
             continue;
         }
 

package/utils/scanBeflyAddonViews.ts

@@ -0,0 +1,43 @@
+import { readdirSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
+
+/**
+ * 扫描所有 @befly-addon 包的 views 目录
+ * 用于 unplugin-vue-router 的 routesFolder 配置
+ * 注意：此函数只能在 vite.config.ts 中使用（Node.js 环境），不能在浏览器中使用
+ * @returns 路由文件夹配置数组
+ */
+export function scanBeflyAddonViews() {
+    // 使用绝对路径：基于项目根目录（process.cwd()）
+    const projectRoot = process.cwd();
+    const addonBasePath = join(projectRoot, 'node_modules', '@befly-addon');
+    const routesFolders: Array<{ src: string; path: string }> = [];
+
+    if (!existsSync(addonBasePath)) {
+        return routesFolders;
+    }
+
+    try {
+        const addonDirs = readdirSync(addonBasePath);
+
+        for (const addonName of addonDirs) {
+            const addonPath = join(addonBasePath, addonName);
+
+            // 检查是否为目录（包括符号链接）
+            if (!existsSync(addonPath)) continue;
+
+            const viewsPath = join(addonPath, 'views');
+
+            if (existsSync(viewsPath)) {
+                routesFolders.push({
+                    src: viewsPath,
+                    path: `addon/${addonName}/`
+                });
+            }
+        }
+    } catch (error) {
+        console.error('扫描 @befly-addon 目录失败:', error);
+    }
+
+    return routesFolders;
+}