diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 08ff80b7..ffffc48e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,7 +27,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm build:play && pnpm build:docs - name: Sync Playground files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 @@ -66,7 +66,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm run build:antd - name: Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 @@ -97,7 +97,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm run build:ele - name: Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 @@ -128,7 +128,7 @@ jobs: uses: ./.github/actions/setup-node - name: Build - run: pnpm run build + run: pnpm run build:naive - name: Sync files uses: SamKirkland/FTP-Deploy-Action@v4.3.5 diff --git a/README.ja-JP.md b/README.ja-JP.md index db51cad8..a4e9de0a 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -78,7 +78,7 @@ pnpm build ## 変更ログ -[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases) ## 貢献方法 diff --git a/README.md b/README.md index 7427a930..5540234a 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ pnpm build ## Change Log -[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases) ## How to contribute diff --git a/README.zh-CN.md b/README.zh-CN.md index e9c97680..bcda0087 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -128,7 +128,7 @@ pnpm build ## 更新日志 -[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases/latest) +[CHANGELOG](https://github.com/vbenjs/vue-vben-admin/releases) ## Contributor diff --git a/apps/backend-mock/package.json b/apps/backend-mock/package.json index 5a45611b..3baef435 100644 --- a/apps/backend-mock/package.json +++ b/apps/backend-mock/package.json @@ -6,8 +6,8 @@ "license": "MIT", "author": "", "scripts": { - "start": "nitro dev", - "build": "nitro build" + "build": "nitro build", + "start": "nitro dev" }, "dependencies": { "nitropack": "^2.9.7" diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index e64c3aa2..05bea828 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -48,7 +48,7 @@ "jsencrypt": "^3.3.2", "lodash-es": "^4.17.21", "pinia": "2.2.2", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" }, "devDependencies": { diff --git a/apps/web-antd/src/router/routes/modules/vben.ts b/apps/web-antd/src/router/routes/modules/vben.ts index 48e38fb2..f1a836fb 100644 --- a/apps/web-antd/src/router/routes/modules/vben.ts +++ b/apps/web-antd/src/router/routes/modules/vben.ts @@ -26,7 +26,7 @@ const routes: RouteRecordRaw[] = [ { name: 'VbenAbout', path: '/vben-admin/about', - component: () => import('#/views/_core/vben/about/index.vue'), + component: () => import('#/views/_core/about/index.vue'), meta: { icon: 'lucide:copyright', title: $t('page.vben.about'), diff --git a/apps/web-antd/src/views/_core/vben/about/index.vue b/apps/web-antd/src/views/_core/about/index.vue similarity index 100% rename from apps/web-antd/src/views/_core/vben/about/index.vue rename to apps/web-antd/src/views/_core/about/index.vue diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index f16e39ba..1a50ae74 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -44,7 +44,7 @@ "dayjs": "^1.11.12", "element-plus": "^2.8.0", "pinia": "2.2.2", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" }, "devDependencies": { diff --git a/apps/web-ele/src/router/routes/modules/vben.ts b/apps/web-ele/src/router/routes/modules/vben.ts index 3a8f2e94..fab1905d 100644 --- a/apps/web-ele/src/router/routes/modules/vben.ts +++ b/apps/web-ele/src/router/routes/modules/vben.ts @@ -26,7 +26,7 @@ const routes: RouteRecordRaw[] = [ { name: 'VbenAbout', path: '/vben-admin/about', - component: () => import('#/views/_core/vben/about/index.vue'), + component: () => import('#/views/_core/about/index.vue'), meta: { icon: 'lucide:copyright', title: $t('page.vben.about'), diff --git a/apps/web-ele/src/views/_core/vben/about/index.vue b/apps/web-ele/src/views/_core/about/index.vue similarity index 100% rename from apps/web-ele/src/views/_core/vben/about/index.vue rename to apps/web-ele/src/views/_core/about/index.vue diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index a4e73e0c..e27ab25b 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -43,7 +43,7 @@ "@vueuse/core": "^11.0.0", "naive-ui": "^2.39.0", "pinia": "2.2.2", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" } } diff --git a/apps/web-naive/src/router/routes/modules/vben.ts b/apps/web-naive/src/router/routes/modules/vben.ts index 0b1273df..4f067498 100644 --- a/apps/web-naive/src/router/routes/modules/vben.ts +++ b/apps/web-naive/src/router/routes/modules/vben.ts @@ -26,7 +26,7 @@ const routes: RouteRecordRaw[] = [ { name: 'VbenAbout', path: '/vben-admin/about', - component: () => import('#/views/_core/vben/about/index.vue'), + component: () => import('#/views/_core/about/index.vue'), meta: { icon: 'lucide:copyright', title: $t('page.vben.about'), diff --git a/apps/web-naive/src/views/_core/vben/about/index.vue b/apps/web-naive/src/views/_core/about/index.vue similarity index 100% rename from apps/web-naive/src/views/_core/vben/about/index.vue rename to apps/web-naive/src/views/_core/about/index.vue diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts index 6dfb2de9..25a49448 100644 --- a/docs/.vitepress/config.mts +++ b/docs/.vitepress/config.mts @@ -13,7 +13,7 @@ import { version } from '../../package.json'; export default withPwa( defineConfigWithTheme({ - description: 'Vben Admin& 企业级管理系统框架', + description: 'Vben Admin & 企业级管理系统框架', head: head(), lang: 'zh', pwa: pwa(), @@ -284,6 +284,7 @@ function sidebarGuide(): DefaultTheme.SidebarItem[] { { text: '深入', items: [ + { link: 'in-depth/login', text: '登录' }, // { link: 'in-depth/layout', text: '布局' }, { link: 'in-depth/theme', text: '主题' }, { link: 'in-depth/access', text: '权限' }, diff --git a/docs/package.json b/docs/package.json index e7b2882d..5f74efbc 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@nolebase/vitepress-plugin-git-changelog": "^2.4.0", "@vite-pwa/vitepress": "^0.5.0", - "vitepress": "^1.3.2", - "vue": "^3.4.37" + "vitepress": "^1.3.3", + "vue": "^3.4.38" } } diff --git a/docs/src/guide/essentials/development.md b/docs/src/guide/essentials/development.md index 4b92b10f..ff731a2d 100644 --- a/docs/src/guide/essentials/development.md +++ b/docs/src/guide/essentials/development.md @@ -52,8 +52,18 @@ npm 脚本是项目常见的配置,用于执行一些常见的任务,比如 "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build", // 构建项目并分析 "build:analyze": "turbo build:analyze", - // 构建docker镜像 + // 构建本地 docker 镜像 "build:docker": "./build-local-docker-image.sh", + // 单独构建 web-antd 应用 + "build:antd": "pnpm run build --filter=@vben/web-antd", + // 单独构建文档 + "build:docs": "pnpm run build --filter=@vben/docs", + // 单独构建 web-ele 应用 + "build:ele": "pnpm run build --filter=@vben/web-ele", + // 单独构建 web-naive 应用 + "build:naive": "pnpm run build --filter=@vben/naive", + // 单独构建 playground 应用 + "build:play": "pnpm run build --filter=@vben/playground", // changeset 版本管理 "changeset": "pnpm exec changeset", // 检查项目各种问题 @@ -78,10 +88,10 @@ npm 脚本是项目常见的配置,用于执行一些常见的任务,比如 "dev:docs": "pnpm -F @vben/docs run dev", // 启动web-ele应用 "dev:ele": "pnpm -F @vben/web-ele run dev", - // 启动演示应用 - "dev:play": "pnpm -F @vben/playground run dev", // 启动web-naive应用 "dev:naive": "pnpm -F @vben/web-naive run dev", + // 启动演示应用 + "dev:play": "pnpm -F @vben/playground run dev", // 格式化代码 "format": "vsh lint --format", // lint 代码 diff --git a/docs/src/guide/essentials/route.md b/docs/src/guide/essentials/route.md index 10893fc3..29fa298b 100644 --- a/docs/src/guide/essentials/route.md +++ b/docs/src/guide/essentials/route.md @@ -64,7 +64,7 @@ const routes: RouteRecordRaw[] = [ { name: 'VbenAbout', path: '/vben-admin/about', - component: () => import('#/views/_core/vben/about/index.vue'), + component: () => import('#/views/_core/about/index.vue'), meta: { badgeType: 'dot', badgeVariants: 'destructive', diff --git a/docs/src/guide/in-depth/login.md b/docs/src/guide/in-depth/login.md new file mode 100644 index 00000000..8155b9bf --- /dev/null +++ b/docs/src/guide/in-depth/login.md @@ -0,0 +1,131 @@ +# 登录 + +本文介绍如何去改造自己的应用程序登录页。 + +## 登录页面调整 + +如果你想调整登录页面的标题、描述和图标以及工具栏,你可以通过配置 `AuthPageLayout` 组件的 `props` 参数来实现。 + +![login](/guide/login.png) + +只需要在应用下的 `src/router/routes/core.ts` 内,配置`AuthPageLayout`的 `props`参数即可: + +```ts {4-8} + { + component: AuthPageLayout, + props: { + sloganImage: "xxx/xxx.png", + pageTitle: "开箱即用的大型中后台管理系统", + pageDescription: "工程化、高性能、跨组件库的前端模版", + toolbar: true, + toolbarList: () => ['color', 'language', 'layout', 'theme'], + } + // ... + }, +``` + +::: tip + +如果这些配置不能满足你的需求,你可以自行实现登录页面。直接实现自己的 `AuthPageLayout`即可。 + +::: + +## 登录表单调整 + +如果你想调整登录表单的相关内容,你可以在应用下的 `src/views/_core/authentication/login.vue` 内,配置`AuthenticationLogin` 组件参数即可: + +```vue + +``` + +::: details AuthenticationLogin 组件参数 + +```ts +{ + /** + * @zh_CN 验证码登录路径 + */ + codeLoginPath?: string; + /** + * @zh_CN 忘记密码路径 + */ + forgetPasswordPath?: string; + + /** + * @zh_CN 是否处于加载处理状态 + */ + loading?: boolean; + + /** + * @zh_CN 密码占位符 + */ + passwordPlaceholder?: string; + + /** + * @zh_CN 二维码登录路径 + */ + qrCodeLoginPath?: string; + + /** + * @zh_CN 注册路径 + */ + registerPath?: string; + + /** + * @zh_CN 是否显示验证码登录 + */ + showCodeLogin?: boolean; + /** + * @zh_CN 是否显示忘记密码 + */ + showForgetPassword?: boolean; + + /** + * @zh_CN 是否显示二维码登录 + */ + showQrcodeLogin?: boolean; + + /** + * @zh_CN 是否显示注册按钮 + */ + showRegister?: boolean; + + /** + * @zh_CN 是否显示记住账号 + */ + showRememberMe?: boolean; + + /** + * @zh_CN 是否显示第三方登录 + */ + showThirdPartyLogin?: boolean; + + /** + * @zh_CN 登录框子标题 + */ + subTitle?: string; + + /** + * @zh_CN 登录框标题 + */ + title?: string; + + /** + * @zh_CN 用户名占位符 + */ + usernamePlaceholder?: string; +} +``` + +::: + +::: tip + +如果这些配置不能满足你的需求,你可以自行实现登录表单及相关登录逻辑。 + +::: diff --git a/docs/src/guide/introduction/thin.md b/docs/src/guide/introduction/thin.md index 818227e9..422a520d 100644 --- a/docs/src/guide/introduction/thin.md +++ b/docs/src/guide/introduction/thin.md @@ -28,12 +28,7 @@ apps/web-native ## Mock 服务精简 -如果你不需要`Mock`服务,你可以直接删除`apps/backend-mock`文件夹。同时在你的应用下`.env.development`文件中删除`VITE_NITRO_MOCK`变量。 - -```bash -# 是否开启 Nitro Mock服务,true 为开启,false 为关闭 -VITE_NITRO_MOCK=false -``` +如果你不需要`Mock`服务,你可以直接删除`apps/backend-mock`文件夹即可。 ## 安装依赖 diff --git a/docs/src/public/guide/login.png b/docs/src/public/guide/login.png new file mode 100644 index 00000000..3774b0bd Binary files /dev/null and b/docs/src/public/guide/login.png differ diff --git a/internal/tailwind-config/package.json b/internal/tailwind-config/package.json index c161447b..4d90c637 100644 --- a/internal/tailwind-config/package.json +++ b/internal/tailwind-config/package.json @@ -46,7 +46,7 @@ "tailwindcss": "^3.4.3" }, "dependencies": { - "@iconify/json": "^2.2.237", + "@iconify/json": "^2.2.238", "@iconify/tailwind": "^1.1.2", "@tailwindcss/nesting": "0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.14", diff --git a/internal/vite-config/src/plugins/nitro-mock.ts b/internal/vite-config/src/plugins/nitro-mock.ts index 99e8c06e..60d7327d 100644 --- a/internal/vite-config/src/plugins/nitro-mock.ts +++ b/internal/vite-config/src/plugins/nitro-mock.ts @@ -23,7 +23,9 @@ export const viteNitroMockPlugin = ({ const pkg = await getPackage(mockServerPackage); if (!pkg) { - consola.error(`Package ${mockServerPackage} not found.`); + consola.log( + `Package ${mockServerPackage} not found. Skip mock server.`, + ); return; } diff --git a/package.json b/package.json index 96550659..e834a6da 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,11 @@ "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build", "build:analyze": "turbo build:analyze", "build:docker": "./build-local-docker-image.sh", + "build:antd": "pnpm run build --filter=@vben/web-antd", + "build:docs": "pnpm run build --filter=@vben/docs", + "build:ele": "pnpm run build --filter=@vben/web-ele", + "build:naive": "pnpm run build --filter=@vben/web-naive", + "build:play": "pnpm run build --filter=@vben/playground", "changeset": "pnpm exec changeset", "check": "pnpm run check:circular && pnpm run check:dep && pnpm run check:type && pnpm check:cspell", "check:circular": "vsh check-circular", @@ -41,8 +46,8 @@ "dev:antd": "pnpm -F @vben/web-antd run dev", "dev:docs": "pnpm -F @vben/docs run dev", "dev:ele": "pnpm -F @vben/web-ele run dev", - "dev:play": "pnpm -F @vben/playground run dev", "dev:naive": "pnpm -F @vben/web-naive run dev", + "dev:play": "pnpm -F @vben/playground run dev", "format": "vsh lint --format", "lint": "vsh lint", "postinstall": "turbo run stub", @@ -60,7 +65,7 @@ "@changesets/cli": "^2.27.7", "@ls-lint/ls-lint": "^2.2.3", "@types/jsdom": "^21.1.7", - "@types/node": "^22.3.0", + "@types/node": "^22.4.0", "@vben/commitlint-config": "workspace:*", "@vben/eslint-config": "workspace:*", "@vben/prettier-config": "workspace:*", @@ -75,7 +80,7 @@ "@vue/test-utils": "^2.4.6", "autoprefixer": "^10.4.20", "cross-env": "^7.0.3", - "cspell": "^8.13.3", + "cspell": "^8.14.1", "husky": "^9.1.4", "is-ci": "^3.0.1", "jsdom": "^24.1.1", @@ -87,7 +92,7 @@ "unbuild": "^2.0.0", "vite": "^5.4.1", "vitest": "^2.0.5", - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-tsc": "^2.0.29" }, "engines": { @@ -105,7 +110,7 @@ "@ctrl/tinycolor": "4.1.0", "clsx": "2.1.1", "pinia": "2.2.2", - "vue": "3.4.37" + "vue": "3.4.38" }, "neverBuiltDependencies": [ "canvas", diff --git a/packages/@core/base/icons/package.json b/packages/@core/base/icons/package.json index 44d43335..dbc8a6e2 100644 --- a/packages/@core/base/icons/package.json +++ b/packages/@core/base/icons/package.json @@ -36,6 +36,6 @@ "dependencies": { "@iconify/vue": "^4.1.2", "lucide-vue-next": "^0.428.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/base/icons/src/create-icon.ts b/packages/@core/base/icons/src/create-icon.ts index f108023f..2c40045b 100644 --- a/packages/@core/base/icons/src/create-icon.ts +++ b/packages/@core/base/icons/src/create-icon.ts @@ -4,7 +4,7 @@ import { Icon } from '@iconify/vue'; function createIconifyIcon(icon: string) { return defineComponent({ - name: `SvgIcon-${icon}`, + name: `Icon-${icon}`, setup(props, { attrs }) { return () => h(Icon, { icon, ...props, ...attrs }); }, diff --git a/packages/@core/base/icons/src/index.ts b/packages/@core/base/icons/src/index.ts index b373567d..d533cd58 100644 --- a/packages/@core/base/icons/src/index.ts +++ b/packages/@core/base/icons/src/index.ts @@ -1,5 +1,4 @@ export * from './create-icon'; export * from './lucide'; -export * from './mdi'; export * from '@iconify/vue'; diff --git a/packages/@core/base/icons/src/lucide.ts b/packages/@core/base/icons/src/lucide.ts index 1f14f32c..02d96f17 100644 --- a/packages/@core/base/icons/src/lucide.ts +++ b/packages/@core/base/icons/src/lucide.ts @@ -1,7 +1,9 @@ export { ArrowDown, ArrowLeft, + ArrowLeftFromLine as MdiMenuOpen, ArrowLeftToLine, + ArrowRightFromLine as MdiMenuClose, ArrowRightLeft, ArrowRightToLine, ArrowUp, @@ -11,10 +13,12 @@ export { ChevronDown, ChevronLeft, ChevronRight, + ChevronsLeft, + ChevronsRight, CircleHelp, Copy, CornerDownLeft, - Disc3 as IconDefault, + Disc as IconDefault, Ellipsis, ExternalLink, Eye, @@ -36,6 +40,8 @@ export { Palette, PanelLeft, PanelRight, + Pin, + PinOff, RotateCw, Search, SearchX, diff --git a/packages/@core/base/icons/src/mdi.ts b/packages/@core/base/icons/src/mdi.ts deleted file mode 100644 index 781845a9..00000000 --- a/packages/@core/base/icons/src/mdi.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { createIconifyIcon } from './create-icon'; - -export const MdiKeyboardEsc = createIconifyIcon('mdi:keyboard-esc'); - -export const MdiWechat = createIconifyIcon('mdi:wechat'); - -export const MdiGithub = createIconifyIcon('mdi:github'); - -export const MdiGoogle = createIconifyIcon('mdi:google'); - -export const MdiQqchat = createIconifyIcon('mdi:qqchat'); - -export const MdiPin = createIconifyIcon('mdi:pin'); - -export const MdiPinOff = createIconifyIcon('mdi:pin-off'); - -export const MdiMenuClose = createIconifyIcon('mdi:menu-close'); - -export const MdiMenuOpen = createIconifyIcon('mdi:menu-open'); - -export const EosSystem = createIconifyIcon('eos-icons:system-group'); -// 缓存监控使用 -export const RedisIcon = createIconifyIcon('logos:redis'); -export const CommandLineIcon = createIconifyIcon( - 'flat-color-icons:command-line', -); -export const MemoryIcon = createIconifyIcon('la:memory'); - -export const GiteeIcon = createIconifyIcon('simple-icons:gitee'); diff --git a/packages/@core/base/shared/build.config.ts b/packages/@core/base/shared/build.config.ts index 4192eb26..cd8b6c5c 100644 --- a/packages/@core/base/shared/build.config.ts +++ b/packages/@core/base/shared/build.config.ts @@ -5,6 +5,7 @@ export default defineBuildConfig({ declaration: true, entries: [ 'src/index', + 'src/store', 'src/constants/index', 'src/utils/index', 'src/color/index', diff --git a/packages/@core/base/shared/package.json b/packages/@core/base/shared/package.json index cc4d490f..a75b15ff 100644 --- a/packages/@core/base/shared/package.json +++ b/packages/@core/base/shared/package.json @@ -44,6 +44,11 @@ "types": "./src/cache/index.ts", "development": "./src/cache/index.ts", "default": "./dist/cache/index.mjs" + }, + "./store": { + "types": "./src/store.ts", + "development": "./src/store.ts", + "default": "./dist/store.mjs" } }, "publishConfig": { @@ -56,7 +61,8 @@ }, "dependencies": { "@ctrl/tinycolor": "^4.1.0", - "@vue/shared": "^3.4.37", + "@tanstack/vue-store": "^0.5.5", + "@vue/shared": "^3.4.38", "clsx": "^2.1.1", "defu": "^6.1.4", "lodash.clonedeep": "^4.5.0", diff --git a/packages/@core/base/shared/src/index.ts b/packages/@core/base/shared/src/index.ts index 55bf8502..3ec6612f 100644 --- a/packages/@core/base/shared/src/index.ts +++ b/packages/@core/base/shared/src/index.ts @@ -1,4 +1,5 @@ export * from './cache'; export * from './color'; export * from './constants'; +export * from './store'; export * from './utils'; diff --git a/packages/@core/base/shared/src/store.ts b/packages/@core/base/shared/src/store.ts new file mode 100644 index 00000000..4b03afb0 --- /dev/null +++ b/packages/@core/base/shared/src/store.ts @@ -0,0 +1 @@ +export * from '@tanstack/vue-store'; diff --git a/packages/@core/base/typings/package.json b/packages/@core/base/typings/package.json index 47d2d78c..590e874d 100644 --- a/packages/@core/base/typings/package.json +++ b/packages/@core/base/typings/package.json @@ -38,7 +38,7 @@ } }, "dependencies": { - "vue": "^3.4.37", + "vue": "^3.4.38", "vue-router": "^4.4.3" } } diff --git a/packages/@core/composables/package.json b/packages/@core/composables/package.json index e8485016..6e18264f 100644 --- a/packages/@core/composables/package.json +++ b/packages/@core/composables/package.json @@ -39,7 +39,7 @@ "@vueuse/core": "^11.0.0", "radix-vue": "^1.9.4", "sortablejs": "^1.15.2", - "vue": "^3.4.37" + "vue": "^3.4.38" }, "devDependencies": { "@types/sortablejs": "^1.15.8" diff --git a/packages/@core/preferences/package.json b/packages/@core/preferences/package.json index 2e043696..8b7cee1c 100644 --- a/packages/@core/preferences/package.json +++ b/packages/@core/preferences/package.json @@ -32,6 +32,6 @@ "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^11.0.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/preferences/src/preferences.ts b/packages/@core/preferences/src/preferences.ts index f164a6b9..4670c07c 100644 --- a/packages/@core/preferences/src/preferences.ts +++ b/packages/@core/preferences/src/preferences.ts @@ -116,7 +116,6 @@ class PreferenceManager { this.updatePreferences({ theme: { mode: isDark ? 'dark' : 'light' }, }); - // updateCSSVariables(this.state); }); } diff --git a/packages/@core/ui-kit/layout-ui/package.json b/packages/@core/ui-kit/layout-ui/package.json index c0dd5f63..1e65d4c6 100644 --- a/packages/@core/ui-kit/layout-ui/package.json +++ b/packages/@core/ui-kit/layout-ui/package.json @@ -42,6 +42,6 @@ "@vben-core/shadcn-ui": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^11.0.0", - "vue": "^3.4.37" + "vue": "^3.4.38" } } diff --git a/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue b/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue index ab1d4d7f..1dd0c548 100644 --- a/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue +++ b/packages/@core/ui-kit/layout-ui/src/components/layout-content.vue @@ -54,7 +54,6 @@ const style = computed((): CSSProperties => {