befly-admin 3.3.0 → 3.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-admin",
-    "version": "3.3.0",
+    "version": "3.3.3",
     "description": "Befly Admin - 基于 Vue3 + OpenTiny Vue 的后台管理系统",
     "type": "module",
     "private": false,
@@ -17,6 +17,7 @@
     "dependencies": {
         "@opentiny/vue": "3.26.0",
         "axios": "1.12.2",
+        "befly-auto-routes": "^1.0.2",
         "lucide-vue-next": "0.546.0",
         "pinia": "3.0.3",
         "vue": "3.5.22",
@@ -38,5 +39,5 @@
         "node": ">=22.0.0",
         "pnpm": ">=9.0.0"
     },
-    "gitHead": "24b35d0ef83d78db3dea67784e052516d4a83fc5"
+    "gitHead": "851fbebc2d12dc550ebe06d6fa28b8aa769ed3ce"
 }

package/src/plugins/router.ts

@@ -1,5 +1,5 @@
 import { createRouter, createWebHashHistory } from 'vue-router';
-import autoRoutes from 'virtual:auto-routes';
+import autoRoutes from 'virtual:befly-auto-routes';
 import { $Storage } from './storage';
 
 /**

package/vite.config.ts

@@ -5,7 +5,7 @@ import ReactivityTransform from '@vue-macros/reactivity-transform/vite';
 import AutoImport from 'unplugin-auto-import/vite';
 import Components from 'unplugin-vue-components/vite';
 import { TinyVueSingleResolver } from '@opentiny/unplugin-tiny-vue';
-import autoRouter from './libs/autoRouter';
+import autoRoutes from 'befly-auto-routes';
 
 // https://vite.dev/config/
 export default defineConfig({
@@ -14,7 +14,7 @@ export default defineConfig({
         // Vue 响应式语法糖
         ReactivityTransform(),
         // 自动路由插件
-        autoRouter(),
+        autoRoutes({ debug: true }),
         // 自动导入 Vue3 API 和组合式函数
         AutoImport({
             imports: [

package/libs/auto-routes-template.js

@@ -1,104 +0,0 @@
-// 模板文件：自动路由生成结果基模板
-// 说明：
-//   目录固定：src/views ；布局目录固定：src/layouts
-//   仅识别 views/<name>/<name>.vue 结构；index 为根路径
-//   固定排除子目录：components
-//   不区分公开/私有路由，全部挂到对应布局（文件名后缀 *_n.vue 指定布局 n，默认 0）
-
-// 在虚拟模块环境中，统一使用绝对形式 '/src/...'
-// 支持多级目录：新规则
-//   1. 任意目录下的 index.vue 代表该目录的“默认路由”，不再附加文件段：/news/index.vue -> /news
-//   2. 非 index.vue 页面，路径 = 所有目录段 + 文件名：/news/detail/detail.vue -> /news/detail/detail
-//      即使文件名与末级目录同名亦需保留（区别于旧规则会省略重复）
-//   3. 根目录 index.vue -> '/'
-//   4. 布局后缀规则：只允许出现在“页面文件名”末尾：<name>_n.vue；目录名不再解析布局编号
-//   5. 任何层级的 components 子目录下文件忽略
-//   6. 大小写驼峰与下划线会被 kebab 化
-// 示例：
-//   /src/views/news/index.vue              => /news
-//   /src/views/news/detail/detail.vue      => /news/detail/detail
-//   /src/views/user/profile/index.vue      => /user/profile
-//   /src/views/user/profile/edit.vue       => /user/profile/edit
-//   /src/views/index.vue                   => /
-//   /src/views/dashboard_2/index.vue       => /dashboard  (布局2)
-//   /src/views/dashboard_2/analysis.vue    => /dashboard/analysis  (布局2)
-const viewFiles = import.meta.glob('/src/views/**/*.vue');
-const layoutFiles = import.meta.glob('/src/layouts/*.vue');
-
-const layoutRoutes = {};
-
-function normalizePath(p) {
-    return p.replace(/\\/g, '/');
-}
-function extractLayoutFromFile(baseName) {
-    const m = baseName.match(/_(\d+)$/);
-    if (m) return { name: baseName.replace(/_(\d+)$/, ''), layout: m[1] };
-    return { name: baseName, layout: '0' };
-}
-function toKebab(s) {
-    return s
-        .replace(/([a-z])([A-Z])/g, '$1-$2') // camelCase -> camel-Case
-        .replace(/[\s_]+/g, '-') // 空白或下划线 -> -
-        .toLowerCase()
-        .replace(/-+/g, '-') // 合并多余 -
-        .replace(/^|-$/g, ''); // 去首尾 -
-}
-function buildPath(name) {
-    return name === 'index' ? '/' : '/' + toKebab(name);
-}
-function buildName(name) {
-    return toKebab(name);
-}
-// 不再区分公开路由，全部放入对应布局
-
-for (const fp in viewFiles) {
-    const normPath = normalizePath(fp);
-    if (!normPath.endsWith('.vue')) continue;
-    if (normPath.includes('/components/')) continue;
-    const rootMarker = '/src/views/';
-    const idx = normPath.indexOf(rootMarker);
-    if (idx === -1) continue;
-    const rel = normPath.slice(idx + rootMarker.length); // 相对 views 的路径
-    const parts = rel.split('/');
-    const fileName = parts.pop(); // <name>.vue 或 index.vue
-    if (!fileName) continue;
-    const rawBase = fileName.replace(/\.vue$/, '');
-    const { name: logicalBase, layout } = extractLayoutFromFile(rawBase);
-    const dirChainOriginal = parts; // 目录数组（可能为空）
-    if (dirChainOriginal.some((d) => d === 'components')) continue;
-    // 目录链直接使用原目录（不再剥离布局后缀）
-    const dirChainForPath = dirChainOriginal;
-    // index / index_n 作为目录默认：不追加文件名；非 index 保留
-    const pathSegments = [...dirChainForPath];
-    if (logicalBase !== 'index') pathSegments.push(logicalBase);
-    // root index 情况：views/index.vue => []
-    if (pathSegments.length === 1 && pathSegments[0] === 'index') pathSegments.pop();
-    // kebab 化
-    const kebabSegments = pathSegments.map(toKebab).filter(Boolean);
-    const routePath = '/' + kebabSegments.join('/');
-    const routeName = kebabSegments.length ? kebabSegments.join('-') : 'index';
-    const route = { path: routePath === '/' ? '/' : routePath, name: routeName, component: viewFiles[fp], meta: { title: routeName, file: fp } };
-    if (!layoutRoutes[layout]) layoutRoutes[layout] = [];
-    if (!layoutRoutes[layout].some((r) => r.path === route.path)) layoutRoutes[layout].push(route);
-}
-const finalRoutes = [];
-for (const k in layoutRoutes) {
-    const lp = '/src/layouts/' + k + '.vue';
-    const comp = layoutFiles[lp];
-    if (comp) {
-        finalRoutes.push({ path: '/', name: 'layout' + k, component: comp, children: layoutRoutes[k] });
-    }
-}
-// 开发环境下在浏览器控制台打印一次路由结果
-if (typeof window !== 'undefined' && import.meta && import.meta.env && import.meta.env.DEV) {
-    // 使用 setTimeout 避免与其他插件初始化竞争
-    setTimeout(() => {
-        // eslint-disable-next-line no-console
-        console.log(
-            '[auto-routes] 当前生成路由:',
-            finalRoutes.map((r) => ({ layout: r.name, children: r.children?.map((c) => ({ path: c.path, name: c.name, file: c.meta?.file })) }))
-        );
-    }, 0);
-}
-
-export default finalRoutes;

package/libs/autoRouter.ts

@@ -1,67 +0,0 @@
-import type { Plugin, HmrContext } from 'vite';
-import { readFileSync } from 'fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'path';
-
-/**
- * 自动路由生成插件
- * 逻辑放在外部模板文件 `auto-routes-template.js` 中，通过占位符替换实现：
- */
-// 固定：视图目录 src/views；布局目录 src/layouts；排除目录 ['components']；不区分公开路由；模板已为最终可执行代码，不再做占位符替换。
-export default function autoRouter(): Plugin {
-    const virtualModuleId = 'virtual:auto-routes';
-    const resolvedVirtualModuleId = '\0' + virtualModuleId;
-    // 目录固定，无需配置
-
-    // 模板路径：基于当前文件所在目录，避免 process.cwd() 导致嵌套 workspace 时的重复路径问题
-    const thisDir = dirname(fileURLToPath(import.meta.url));
-    const templatePath = resolve(thisDir, 'auto-routes-template.js');
-
-    // 缓存与状态
-    let cached = '';
-    let loadError = false;
-
-    function readTemplate() {
-        try {
-            const content = readFileSync(templatePath, 'utf-8');
-            cached = content;
-            loadError = false;
-        } catch (e) {
-            loadError = true;
-            cached = `console.error('[auto-routes] 模板读取失败: ${templatePath}');export default [];`;
-        }
-    }
-
-    // 初次读取
-    readTemplate();
-
-    return {
-        name: 'auto-router',
-        enforce: 'pre',
-        resolveId(id) {
-            if (id === virtualModuleId) return resolvedVirtualModuleId;
-        },
-        buildStart() {
-            // 监听模板文件
-            try {
-                this.addWatchFile(templatePath);
-            } catch {}
-        },
-        handleHotUpdate(ctx: HmrContext) {
-            if (ctx.file === templatePath) {
-                const before = cached;
-                readTemplate();
-                if (cached !== before) {
-                    this.invalidate(resolvedVirtualModuleId);
-                }
-            }
-        },
-        load(id) {
-            if (id !== resolvedVirtualModuleId) return;
-            if (loadError || !cached) {
-                readTemplate();
-            }
-            return cached;
-        }
-    };
-}