befly-admin 3.4.29 → 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.29",
+    "version": "3.4.31",
     "description": "Befly Admin - 基于 Vue3 + OpenTiny Vue 的后台管理系统",
     "type": "module",
     "private": false,
@@ -29,39 +29,14 @@
         "sync:admin": "bunx befly sync:admin"
     },
     "dependencies": {
-        "@opentiny/vue-button": "~3.27.0",
-        "@opentiny/vue-checkbox": "~3.27.0",
-        "@opentiny/vue-checkbox-group": "~3.27.0",
-        "@opentiny/vue-dialog-box": "~3.27.0",
-        "@opentiny/vue-dropdown": "~3.27.0",
-        "@opentiny/vue-dropdown-item": "~3.27.0",
-        "@opentiny/vue-dropdown-menu": "~3.27.0",
-        "@opentiny/vue-form": "~3.27.0",
-        "@opentiny/vue-form-item": "~3.27.0",
-        "@opentiny/vue-grid": "~3.27.0",
-        "@opentiny/vue-grid-column": "~3.27.0",
-        "@opentiny/vue-icon": "~3.27.0",
-        "@opentiny/vue-input": "~3.27.0",
-        "@opentiny/vue-loading": "~3.27.0",
-        "@opentiny/vue-message": "~3.27.0",
-        "@opentiny/vue-modal": "~3.27.0",
-        "@opentiny/vue-notify": "~3.27.0",
-        "@opentiny/vue-numeric": "~3.27.0",
-        "@opentiny/vue-pager": "~3.27.0",
-        "@opentiny/vue-progress": "~3.27.0",
-        "@opentiny/vue-radio": "~3.27.0",
-        "@opentiny/vue-radio-group": "~3.27.0",
-        "@opentiny/vue-search": "~3.27.0",
-        "@opentiny/vue-select": "~3.27.0",
-        "@opentiny/vue-tag": "~3.27.0",
-        "@opentiny/vue-tree": "~3.27.0",
+        "@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.31",
         "@iconify-json/lucide": "^1.2.72",
         "@unocss/preset-attributify": "^66.5.6",
         "@unocss/preset-uno": "^66.5.6",
@@ -82,5 +57,5 @@
         "node": ">=24.0.0",
         "pnpm": ">=10.0.0"
     },
-    "gitHead": "f279b3e03931a8f13ac1c559e545d18052ce2b87"
+    "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,29 +122,26 @@ 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);
         }
     },
 
     // 处理退出登录
     handleLogout() {
-        Modal.confirm({
-            message: '确定要退出登录吗？',
-            title: '确认',
+        DialogPlugin.confirm({
+            body: '确定要退出登录吗？',
+            header: '确认',
             onConfirm: () => {
                 $Storage.local.remove('token');
                 router.push('/internal/login');
-                Message.success('退出成功');
+                MessagePlugin.success('退出成功');
             }
         });
     }
@@ -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/main.js

@@ -1,5 +1,8 @@
 import App from './App.vue';
 
+// 引入 TDesign 样式
+import 'tdesign-vue-next/es/style/index.css';
+
 // 引入 UnoCSS 样式
 import 'virtual:uno.css';
 

package/src/plugins/http.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import Modal from '@opentiny/vue-modal';
+import { MessagePlugin } from 'tdesign-vue-next';
 import { $Storage } from './storage';
 
 /**
@@ -49,17 +49,14 @@ request.interceptors.response.use(
 
         // 如果code不是0,说明业务失败
         if (res.code !== 0) {
-            Modal.message({
-                message: res.msg || '请求失败',
-                status: 'error'
-            });
+            MessagePlugin.error(res.msg || '请求失败');
             return Promise.reject(res.data);
         }
 
         return res;
     },
     (error) => {
-        Modal.message({ message: '网络连接失败', status: 'error' });
+        MessagePlugin.error('网络连接失败');
         return Promise.reject(error);
     }
 );

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

@@ -9,12 +9,9 @@ declare global {
   const $Config: typeof import('../config/index.js').$Config
   const $Http: typeof import('../plugins/http.js').$Http
   const $Storage: typeof import('../plugins/storage.js').$Storage
+  const DialogPlugin: typeof import('tdesign-vue-next').DialogPlugin
   const EffectScope: typeof import('vue').EffectScope
-  const Loading: typeof import('@opentiny/vue-loading').default
-  const Message: typeof import('@opentiny/vue-message').default
-  const MessageBox: typeof import('@opentiny/vue-modal').default
-  const Modal: typeof import('@opentiny/vue-modal').default
-  const Notify: typeof import('@opentiny/vue-notify').default
+  const MessagePlugin: typeof import('tdesign-vue-next').MessagePlugin
   const acceptHMRUpdate: typeof import('pinia').acceptHMRUpdate
   const arrayToTree: typeof import('../utils/index.js').arrayToTree
   const computed: typeof import('vue').computed
@@ -23,7 +20,6 @@ declare global {
   const customRef: typeof import('vue').customRef
   const defineAsyncComponent: typeof import('vue').defineAsyncComponent
   const defineComponent: typeof import('vue').defineComponent
-  const definePage: typeof import('unplugin-vue-router/runtime').definePage
   const defineStore: typeof import('pinia').defineStore
   const effectScope: typeof import('vue').effectScope
   const getActivePinia: typeof import('pinia').getActivePinia
@@ -107,12 +103,9 @@ 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 Loading: UnwrapRef<typeof import('@opentiny/vue-loading')['default']>
-    readonly Message: UnwrapRef<typeof import('@opentiny/vue-message')['default']>
-    readonly MessageBox: UnwrapRef<typeof import('@opentiny/vue-modal')['default']>
-    readonly Modal: UnwrapRef<typeof import('@opentiny/vue-modal')['default']>
-    readonly Notify: UnwrapRef<typeof import('@opentiny/vue-notify')['default']>
+    readonly MessagePlugin: UnwrapRef<typeof import('tdesign-vue-next')['MessagePlugin']>
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
     readonly arrayToTree: UnwrapRef<typeof import('../utils/index.js')['arrayToTree']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>

package/src/types/components.d.ts

@@ -14,7 +14,30 @@ 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']
+    TDialog: typeof import('tdesign-vue-next')['Dialog']
+    TDivider: typeof import('tdesign-vue-next')['Divider']
+    TDropdown: typeof import('tdesign-vue-next')['Dropdown']
+    TDropdownItem: typeof import('tdesign-vue-next')['DropdownItem']
+    TDropdownMenu: typeof import('tdesign-vue-next')['DropdownMenu']
+    TForm: typeof import('tdesign-vue-next')['Form']
+    TFormItem: typeof import('tdesign-vue-next')['FormItem']
+    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/src/views/internal/login.vue

@@ -31,7 +31,7 @@ const $Method = {
     async handleLogin() {
         // 模拟登录
         $Storage.local.set('token', 'mock-token-123');
-        Modal.message({ message: '登录成功', status: 'success' });
+        MessagePlugin.success('登录成功');
         router.push('/');
     }
 };

package/src/views/test.vue

@@ -12,13 +12,10 @@
 </template>
 
 <script setup>
-// 无需导入，已自动导入：Modal, Message, Notify, MessageBox, Loading
+// 无需导入，已自动导入：MessagePlugin, DialogPlugin, NotificationPlugin, LoadingPlugin
 
 const testModal = () => {
-    Modal.message({
-        message: '这是一个成功提示',
-        status: 'success'
-    });
+    MessagePlugin.success('这是一个成功提示');
 };
 
 const testMessage = () => {

package/vite.config.js

@@ -5,6 +5,7 @@ import { VueRouterAutoImports } from 'unplugin-vue-router';
 import VueDevTools from 'vite-plugin-vue-devtools';
 import AutoImport from 'unplugin-auto-import/vite';
 import Components from 'unplugin-vue-components/vite';
+import { TDesignResolver } from 'unplugin-vue-components/resolvers';
 import Icons from 'unplugin-icons/vite';
 import IconsResolver from 'unplugin-icons/resolver';
 import ReactivityTransform from '@vue-macros/reactivity-transform/vite';
@@ -47,19 +48,11 @@ export default defineConfig({
 
         // API 自动导入
         AutoImport({
-            imports: [
-                'vue',
-                'pinia',
-                VueRouterAutoImports,
-                {
-                    '@opentiny/vue-modal': [
-                        ['default', 'Modal'],
-                        ['default', 'MessageBox']
-                    ],
-                    '@opentiny/vue-notify': [['default', 'Notify']],
-                    '@opentiny/vue-message': [['default', 'Message']],
-                    '@opentiny/vue-loading': [['default', 'Loading']]
-                }
+            imports: ['vue', 'pinia', VueRouterAutoImports],
+            resolvers: [
+                TDesignResolver({
+                    library: 'vue-next'
+                })
             ],
             dts: 'src/types/auto-imports.d.ts',
             dirs: ['src/utils', 'src/plugins', 'src/config'],
@@ -68,7 +61,12 @@ export default defineConfig({
 
         // 组件自动导入
         Components({
-            resolvers: [IconsResolver({})],
+            resolvers: [
+                TDesignResolver({
+                    library: 'vue-next'
+                }),
+                IconsResolver({})
+            ],
             dirs: ['src/components'],
             deep: true,
             dts: 'src/types/components.d.ts'
@@ -77,7 +75,7 @@ export default defineConfig({
         // 图标
         Icons({
             compiler: 'vue3',
-            autoInstall: true,
+            autoInstall: false,
             defaultClass: 'icon-befly',
             defaultStyle: 'margin-right: 8px; vertical-align: middle;'
         })
@@ -124,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';
                     }
 
                     // 工具库（独立文件）
@@ -163,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';
                     }
@@ -182,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';
                     }
 
@@ -208,6 +182,15 @@ export default defineConfig({
 
     // 优化配置
     optimizeDeps: {
-        include: ['vue', 'vue-router', 'pinia', 'axios', 'vue-macros/macros']
+        include: [
+            // Vue 核心框架
+            'vue',
+            'vue-router',
+            'pinia',
+            'axios',
+            'vue-macros/macros',
+            // TDesign Vue Next（按需加载，无需预配置）
+            'tdesign-vue-next'
+        ]
     }
 });