befly-admin 3.5.36 → 3.6.0

package/package.json

@@ -1,35 +1,41 @@
 {
     "name": "befly-admin",
-    "version": "3.5.36",
+    "version": "3.6.0",
+    "gitHead": "faa8189c7d23cf45885c03d1425cba8f5bf45df9",
     "private": false,
     "description": "Befly Admin - 基于 Vue3 + TDesign Vue Next 的后台管理系统",
-    "type": "module",
     "files": [
         ".env",
         ".env.development",
         ".env.production",
         ".gitignore",
-        "README.md",
         "bunfig.toml",
         "index.html",
         "public",
+        "README.md",
         "src",
         "vite.config.js"
     ],
+    "type": "module",
+    "publishConfig": {
+        "access": "public",
+        "registry": "https://registry.npmjs.org"
+    },
     "scripts": {
         "dev": "vite",
         "build": "vite build",
         "preview": "vite preview"
     },
     "dependencies": {
-        "@befly-addon/admin": "^1.1.34",
-        "@iconify-json/lucide": "^1.2.80",
+        "@befly-addon/admin": "^1.2.0",
+        "@iconify-json/lucide": "^1.2.82",
         "axios": "^1.13.2",
-        "befly-vite": "^1.1.12",
+        "befly-shared": "1.0.0",
+        "befly-vite": "^1.2.0",
         "pinia": "^3.0.4",
         "tdesign-vue-next": "^1.17.7",
         "unplugin-vue-router": "^0.19.0",
-        "vite": "^8.0.0-beta.3",
+        "vite": "^8.0.0-beta.5",
         "vue": "^3.5.26",
         "vue-router": "^4.6.4"
     },
@@ -37,10 +43,5 @@
         "bun": ">=1.3.0",
         "node": ">=24.0.0",
         "pnpm": ">=10.0.0"
-    },
-    "publishConfig": {
-        "access": "public",
-        "registry": "https://registry.npmjs.org"
-    },
-    "gitHead": "d3b9b53e96eef8b4157e7a639e21fed9b90aafb5"
+    }
 }

package/src/layouts/default.vue

@@ -75,9 +75,8 @@
 </template>
 
 <script setup>
-import { arrayToTree } from "befly-vite/utils/arrayToTree";
-
 import { DialogPlugin } from "tdesign-vue-next";
+import { arrayToTree } from "befly-shared/utils/arrayToTree";
 
 const router = useRouter();
 const route = useRoute();
@@ -94,6 +93,26 @@ const normalizePath = (path) => {
     return normalized.length === 0 ? "/" : normalized;
 };
 
+// parentPath 的归一化规则与 path 不同：
+// - parentPath 为空/"/" 视为根节点（空字符串）
+// - 避免把所有一级菜单挂到 "/"（首页）下面
+const normalizeParentPath = (parentPath) => {
+    if (typeof parentPath !== "string") {
+        return "";
+    }
+
+    const normalized = parentPath.replace(/\/+$/, "");
+    if (normalized.length === 0) {
+        return "";
+    }
+
+    if (normalized === "/") {
+        return "";
+    }
+
+    return normalized;
+};
+
 const $From = {
     treeMenuRef: null
 };
@@ -152,7 +171,7 @@ const $Method = {
 
                 bizMenus.push({
                     id: `biz_${path.replace(/[^a-zA-Z0-9]+/g, "_")}`,
-                    pid: "biz",
+                    parentPath: "__biz__",
                     name: title,
                     path: path
                 });
@@ -165,23 +184,30 @@ const $Method = {
                     ? [
                           {
                               id: "biz",
-                              pid: 0,
+                              parentPath: "",
                               name: "业务",
-                              path: ""
+                              path: "__biz__",
+                              sort: 2
                           }
-                      ].concat(bizMenus)
+                      ].concat(
+                          bizMenus.map((m) => {
+                              return Object.assign({}, m, { sort: 2 });
+                          })
+                      )
                     : [];
 
             const normalizedLists = lists.map((menu) => {
                 const menuPath = normalizePath(menu?.path);
-                return Object.assign({}, menu, { path: menuPath });
+                const menuParentPath = normalizeParentPath(menu?.parentPath);
+                return Object.assign({}, menu, { path: menuPath, parentPath: menuParentPath });
             });
 
             const mergedLists = bizMenusFlat.concat(normalizedLists);
 
-            // 保存一维数据（data 是 { lists: [] } 格式）
-            $Data.userMenusFlat = mergedLists;
-            $Data.userMenus = arrayToTree(mergedLists);
+            const treeResult = arrayToTree(mergedLists, "path", "parentPath", "children", "sort");
+
+            $Data.userMenusFlat = treeResult.flat;
+            $Data.userMenus = treeResult.tree;
             $Method.setActiveMenu();
         } catch (error) {
             MessagePlugin.error("获取用户菜单失败");
@@ -208,15 +234,21 @@ const $Method = {
         const expandedKeys = [];
         let menu = currentMenu;
 
-        // 向上查找所有父级
-        while (menu.pid) {
-            const parent = $Data.userMenusFlat.find((m) => m.id === menu.pid);
+        // 向上查找所有父级（通过 parentPath 关联）
+        while (typeof menu.parentPath === "string" && menu.parentPath.length > 0) {
+            const parent = $Data.userMenusFlat.find((m) => {
+                const parentMenuPath = normalizePath(m?.path);
+                const currentParentPath = normalizeParentPath(menu?.parentPath);
+                return parentMenuPath === currentParentPath;
+            });
+
             if (parent) {
                 expandedKeys.unshift(String(parent.id));
                 menu = parent;
-            } else {
-                break;
+                continue;
             }
+
+            break;
         }
 
         // 设置展开的父级和当前激活的菜单

package/src/plugins/config.js

@@ -21,7 +21,7 @@ export const $Config = {
     loginPath: import.meta.env.VITE_LOGIN_PATH || "/addon/admin/login",
 
     /** 首页路径（可通过 VITE_HOME_PATH 覆盖） */
-    homePath: import.meta.env.VITE_HOME_PATH || "/dashboard",
+    homePath: import.meta.env.VITE_HOME_PATH || "/addon/admin",
     /** 是否开发环境 */
     isDev: import.meta.env.DEV,
     /** 是否生产环境 */

package/src/types/typed-router.d.ts

@@ -142,13 +142,6 @@ declare module 'vue-router/auto-routes' {
       Record<never, never>,
       | never
     >,
-    '/dashboard/': RouteRecordInfo<
-      '/dashboard/',
-      '/dashboard',
-      Record<never, never>,
-      Record<never, never>,
-      | never
-    >,
     '/index2': RouteRecordInfo<
       '/index2',
       '/index2',
@@ -169,114 +162,108 @@ declare module 'vue-router/auto-routes' {
    * @internal
    */
   export interface _RouteFileInfoMap {
-    '../addonAdmin/views/index/index.vue': {
+    '../addonAdmin/adminViews/index/index.vue': {
       routes:
         | '/addon/admin//'
       views:
         | never
     }
-    '../addonAdmin/views/403_1/index.vue': {
+    '../addonAdmin/adminViews/403_1/index.vue': {
       routes:
         | '/addon/admin/403_1/'
       views:
         | never
     }
-    '../addonAdmin/views/config/index.vue': {
+    '../addonAdmin/adminViews/config/index.vue': {
       routes:
         | '/addon/admin/config/'
       views:
         | never
     }
-    '../addonAdmin/views/config/dict/index.vue': {
+    '../addonAdmin/adminViews/config/dict/index.vue': {
       routes:
         | '/addon/admin/config/dict/'
       views:
         | never
     }
-    '../addonAdmin/views/config/dictType/index.vue': {
+    '../addonAdmin/adminViews/config/dictType/index.vue': {
       routes:
         | '/addon/admin/config/dictType/'
       views:
         | never
     }
-    '../addonAdmin/views/config/system/index.vue': {
+    '../addonAdmin/adminViews/config/system/index.vue': {
       routes:
         | '/addon/admin/config/system/'
       views:
         | never
     }
-    '../addonAdmin/views/log/index.vue': {
+    '../addonAdmin/adminViews/log/index.vue': {
       routes:
         | '/addon/admin/log/'
       views:
         | never
     }
-    '../addonAdmin/views/log/email/index.vue': {
+    '../addonAdmin/adminViews/log/email/index.vue': {
       routes:
         | '/addon/admin/log/email/'
       views:
         | never
     }
-    '../addonAdmin/views/log/login/index.vue': {
+    '../addonAdmin/adminViews/log/login/index.vue': {
       routes:
         | '/addon/admin/log/login/'
       views:
         | never
     }
-    '../addonAdmin/views/log/operate/index.vue': {
+    '../addonAdmin/adminViews/log/operate/index.vue': {
       routes:
         | '/addon/admin/log/operate/'
       views:
         | never
     }
-    '../addonAdmin/views/login_1/index.vue': {
+    '../addonAdmin/adminViews/login_1/index.vue': {
       routes:
         | '/addon/admin/login_1/'
       views:
         | never
     }
-    '../addonAdmin/views/people/index.vue': {
+    '../addonAdmin/adminViews/people/index.vue': {
       routes:
         | '/addon/admin/people/'
       views:
         | never
     }
-    '../addonAdmin/views/people/admin/index.vue': {
+    '../addonAdmin/adminViews/people/admin/index.vue': {
       routes:
         | '/addon/admin/people/admin/'
       views:
         | never
     }
-    '../addonAdmin/views/permission/index.vue': {
+    '../addonAdmin/adminViews/permission/index.vue': {
       routes:
         | '/addon/admin/permission/'
       views:
         | never
     }
-    '../addonAdmin/views/permission/api/index.vue': {
+    '../addonAdmin/adminViews/permission/api/index.vue': {
       routes:
         | '/addon/admin/permission/api/'
       views:
         | never
     }
-    '../addonAdmin/views/permission/menu/index.vue': {
+    '../addonAdmin/adminViews/permission/menu/index.vue': {
       routes:
         | '/addon/admin/permission/menu/'
       views:
         | never
     }
-    '../addonAdmin/views/permission/role/index.vue': {
+    '../addonAdmin/adminViews/permission/role/index.vue': {
       routes:
         | '/addon/admin/permission/role/'
       views:
         | never
     }
-    'src/views/dashboard/index.vue': {
-      routes:
-        | '/dashboard/'
-      views:
-        | never
-    }
     'src/views/index2.vue': {
       routes:
         | '/index2'

package/src/views/dashboard/index.vue

@@ -1,117 +0,0 @@
-<template>
-    <div class="dashboard">
-        <div class="header">
-            <div class="title">工作台</div>
-            <div class="desc">这里是业务首页（admin 自有页面），系统管理功能仍在 /addon/admin/*。</div>
-        </div>
-
-        <div class="cards">
-            <TCard class="card" title="今日概览" :bordered="false">
-                <div class="kv">
-                    <div class="item">
-                        <div class="k">新增用户</div>
-                        <div class="v">—</div>
-                    </div>
-                    <div class="item">
-                        <div class="k">新增订单</div>
-                        <div class="v">—</div>
-                    </div>
-                    <div class="item">
-                        <div class="k">待处理事项</div>
-                        <div class="v">—</div>
-                    </div>
-                </div>
-            </TCard>
-
-            <TCard class="card" title="快捷入口" :bordered="false">
-                <div class="quick">
-                    <TButton theme="primary" variant="base" @click="$Method.goSystem">进入系统管理</TButton>
-                    <TButton theme="default" variant="outline" @click="$Method.refresh">刷新</TButton>
-                </div>
-            </TCard>
-        </div>
-    </div>
-</template>
-
-<script setup>
-import { Button as TButton, Card as TCard } from "tdesign-vue-next";
-
-definePage({
-    meta: {
-        title: "工作台",
-        layout: "default"
-    }
-});
-
-const router = useRouter();
-
-const $Method = {
-    goSystem() {
-        router.push("/addon/admin");
-    },
-    refresh() {
-        window.location.reload();
-    }
-};
-</script>
-
-<style scoped lang="scss">
-.dashboard {
-    padding: 16px;
-}
-
-.header {
-    padding: 12px 0;
-
-    .title {
-        font-size: 18px;
-        font-weight: 600;
-        color: var(--text-primary);
-        margin-bottom: 6px;
-    }
-
-    .desc {
-        font-size: 12px;
-        color: var(--text-secondary);
-    }
-}
-
-.cards {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
-    gap: 12px;
-}
-
-.card {
-    border-radius: var(--border-radius-large);
-}
-
-.kv {
-    display: grid;
-    grid-template-columns: repeat(3, minmax(0, 1fr));
-    gap: 12px;
-
-    .item {
-        padding: 10px 12px;
-        border-radius: var(--border-radius);
-        background: var(--bg-color-page);
-
-        .k {
-            font-size: 12px;
-            color: var(--text-secondary);
-            margin-bottom: 8px;
-        }
-
-        .v {
-            font-size: 18px;
-            font-weight: 600;
-            color: var(--text-primary);
-        }
-    }
-}
-
-.quick {
-    display: flex;
-    gap: 10px;
-}
-</style>