befly-admin 3.4.30 → 3.4.31

package/bunfig.toml

@@ -1,4 +1,2 @@
 [install]
 linker = "isolated"
-
-publicHoistPattern = ["@types*", "*eslint*", "@opentiny/*"]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-admin",
-    "version": "3.4.30",
+    "version": "3.4.31",
     "description": "Befly Admin - 基于 Vue3 + OpenTiny Vue 的后台管理系统",
     "type": "module",
     "private": false,
@@ -29,13 +29,14 @@
         "sync:admin": "bunx befly sync:admin"
     },
     "dependencies": {
+        "@befly-addon/admin": "1.0.33",
         "axios": "^1.13.2",
         "pinia": "^3.0.4",
+        "tdesign-vue-next": "^1.10.6",
         "vue": "^3.5.22",
         "vue-router": "^4.6.3"
     },
     "devDependencies": {
-        "@befly-addon/admin": "1.0.32",
         "@iconify-json/lucide": "^1.2.72",
         "@unocss/preset-attributify": "^66.5.6",
         "@unocss/preset-uno": "^66.5.6",
@@ -56,5 +57,5 @@
         "node": ">=24.0.0",
         "pnpm": ">=10.0.0"
     },
-    "gitHead": "7f8bd9dc5342e59953997d58e6abf6ca2469b211"
+    "gitHead": "e4130ff7b23ea4f0913969220c6374d550d2acc5"
 }

package/src/layouts/default.vue

@@ -9,26 +9,43 @@
                 <div class="user-info-bar">
                     <div class="user-text">
                         <span class="user-name">{{ $Data.userInfo.nickname || '管理员' }}</span>
-                        <tiny-tag type="info" size="small">{{ $Data.userInfo.role || '超级管理员' }}</tiny-tag>
+                        <t-tag theme="primary" size="small" variant="light">{{ $Data.userInfo.role || '超级管理员' }}</t-tag>
                     </div>
-                    <tiny-button size="medium" :icon="iconClose()" @click="$Method.handleLogout" />
+                    <t-button variant="text" size="medium" @click="$Method.handleLogout">
+                        <template #icon>
+                            <i-lucide:x />
+                        </template>
+                    </t-button>
                 </div>
             </div>
         </div>
 
         <!-- 菜单栏 -->
         <div class="layout-menu">
-            <tiny-tree-menu :ref="(el) => ($From.treeMenuRef = el)" :data="$Data.userMenus" :props="{ label: 'name' }" node-key="id" :node-height="40" :show-filter="false" :default-expanded-keys="$Data.expandedKeys" style="height: 100%" only-check-children width-adapt @node-click="$Method.onMenuClick">
-                <template #default="{ data }">
-                    <span class="menu-item">
-                        <!-- 根据路径和是否有子节点显示不同图标 -->
-                        <i-lucide:home v-if="data.path === '/addon/admin/'" />
-                        <i-lucide:folder v-else-if="data.children && data.children.length > 0" />
-                        <i-lucide:file-text v-else />
-                        <span>{{ data.name }}</span>
-                    </span>
+            <t-menu :value="$Data.currentMenuKey" :expanded="$Data.expandedKeys" style="height: 100%" @change="$Method.onMenuClick" @expand="(value) => ($Data.expandedKeys = value)">
+                <template v-for="menu in $Data.userMenus" :key="menu.id">
+                    <!-- 无子菜单 -->
+                    <t-menu-item v-if="!menu.children || menu.children.length === 0" :value="menu.path">
+                        <template #icon>
+                            <i-lucide:home v-if="menu.path === '/addon/admin/'" />
+                            <i-lucide:file-text v-else />
+                        </template>
+                        {{ menu.name }}
+                    </t-menu-item>
+                    <!-- 有子菜单 -->
+                    <t-submenu v-else :value="String(menu.id)" :title="menu.name">
+                        <template #icon>
+                            <i-lucide:folder />
+                        </template>
+                        <t-menu-item v-for="child in menu.children" :key="child.id" :value="child.path">
+                            <template #icon>
+                                <i-lucide:file-text />
+                            </template>
+                            {{ child.name }}
+                        </t-menu-item>
+                    </t-submenu>
                 </template>
-            </tiny-tree-menu>
+            </t-menu>
         </div>
 
         <!-- 内容区域 -->
@@ -40,7 +57,6 @@
 
 <script setup>
 import { arrayToTree } from '@/utils';
-import { iconClose } from '@opentiny/vue-icon';
 
 const router = useRouter();
 const route = useRoute();
@@ -55,7 +71,7 @@ const $Data = $ref({
     userMenus: [],
     userMenusFlat: [], // 一维菜单数据
     expandedKeys: [],
-    currentNodeKey: 0,
+    currentMenuKey: '',
     userInfo: {
         nickname: '管理员',
         role: '超级管理员'
@@ -96,7 +112,7 @@ const $Method = {
         while (menu.pid) {
             const parent = $Data.userMenusFlat.find((m) => m.id === menu.pid);
             if (parent) {
-                expandedKeys.unshift(parent.id);
+                expandedKeys.unshift(String(parent.id));
                 menu = parent;
             } else {
                 break;
@@ -106,17 +122,14 @@ const $Method = {
         // 使用 nextTick 确保 DOM 更新后再设置高亮
         nextTick(() => {
             $Data.expandedKeys = expandedKeys;
-            // 使用 setCurrentKey 方法设置当前高亮节点
-            if ($From.treeMenuRef) {
-                $From.treeMenuRef.setCurrentKey(currentMenu.id);
-            }
+            $Data.currentMenuKey = currentPath;
         });
     },
 
     // 处理菜单点击
-    onMenuClick(data) {
-        if (data.path) {
-            router.push(data.path);
+    onMenuClick(path) {
+        if (path) {
+            router.push(path);
         }
     },
 
@@ -223,22 +236,6 @@ $Method.fetchUserMenus();
         padding: 16px 12px;
         box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
         border: 1px solid #e8eaed;
-
-        .tiny-tree-menu:before {
-            display: none;
-        }
-
-        .menu-item {
-            display: flex;
-            align-items: center;
-            width: 100%;
-            padding: 2px 0;
-            transition: all 0.2s ease;
-
-            &:hover {
-                color: #0052d9;
-            }
-        }
     }
 
     .layout-main {

package/src/types/auto-imports.d.ts

@@ -103,6 +103,7 @@ declare module 'vue' {
     readonly $Config: UnwrapRef<typeof import('../config/index.js')['$Config']>
     readonly $Http: UnwrapRef<typeof import('../plugins/http.js')['$Http']>
     readonly $Storage: UnwrapRef<typeof import('../plugins/storage.js')['$Storage']>
+    readonly DialogPlugin: UnwrapRef<typeof import('tdesign-vue-next')['DialogPlugin']>
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
     readonly MessagePlugin: UnwrapRef<typeof import('tdesign-vue-next')['MessagePlugin']>
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>

package/src/types/components.d.ts

@@ -14,6 +14,7 @@ declare module 'vue' {
     'ILucide:fileText': typeof import('~icons/lucide/file-text')['default']
     'ILucide:folder': typeof import('~icons/lucide/folder')['default']
     'ILucide:home': typeof import('~icons/lucide/home')['default']
+    'ILucide:x': typeof import('~icons/lucide/x')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     TButton: typeof import('tdesign-vue-next')['Button']
@@ -27,11 +28,14 @@ declare module 'vue' {
     TInput: typeof import('tdesign-vue-next')['Input']
     TInputNumber: typeof import('tdesign-vue-next')['InputNumber']
     TLink: typeof import('tdesign-vue-next')['Link']
+    TMenu: typeof import('tdesign-vue-next')['Menu']
+    TMenuItem: typeof import('tdesign-vue-next')['MenuItem']
     TPagination: typeof import('tdesign-vue-next')['Pagination']
     TRadio: typeof import('tdesign-vue-next')['Radio']
     TRadioGroup: typeof import('tdesign-vue-next')['RadioGroup']
     TSelect: typeof import('tdesign-vue-next')['Select']
     TSpace: typeof import('tdesign-vue-next')['Space']
+    TSubmenu: typeof import('tdesign-vue-next')['Submenu']
     TTable: typeof import('tdesign-vue-next')['Table']
     TTag: typeof import('tdesign-vue-next')['Tag']
     TTree: typeof import('tdesign-vue-next')['Tree']

package/vite.config.js

@@ -122,33 +122,9 @@ export default defineConfig({
                         return 'framework-pinia';
                     }
 
-                    // TinyVue 细粒度拆分
-                    if (id.includes('@opentiny/vue-renderless/src/grid')) {
-                        return 'tiny-grid';
-                    }
-                    if (id.includes('@opentiny/vue-renderless/src/table')) {
-                        return 'tiny-table';
-                    }
-                    if (id.includes('@opentiny/vue-renderless/src/tree')) {
-                        return 'tiny-tree';
-                    }
-                    if (id.includes('@opentiny/vue-renderless/src/form')) {
-                        return 'tiny-form';
-                    }
-                    if (id.includes('node_modules/@opentiny/vue-renderless/')) {
-                        return 'tiny-renderless';
-                    }
-                    if (id.includes('node_modules/@opentiny/vue-theme/')) {
-                        return 'tiny-theme';
-                    }
-                    if (id.includes('node_modules/@opentiny/vue-locale/')) {
-                        return 'tiny-locale';
-                    }
-                    if (id.includes('node_modules/@opentiny/vue-common/')) {
-                        return 'tiny-common';
-                    }
-                    if (id.includes('node_modules/@opentiny/vue-icon/')) {
-                        return 'tiny-icon';
+                    // TDesign Vue Next
+                    if (id.includes('node_modules/tdesign-vue-next/') || id.includes('node_modules/.bun/tdesign-vue-next')) {
+                        return 'tdesign';
                     }
 
                     // 工具库（独立文件）
@@ -161,7 +137,7 @@ export default defineConfig({
                         return 'lib-lodash';
                     }
 
-                    // echarts 及相关库（TinyVue 图表组件依赖）
+                    // echarts 及相关库
                     if (id.includes('node_modules/echarts/') || id.includes('node_modules/.bun/echarts')) {
                         return 'lib-echarts';
                     }
@@ -180,7 +156,7 @@ export default defineConfig({
                     }
 
                     // befly-addon
-                    if (id.includes('@befly-addon/')) {
+                    if (id.includes('@befly-addon/') || id.includes('packages/addonAdmin/') || id.includes('packages\\addonAdmin\\')) {
                         return 'befly-addon';
                     }