diff --git a/README.ja-JP.md b/README.ja-JP.md index 700f8357..89635775 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -1,4 +1,4 @@ -
VbenAdmin Logo

+
VbenAdmin Logo

[![license](https://img.shields.io/github/license/anncwb/vue-vben-admin.svg)](LICENSE) @@ -127,7 +127,7 @@ pnpm build このプロジェクトが役に立つと思われた場合、作者にコーヒーを一杯おごってサポートを示すことができます！ -![donate](https://unpkg.com/@vbenjs/static-source@0.1.5/source/sponsor.png) +![donate](https://unpkg.com/@vbenjs/static-source@0.1.6/source/sponsor.png) Paypal Me diff --git a/README.md b/README.md index 7cf502ed..3d2c4ec3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -
VbenAdmin Logo

+
VbenAdmin Logo

[![license](https://img.shields.io/github/license/anncwb/vue-vben-admin.svg)](LICENSE) @@ -126,7 +126,7 @@ Support modern browsers, not IE If you think this project is helpful to you, you can help the author buy a cup of coffee to show your support! -![donate](https://unpkg.com/@vbenjs/static-source@0.1.5/source/sponsor.png) +![donate](https://unpkg.com/@vbenjs/static-source@0.1.6/source/sponsor.png) Paypal Me diff --git a/README.zh-CN.md b/README.zh-CN.md index 73e8fbeb..5f55ec08 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,4 +1,4 @@ -
VbenAdmin Logo

+
VbenAdmin Logo

[![license](https://img.shields.io/github/license/anncwb/vue-vben-admin.svg)](LICENSE) @@ -122,7 +122,7 @@ pnpm build 如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持! -![donate](https://unpkg.com/@vbenjs/static-source@0.1.5/source/sponsor.png) +![donate](https://unpkg.com/@vbenjs/static-source@0.1.6/source/sponsor.png) Paypal Me diff --git a/apps/web-antd/src/router/routes/index.ts b/apps/web-antd/src/router/routes/index.ts index 78da5436..a70c4875 100644 --- a/apps/web-antd/src/router/routes/index.ts +++ b/apps/web-antd/src/router/routes/index.ts @@ -9,19 +9,19 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { }); // 有需要可以自行打开注释，并创建文件夹 -// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); +// const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 静态路由列表，访问这些页面可以不需要权限 */ -// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); -const staticRoutes: RouteRecordRaw[] = []; +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +// const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ const routes: RouteRecordRaw[] = [ ...coreRoutes, - ...staticRoutes, + ...externalRoutes, fallbackNotFoundRoute, ]; diff --git a/apps/web-ele/src/router/routes/index.ts b/apps/web-ele/src/router/routes/index.ts index 78da5436..a70c4875 100644 --- a/apps/web-ele/src/router/routes/index.ts +++ b/apps/web-ele/src/router/routes/index.ts @@ -9,19 +9,19 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { }); // 有需要可以自行打开注释，并创建文件夹 -// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); +// const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 静态路由列表，访问这些页面可以不需要权限 */ -// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); -const staticRoutes: RouteRecordRaw[] = []; +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +// const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ const routes: RouteRecordRaw[] = [ ...coreRoutes, - ...staticRoutes, + ...externalRoutes, fallbackNotFoundRoute, ]; diff --git a/apps/web-naive/src/router/routes/index.ts b/apps/web-naive/src/router/routes/index.ts index 78da5436..a70c4875 100644 --- a/apps/web-naive/src/router/routes/index.ts +++ b/apps/web-naive/src/router/routes/index.ts @@ -9,19 +9,19 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { }); // 有需要可以自行打开注释，并创建文件夹 -// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); +// const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 静态路由列表，访问这些页面可以不需要权限 */ -// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); -const staticRoutes: RouteRecordRaw[] = []; +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +// const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ const routes: RouteRecordRaw[] = [ ...coreRoutes, - ...staticRoutes, + ...externalRoutes, fallbackNotFoundRoute, ]; diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 78f9ed27..0ce099d2 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -50,7 +50,7 @@ export default withPwa( text: '最后更新于', }, lightModeSwitchTitle: '切换到浅色模式', - logo: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp', + logo: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp', nav: nav(), outline: { label: '页面导航', @@ -362,12 +362,12 @@ function pwa(): PwaOptions { icons: [ { sizes: '192x192', - src: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/pwa-icon-192.png', + src: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/pwa-icon-192.png', type: 'image/png', }, { sizes: '512x512', - src: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/pwa-icon-512.png', + src: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/pwa-icon-512.png', type: 'image/png', }, ], diff --git a/docs/src/commercial/community.md b/docs/src/commercial/community.md index b139f9f4..389293ab 100644 --- a/docs/src/commercial/community.md +++ b/docs/src/commercial/community.md @@ -18,4 +18,4 @@ 通过微信联系作者，注明加群来意： - + diff --git a/docs/src/commercial/customized.md b/docs/src/commercial/customized.md index 2c6a98c1..dddfc065 100644 --- a/docs/src/commercial/customized.md +++ b/docs/src/commercial/customized.md @@ -7,6 +7,6 @@ - 通过邮箱联系开发者： [ann.vben@gmail.com](mailto:ann.vben@gmail.com) - 通过微信联系开发者： - + 我们会在第一时间回复您，定制费用根据需求而定。 diff --git a/docs/src/en/index.md b/docs/src/en/index.md index 8249a2b2..70d13b80 100644 --- a/docs/src/en/index.md +++ b/docs/src/en/index.md @@ -8,7 +8,7 @@ hero: text: 企业级管理系统框架 tagline: 全新升级，开箱即用，简单高效 image: - src: https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp + src: https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp alt: Vben Admin actions: - theme: brand diff --git a/docs/src/friend-links/index.md b/docs/src/friend-links/index.md index 3424bdbf..de340370 100644 --- a/docs/src/friend-links/index.md +++ b/docs/src/friend-links/index.md @@ -9,7 +9,7 @@ - 通过邮箱联系作者： [ann.vben@gmail.com](mailto:ann.vben@gmail.com) - 通过微信联系作者： - + ### 提供资料 @@ -22,6 +22,6 @@ - 名称：Vben Admin - 链接：https://www.vben.pro - 描述：Vben Admin 企业级开箱即用的中后台前端解决方案 - - Logo：https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp + - Logo：https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp 我们将定期的检查友情链接，如果发现您的网站已经删除了我们的友情链接以及链接地址是否正确。 diff --git a/docs/src/guide/essentials/route.md b/docs/src/guide/essentials/route.md index e0b9ea48..10893fc3 100644 --- a/docs/src/guide/essentials/route.md +++ b/docs/src/guide/essentials/route.md @@ -16,15 +16,15 @@ outline: deep ```ts // 有需要可以自行打开注释，并创建文件夹 -// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); // [!code --] +// const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); // [!code --] const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); // [!code ++] /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 静态路由列表，访问这些页面可以不需要权限 */ -// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); // [!code --] -const staticRoutes: RouteRecordRaw[] = []; // [!code --] -const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); // [!code ++] +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +// const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles) // [!code --] +const externalRoutes: RouteRecordRaw[] = []; // [!code --] +const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); // [!code ++] ``` ### 动态路由 diff --git a/docs/src/guide/essentials/settings.md b/docs/src/guide/essentials/settings.md index c92abfae..253a8a4d 100644 --- a/docs/src/guide/essentials/settings.md +++ b/docs/src/guide/essentials/settings.md @@ -180,7 +180,7 @@ const defaultPreferences: Preferences = { compact: false, contentCompact: 'wide', defaultAvatar: - 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/avatar-v1.webp', + 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/avatar-v1.webp', dynamicTitle: true, enableCheckUpdates: true, enablePreferences: true, @@ -217,7 +217,7 @@ const defaultPreferences: Preferences = { }, logo: { enable: true, - source: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp', + source: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp', }, navigation: { accordion: true, diff --git a/docs/src/guide/in-depth/theme.md b/docs/src/guide/in-depth/theme.md index 59bd16e3..49bd9af5 100644 --- a/docs/src/guide/in-depth/theme.md +++ b/docs/src/guide/in-depth/theme.md @@ -110,9 +110,6 @@ css 变量内的颜色，必须使用 `hsl` 格式，如 `0 0% 100%`，不需要 /* 主体内容背景色 */ --content: 240 11% 96%; - /* 登录背景色 */ - --authentication: 231deg 61% 44%; - /* =============component & UI============= */ /* menu */ @@ -212,9 +209,6 @@ css 变量内的颜色，必须使用 `hsl` 格式，如 `0 0% 100%`，不需要 /* 主体内容背景色 */ --content: 240 11% 96%; - /* 登录背景色 */ - --authentication: 220deg 13.06% 3.04%; - /* =============component & UI============= */ --sidebar: 222.34deg 10.43% 12.27%; @@ -412,9 +406,6 @@ type BuiltinThemeType = /* 主体内容背景色 */ --content: 240 11% 96%; - /* 登录背景色 */ - --authentication: 231deg 61% 44%; - /* =============component & UI============= */ /* menu */ @@ -787,9 +778,6 @@ type BuiltinThemeType = /* 主体内容背景色 */ --content: 240 11% 96%; - /* 登录背景色 */ - --authentication: 220deg 13.06% 3.04%; - /* =============component & UI============= */ --sidebar: 222.34deg 10.43% 12.27%; diff --git a/docs/src/index.md b/docs/src/index.md index 3d8a5ec5..e467c890 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -8,7 +8,7 @@ hero: text: 企业级管理系统框架 tagline: 全新升级，开箱即用，简单高效 image: - src: https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp + src: https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp alt: Vben Admin actions: - theme: brand diff --git a/docs/src/sponsor/personal.md b/docs/src/sponsor/personal.md index bffe8503..aa872f97 100644 --- a/docs/src/sponsor/personal.md +++ b/docs/src/sponsor/personal.md @@ -2,7 +2,7 @@ 如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持! -![](https://unpkg.com/@vbenjs/static-source@0.1.5/source/sponsor.png) +![](https://unpkg.com/@vbenjs/static-source@0.1.6/source/sponsor.png) 您的赞助将帮助我们： diff --git a/internal/tailwind-config/src/index.ts b/internal/tailwind-config/src/index.ts index ac5512c9..e2c853a8 100644 --- a/internal/tailwind-config/src/index.ts +++ b/internal/tailwind-config/src/index.ts @@ -76,9 +76,6 @@ const shadcnUiColors = { }; const customColors = { - authentication: { - DEFAULT: 'hsl(var(--authentication))', - }, green: { ...createColorsPalette('green'), foreground: 'hsl(var(--success-foreground))', @@ -145,6 +142,7 @@ export default { 'collapsible-up': 'collapsible-up 0.2s ease-in-out', float: 'float 5s linear 0ms infinite', }, + animationDuration: { '2000': '2000ms', '3000': '3000ms', @@ -155,6 +153,11 @@ export default { sm: 'calc(var(--radius) - 4px)', xl: 'calc(var(--radius) + 4px)', }, + boxShadow: { + float: `0 6px 16px 0 rgb(0 0 0 / 8%), + 0 3px 6px -4px rgb(0 0 0 / 12%), + 0 9px 28px 8px rgb(0 0 0 / 5%)`, + }, colors: { ...customColors, ...shadcnUiColors, diff --git a/internal/vite-config/src/options.ts b/internal/vite-config/src/options.ts index d35441b5..323eee1e 100644 --- a/internal/vite-config/src/options.ts +++ b/internal/vite-config/src/options.ts @@ -11,12 +11,12 @@ const getDefaultPwaOptions = (name: string): Partial => ({ icons: [ { sizes: '192x192', - src: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/pwa-icon-192.png', + src: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/pwa-icon-192.png', type: 'image/png', }, { sizes: '512x512', - src: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/pwa-icon-512.png', + src: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/pwa-icon-512.png', type: 'image/png', }, ], diff --git a/internal/vite-config/src/plugins/inject-app-loading/default-loading.html b/internal/vite-config/src/plugins/inject-app-loading/default-loading.html index 26ed4c99..28957058 100644 --- a/internal/vite-config/src/plugins/inject-app-loading/default-loading.html +++ b/internal/vite-config/src/plugins/inject-app-loading/default-loading.html @@ -25,7 +25,7 @@ pointer-events: none; visibility: hidden; opacity: 0; - transition: all 1s ease-out; + transition: all 0.8s ease-out; } .dark .loading { diff --git a/packages/@core/base/design/src/css/global.css b/packages/@core/base/design/src/css/global.css index 562cafa9..57ac09f0 100644 --- a/packages/@core/base/design/src/css/global.css +++ b/packages/@core/base/design/src/css/global.css @@ -36,8 +36,9 @@ /* overflow: overlay; */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + /* -webkit-font-smoothing: antialiased; */ + + /* -moz-osx-font-smoothing: grayscale; */ } a, diff --git a/packages/@core/base/design/src/design-tokens/dark/index.css b/packages/@core/base/design/src/design-tokens/dark/index.css index 45e255f7..92a60f06 100644 --- a/packages/@core/base/design/src/design-tokens/dark/index.css +++ b/packages/@core/base/design/src/design-tokens/dark/index.css @@ -52,12 +52,12 @@ --secondary-foreground: 0 0% 98%; /* Used for accents such as hover effects on , ...etc */ - --accent: 0deg 0% 100% / 8%; - --accent-hover: 0deg 0% 100% / 12%; + --accent: 240 3.7% 15.9%; + --accent-hover: 240 3.7% 20.9%; --accent-foreground: 0 0% 98%; /* Darker color */ - --heavy: 0deg 0% 100% / 12%; + --heavy: 240 3.7% 20.9%; --heavy-foreground: var(--accent-foreground); /* Default border color */ @@ -85,9 +85,6 @@ /* 主体内容背景色 */ --content: 240 11% 96%; - /* 登录背景色 */ - --authentication: 220deg 13.06% 3.04%; - /* =============component & UI============= */ --sidebar: 222.34deg 10.43% 12.27%; diff --git a/packages/@core/base/design/src/design-tokens/default/index.css b/packages/@core/base/design/src/design-tokens/default/index.css index 991ea890..8ea8a575 100644 --- a/packages/@core/base/design/src/design-tokens/default/index.css +++ b/packages/@core/base/design/src/design-tokens/default/index.css @@ -85,9 +85,6 @@ /* 主体内容背景色 */ --content: 240 11% 96%; - /* 登录背景色 */ - --authentication: 231deg 61% 44%; - /* =============component & UI============= */ /* menu */ diff --git a/packages/@core/base/icons/src/lucide.ts b/packages/@core/base/icons/src/lucide.ts index de488105..0e059f38 100644 --- a/packages/@core/base/icons/src/lucide.ts +++ b/packages/@core/base/icons/src/lucide.ts @@ -38,6 +38,7 @@ export { RotateCw, Search, SearchX, + Settings2, Sun, SunMoon, SwatchBook, diff --git a/packages/@core/base/shared/src/constants/vben.ts b/packages/@core/base/shared/src/constants/vben.ts index 4ae5d1e6..2b8cbb35 100644 --- a/packages/@core/base/shared/src/constants/vben.ts +++ b/packages/@core/base/shared/src/constants/vben.ts @@ -12,7 +12,7 @@ export const VBEN_DOC_URL = 'https://doc.vben.pro'; * @zh_CN Vben Logo */ export const VBEN_LOGO_URL = - 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp'; + 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp'; /** * @zh_CN Vben Admin 首页地址 diff --git a/packages/@core/base/typings/src/menu-record.ts b/packages/@core/base/typings/src/menu-record.ts index 0ea0a0b8..9cb18dcc 100644 --- a/packages/@core/base/typings/src/menu-record.ts +++ b/packages/@core/base/typings/src/menu-record.ts @@ -1,5 +1,7 @@ import type { RouteRecordRaw } from 'vue-router'; +import type { Component } from 'vue'; + /** * 扩展路由原始对象 */ @@ -44,7 +46,7 @@ interface MenuRecordRaw extends MenuRecordBadgeRaw { /** * 图标名 */ - icon?: string; + icon?: Component | string; /** * 菜单名 */ diff --git a/packages/@core/base/typings/src/vue-router.d.ts b/packages/@core/base/typings/src/vue-router.d.ts index 65a3d503..ba6407d7 100644 --- a/packages/@core/base/typings/src/vue-router.d.ts +++ b/packages/@core/base/typings/src/vue-router.d.ts @@ -68,7 +68,7 @@ interface RouteMeta { /** * 图标（菜单/tab） */ - icon?: string; + icon?: Component | string; /** * iframe 地址 */ diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts index e5277bc9..671252d5 100644 --- a/packages/@core/preferences/src/config.ts +++ b/packages/@core/preferences/src/config.ts @@ -10,7 +10,7 @@ const defaultPreferences: Preferences = { compact: false, contentCompact: 'wide', defaultAvatar: - 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/avatar-v1.webp', + 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/avatar-v1.webp', dynamicTitle: true, enableCheckUpdates: true, enablePreferences: true, @@ -47,7 +47,7 @@ const defaultPreferences: Preferences = { }, logo: { enable: true, - source: 'https://unpkg.com/@vbenjs/static-source@0.1.5/source/logo-v1.webp', + source: 'https://unpkg.com/@vbenjs/static-source@0.1.6/source/logo-v1.webp', }, navigation: { accordion: true, diff --git a/packages/@core/preferences/src/constants.ts b/packages/@core/preferences/src/constants.ts index 94cfbf81..f7ac0267 100644 --- a/packages/@core/preferences/src/constants.ts +++ b/packages/@core/preferences/src/constants.ts @@ -21,39 +21,42 @@ const BUILT_IN_THEME_PRESETS: BuiltinThemePreset[] = [ type: 'pink', }, { - color: 'hsl(0 75% 42%)', - type: 'rose', + color: 'hsl(42 84% 61%)', + type: 'yellow', }, { color: 'hsl(212 100% 45%)', type: 'sky-blue', }, - { - color: 'hsl(211 91% 39%)', - type: 'deep-blue', - }, { color: 'hsl(161 90% 43%)', type: 'green', }, - { - color: 'hsl(181 84% 32%)', - type: 'deep-green', - }, - { - color: 'hsl(18 89% 40%)', - type: 'orange', - }, - { - color: 'hsl(42 84% 61%)', - type: 'yellow', - }, { color: 'hsl(240 5% 26%)', darkPrimaryColor: 'hsl(0 0% 98%)', primaryColor: 'hsl(240 5.9% 10%)', type: 'zinc', }, + + { + color: 'hsl(181 84% 32%)', + type: 'deep-green', + }, + + { + color: 'hsl(211 91% 39%)', + type: 'deep-blue', + }, + { + color: 'hsl(18 89% 40%)', + type: 'orange', + }, + { + color: 'hsl(0 75% 42%)', + type: 'rose', + }, + { color: 'hsl(0 0% 25%)', darkPrimaryColor: 'hsl(0 0% 98%)', diff --git a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue index 4e20febe..f86734c9 100644 --- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue +++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue @@ -59,6 +59,11 @@ const sidebarExtraCollapse = defineModel('sidebarExtraCollapse'); const sidebarExpandOnHover = defineModel('sidebarExpandOnHover'); const sidebarEnable = defineModel('sidebarEnable', { default: true }); +// side是否处于hover状态展开菜单中 +const sidebarExpandOnHovering = ref(false); +const headerIsHidden = ref(false); +const contentRef = ref(); + const { arrivedState, directions, @@ -66,11 +71,7 @@ const { y: scrollY, } = useScroll(document); -const { y: mouseY } = useMouse({ type: 'client' }); - -// side是否处于hover状态展开菜单中 -const sidebarExpandOnHovering = ref(false); -const headerIsHidden = ref(false); +const { y: mouseY } = useMouse({ target: contentRef, type: 'client' }); const realLayout = computed(() => props.isMobile ? 'sidebar-nav' : props.layout, @@ -507,6 +508,7 @@ function handleOpenMenu() {
.#{$namespace}-sub-menu { - // .#{$namespace}-menu { - // background: var(--menu-submenu-opened-background-color); - - // .#{$namespace}-sub-menu, - // .#{$namespace}-menu-item:not(.is-active), - // .#{$namespace}-sub-menu-content:not(.is-active) { - // background: var(--menu-submenu-opened-background-color); - // } - // } & > .#{$namespace}-menu { & > .#{$namespace}-menu-item { padding-left: calc( @@ -713,13 +704,11 @@ $namespace: vben; .#{$namespace}-menu-item { fill: var(--menu-item-color); - stroke: var(--menu-item-color); @include menu-item; &.is-active { fill: var(--menu-item-active-color); - stroke: var(--menu-item-active-color); @include menu-item-active; } @@ -783,7 +772,6 @@ $namespace: vben; list-style: none; background: var(--menu-submenu-background-color); fill: var(--menu-item-color); - stroke: var(--menu-item-color); &.is-active { div[data-state='open'] > .#{$namespace}-sub-menu-content, @@ -794,7 +782,6 @@ $namespace: vben; cursor: pointer; background: var(--menu-submenu-active-background-color); fill: var(--menu-submenu-active-color); - stroke: var(--menu-submenu-active-color); } } } diff --git a/packages/@core/ui-kit/menu-ui/src/interface/index.ts b/packages/@core/ui-kit/menu-ui/src/interface/index.ts index e9d868f3..99422e8e 100644 --- a/packages/@core/ui-kit/menu-ui/src/interface/index.ts +++ b/packages/@core/ui-kit/menu-ui/src/interface/index.ts @@ -1,6 +1,6 @@ import type { MenuRecordBadgeRaw, ThemeModeType } from '@vben-core/typings'; -import type { Ref } from 'vue'; +import type { Component, Ref } from 'vue'; interface MenuProps { /** @@ -61,7 +61,7 @@ interface SubMenuProps extends MenuRecordBadgeRaw { /** * @zh_CN 图标 */ - icon?: string; + icon?: Component | string; /** * @zh_CN submenu 名称 */ @@ -80,7 +80,7 @@ interface MenuItemProps extends MenuRecordBadgeRaw { /** * @zh_CN 图标 */ - icon?: string; + icon?: Component | string; /** * @zh_CN menuitem 名称 */ @@ -93,10 +93,6 @@ interface MenuItemRegistered { path: string; } -// export interface MenuItemClicked { -// name: string; -// } - interface MenuItemClicked { parentPaths: string[]; path: string; diff --git a/packages/@core/ui-kit/menu-ui/src/sub-menu.vue b/packages/@core/ui-kit/menu-ui/src/sub-menu.vue index 4773700a..b0108dc9 100644 --- a/packages/@core/ui-kit/menu-ui/src/sub-menu.vue +++ b/packages/@core/ui-kit/menu-ui/src/sub-menu.vue @@ -31,12 +31,6 @@ const hasChildren = computed(() => { Reflect.has(menu, 'children') && !!menu.children && menu.children.length > 0 ); }); - -// function menuIcon(menu: MenuRecordRaw) { -// return props.activePath === menu.path -// ? menu.activeIcon || menu.icon -// : menu.icon; -// }