diff --git a/apps/web-antd/src/router/guard.ts b/apps/web-antd/src/router/guard.ts index 205ee569..52edfe01 100644 --- a/apps/web-antd/src/router/guard.ts +++ b/apps/web-antd/src/router/guard.ts @@ -8,7 +8,7 @@ import { startProgress, stopProgress } from '@vben/utils'; import { useTitle } from '@vueuse/core'; import { $t } from '#/locales'; -import { coreRouteNames, dynamicRoutes } from '#/router/routes'; +import { accessRoutes, coreRouteNames } from '#/router/routes'; import { useAuthStore } from '#/store'; import { generateAccess } from './access'; @@ -105,7 +105,7 @@ function setupAccessGuard(router: Router) { roles: userRoles, router, // 则会在菜单中显示，但是访问会被重定向到403 - routes: dynamicRoutes, + routes: accessRoutes, }); // 保存菜单信息和路由信息 diff --git a/apps/web-antd/src/router/routes/index.ts b/apps/web-antd/src/router/routes/index.ts index a70c4875..ea91dbe7 100644 --- a/apps/web-antd/src/router/routes/index.ts +++ b/apps/web-antd/src/router/routes/index.ts @@ -10,12 +10,16 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { // 有需要可以自行打开注释，并创建文件夹 // const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); +// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统(不会显示在菜单中) */ // const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +/** 不需要权限的菜单列表（会显示在菜单中） */ +// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); +const staticRoutes: RouteRecordRaw[] = []; const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ @@ -28,4 +32,5 @@ const routes: RouteRecordRaw[] = [ /** 基本路由列表，这些路由不需要进入权限拦截 */ const coreRouteNames = traverseTreeValues(coreRoutes, (route) => route.name); -export { coreRouteNames, dynamicRoutes, routes }; +const accessRoutes = [...dynamicRoutes, ...staticRoutes]; +export { accessRoutes, coreRouteNames, routes }; diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index 0d222698..e4e733fd 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-ele", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-ele/src/router/guard.ts b/apps/web-ele/src/router/guard.ts index 205ee569..52edfe01 100644 --- a/apps/web-ele/src/router/guard.ts +++ b/apps/web-ele/src/router/guard.ts @@ -8,7 +8,7 @@ import { startProgress, stopProgress } from '@vben/utils'; import { useTitle } from '@vueuse/core'; import { $t } from '#/locales'; -import { coreRouteNames, dynamicRoutes } from '#/router/routes'; +import { accessRoutes, coreRouteNames } from '#/router/routes'; import { useAuthStore } from '#/store'; import { generateAccess } from './access'; @@ -105,7 +105,7 @@ function setupAccessGuard(router: Router) { roles: userRoles, router, // 则会在菜单中显示，但是访问会被重定向到403 - routes: dynamicRoutes, + routes: accessRoutes, }); // 保存菜单信息和路由信息 diff --git a/apps/web-ele/src/router/routes/index.ts b/apps/web-ele/src/router/routes/index.ts index a70c4875..ea91dbe7 100644 --- a/apps/web-ele/src/router/routes/index.ts +++ b/apps/web-ele/src/router/routes/index.ts @@ -10,12 +10,16 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { // 有需要可以自行打开注释，并创建文件夹 // const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); +// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统(不会显示在菜单中) */ // const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +/** 不需要权限的菜单列表（会显示在菜单中） */ +// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); +const staticRoutes: RouteRecordRaw[] = []; const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ @@ -28,4 +32,5 @@ const routes: RouteRecordRaw[] = [ /** 基本路由列表，这些路由不需要进入权限拦截 */ const coreRouteNames = traverseTreeValues(coreRoutes, (route) => route.name); -export { coreRouteNames, dynamicRoutes, routes }; +const accessRoutes = [...dynamicRoutes, ...staticRoutes]; +export { accessRoutes, coreRouteNames, routes }; diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index 86b494c7..1d4dae0b 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-naive", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-naive/src/router/guard.ts b/apps/web-naive/src/router/guard.ts index 6c9f8232..d12003c0 100644 --- a/apps/web-naive/src/router/guard.ts +++ b/apps/web-naive/src/router/guard.ts @@ -8,7 +8,7 @@ import { startProgress, stopProgress } from '@vben/utils'; import { useTitle } from '@vueuse/core'; import { $t } from '#/locales'; -import { coreRouteNames, dynamicRoutes } from '#/router/routes'; +import { accessRoutes, coreRouteNames } from '#/router/routes'; import { useAuthStore } from '#/store'; import { generateAccess } from './access'; @@ -104,7 +104,7 @@ function setupAccessGuard(router: Router) { roles: userRoles, router, // 则会在菜单中显示，但是访问会被重定向到403 - routes: dynamicRoutes, + routes: accessRoutes, }); // 保存菜单信息和路由信息 diff --git a/apps/web-naive/src/router/routes/index.ts b/apps/web-naive/src/router/routes/index.ts index a70c4875..ea91dbe7 100644 --- a/apps/web-naive/src/router/routes/index.ts +++ b/apps/web-naive/src/router/routes/index.ts @@ -10,12 +10,16 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { // 有需要可以自行打开注释，并创建文件夹 // const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); +// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统(不会显示在菜单中) */ // const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +/** 不需要权限的菜单列表（会显示在菜单中） */ +// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); +const staticRoutes: RouteRecordRaw[] = []; const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ @@ -28,4 +32,5 @@ const routes: RouteRecordRaw[] = [ /** 基本路由列表，这些路由不需要进入权限拦截 */ const coreRouteNames = traverseTreeValues(coreRoutes, (route) => route.name); -export { coreRouteNames, dynamicRoutes, routes }; +const accessRoutes = [...dynamicRoutes, ...staticRoutes]; +export { accessRoutes, coreRouteNames, routes }; diff --git a/docs/package.json b/docs/package.json index b60ea0ca..0585e667 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@vben/docs", - "version": "5.4.2", + "version": "5.4.3", "private": true, "scripts": { "build": "vitepress build", diff --git a/internal/lint-configs/commitlint-config/package.json b/internal/lint-configs/commitlint-config/package.json index 11d06231..e32b0e41 100644 --- a/internal/lint-configs/commitlint-config/package.json +++ b/internal/lint-configs/commitlint-config/package.json @@ -1,6 +1,6 @@ { "name": "@vben/commitlint-config", - "version": "5.4.2", + "version": "5.4.3", "private": true, "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", diff --git a/internal/lint-configs/stylelint-config/package.json b/internal/lint-configs/stylelint-config/package.json index e2d99b32..9a18202e 100644 --- a/internal/lint-configs/stylelint-config/package.json +++ b/internal/lint-configs/stylelint-config/package.json @@ -1,6 +1,6 @@ { "name": "@vben/stylelint-config", - "version": "5.4.2", + "version": "5.4.3", "private": true, "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", diff --git a/internal/node-utils/package.json b/internal/node-utils/package.json index c89343f3..2567a0d3 100644 --- a/internal/node-utils/package.json +++ b/internal/node-utils/package.json @@ -1,6 +1,6 @@ { "name": "@vben/node-utils", - "version": "5.4.2", + "version": "5.4.3", "private": true, "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", diff --git a/internal/tailwind-config/package.json b/internal/tailwind-config/package.json index d6b281b7..e0c65983 100644 --- a/internal/tailwind-config/package.json +++ b/internal/tailwind-config/package.json @@ -1,6 +1,6 @@ { "name": "@vben/tailwind-config", - "version": "5.4.2", + "version": "5.4.3", "private": true, "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", diff --git a/internal/tsconfig/package.json b/internal/tsconfig/package.json index c99426d8..f978a12c 100644 --- a/internal/tsconfig/package.json +++ b/internal/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@vben/tsconfig", - "version": "5.4.2", + "version": "5.4.3", "private": true, "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 5636d376..18250107 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -1,6 +1,6 @@ { "name": "@vben/vite-config", - "version": "5.4.2", + "version": "5.4.3", "private": true, "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", diff --git a/package.json b/package.json index c66dcbc4..03872f3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vben-admin-monorepo", - "version": "5.4.2", + "version": "5.4.3", "private": true, "keywords": [ "monorepo", diff --git a/packages/@core/base/design/package.json b/packages/@core/base/design/package.json index dee14cc5..54495aba 100644 --- a/packages/@core/base/design/package.json +++ b/packages/@core/base/design/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/design", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/base/icons/package.json b/packages/@core/base/icons/package.json index c3f867d6..216d11f1 100644 --- a/packages/@core/base/icons/package.json +++ b/packages/@core/base/icons/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/icons", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/base/shared/package.json b/packages/@core/base/shared/package.json index f7681efd..747610b0 100644 --- a/packages/@core/base/shared/package.json +++ b/packages/@core/base/shared/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/shared", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/base/typings/package.json b/packages/@core/base/typings/package.json index f52d6bf6..43863abb 100644 --- a/packages/@core/base/typings/package.json +++ b/packages/@core/base/typings/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/typings", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/composables/package.json b/packages/@core/composables/package.json index bd2c3489..a0a86455 100644 --- a/packages/@core/composables/package.json +++ b/packages/@core/composables/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/composables", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/preferences/package.json b/packages/@core/preferences/package.json index d8a3dafc..5961a1b6 100644 --- a/packages/@core/preferences/package.json +++ b/packages/@core/preferences/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/preferences", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/ui-kit/form-ui/src/form-render/form.vue b/packages/@core/ui-kit/form-ui/src/form-render/form.vue index 54ae5d26..348f03d8 100644 --- a/packages/@core/ui-kit/form-ui/src/form-render/form.vue +++ b/packages/@core/ui-kit/form-ui/src/form-render/form.vue @@ -81,7 +81,10 @@ const formCollapsed = computed(() => { }); const computedSchema = computed( - (): ({ commonComponentProps: Record } & FormSchema)[] => { + (): ({ + commonComponentProps: Record; + formFieldProps: Record; + } & Omit)[] => { const { componentProps = {}, controlClass = '', diff --git a/packages/@core/ui-kit/layout-ui/package.json b/packages/@core/ui-kit/layout-ui/package.json index e3bc1abc..46f8074d 100644 --- a/packages/@core/ui-kit/layout-ui/package.json +++ b/packages/@core/ui-kit/layout-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/layout-ui", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/ui-kit/menu-ui/package.json b/packages/@core/ui-kit/menu-ui/package.json index 8aef5c6f..39edef3b 100644 --- a/packages/@core/ui-kit/menu-ui/package.json +++ b/packages/@core/ui-kit/menu-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/menu-ui", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/@core/ui-kit/shadcn-ui/package.json b/packages/@core/ui-kit/shadcn-ui/package.json index aa66d9de..87a3a264 100644 --- a/packages/@core/ui-kit/shadcn-ui/package.json +++ b/packages/@core/ui-kit/shadcn-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/shadcn-ui", - "version": "5.4.2", + "version": "5.4.3", "#main": "./dist/index.mjs", "#module": "./dist/index.mjs", "homepage": "https://github.com/vbenjs/vue-vben-admin", diff --git a/packages/@core/ui-kit/tabs-ui/package.json b/packages/@core/ui-kit/tabs-ui/package.json index 80e4559b..cd8ee183 100644 --- a/packages/@core/ui-kit/tabs-ui/package.json +++ b/packages/@core/ui-kit/tabs-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/tabs-ui", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/constants/package.json b/packages/constants/package.json index 7cfb2a7b..1746e89f 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -1,6 +1,6 @@ { "name": "@vben/constants", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/access/package.json b/packages/effects/access/package.json index d20ae01f..99acf7d7 100644 --- a/packages/effects/access/package.json +++ b/packages/effects/access/package.json @@ -1,6 +1,6 @@ { "name": "@vben/access", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json index c60aa863..bc353fbc 100644 --- a/packages/effects/common-ui/package.json +++ b/packages/effects/common-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vben/common-ui", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/hooks/package.json b/packages/effects/hooks/package.json index 164c1509..1451c29d 100644 --- a/packages/effects/hooks/package.json +++ b/packages/effects/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@vben/hooks", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/layouts/package.json b/packages/effects/layouts/package.json index 3db1cd13..b2139e75 100644 --- a/packages/effects/layouts/package.json +++ b/packages/effects/layouts/package.json @@ -1,6 +1,6 @@ { "name": "@vben/layouts", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/plugins/package.json b/packages/effects/plugins/package.json index fe97c530..23515236 100644 --- a/packages/effects/plugins/package.json +++ b/packages/effects/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@vben/plugins", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/plugins/src/echarts/use-echarts.ts b/packages/effects/plugins/src/echarts/use-echarts.ts index 57b175c1..5752f5ee 100644 --- a/packages/effects/plugins/src/echarts/use-echarts.ts +++ b/packages/effects/plugins/src/echarts/use-echarts.ts @@ -31,12 +31,11 @@ function useEcharts(chartRef: Ref) { const getOptions = computed((): EChartsOption => { if (!isDark.value) { - return cacheOptions; + return {}; } return { backgroundColor: 'transparent', - ...cacheOptions, }; }); @@ -52,10 +51,14 @@ function useEcharts(chartRef: Ref) { const renderEcharts = (options: EChartsOption, clear = true) => { cacheOptions = options; + const currentOptions = { + ...options, + ...getOptions.value, + }; return new Promise((resolve) => { if (chartRef.value?.offsetHeight === 0) { useTimeoutFn(() => { - renderEcharts(getOptions.value); + renderEcharts(currentOptions); resolve(null); }, 30); return; @@ -67,7 +70,7 @@ function useEcharts(chartRef: Ref) { if (!instance) return; } clear && chartInstance?.clear(); - chartInstance?.setOption(getOptions.value); + chartInstance?.setOption(currentOptions); resolve(null); }, 30); }); diff --git a/packages/effects/request/package.json b/packages/effects/request/package.json index 03e45929..5824568d 100644 --- a/packages/effects/request/package.json +++ b/packages/effects/request/package.json @@ -1,6 +1,6 @@ { "name": "@vben/request", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/icons/package.json b/packages/icons/package.json index 1163dd5d..f1a13432 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,6 +1,6 @@ { "name": "@vben/icons", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/locales/package.json b/packages/locales/package.json index fc04badd..944155bd 100644 --- a/packages/locales/package.json +++ b/packages/locales/package.json @@ -1,6 +1,6 @@ { "name": "@vben/locales", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/preferences/package.json b/packages/preferences/package.json index 7a89ecd3..132f36f7 100644 --- a/packages/preferences/package.json +++ b/packages/preferences/package.json @@ -1,6 +1,6 @@ { "name": "@vben/preferences", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/stores/package.json b/packages/stores/package.json index 3198a0f7..143d0c86 100644 --- a/packages/stores/package.json +++ b/packages/stores/package.json @@ -1,6 +1,6 @@ { "name": "@vben/stores", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/styles/package.json b/packages/styles/package.json index 97346f7d..07264107 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -1,6 +1,6 @@ { "name": "@vben/styles", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/types/package.json b/packages/types/package.json index 18e48e76..251443ed 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@vben/types", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 261485e9..d6e23c33 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@vben/utils", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/playground/package.json b/playground/package.json index c656cd95..18fb1662 100644 --- a/playground/package.json +++ b/playground/package.json @@ -1,6 +1,6 @@ { "name": "@vben/playground", - "version": "5.4.2", + "version": "5.4.3", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/playground/src/router/guard.ts b/playground/src/router/guard.ts index 441dcf9f..ff7aa2bc 100644 --- a/playground/src/router/guard.ts +++ b/playground/src/router/guard.ts @@ -8,7 +8,7 @@ import { startProgress, stopProgress } from '@vben/utils'; import { useTitle } from '@vueuse/core'; import { $t } from '#/locales'; -import { coreRouteNames, dynamicRoutes } from '#/router/routes'; +import { accessRoutes, coreRouteNames } from '#/router/routes'; import { useAuthStore } from '#/store'; import { generateAccess } from './access'; @@ -103,7 +103,7 @@ function setupAccessGuard(router: Router) { roles: userRoles, router, // 则会在菜单中显示，但是访问会被重定向到403 - routes: dynamicRoutes, + routes: accessRoutes, }); // 保存菜单信息和路由信息 diff --git a/playground/src/router/routes/index.ts b/playground/src/router/routes/index.ts index a70c4875..ea0fbbcc 100644 --- a/playground/src/router/routes/index.ts +++ b/playground/src/router/routes/index.ts @@ -10,12 +10,16 @@ const dynamicRouteFiles = import.meta.glob('./modules/**/*.ts', { // 有需要可以自行打开注释，并创建文件夹 // const externalRouteFiles = import.meta.glob('./external/**/*.ts', { eager: true }); +// const staticRouteFiles = import.meta.glob('./static/**/*.ts', { eager: true }); /** 动态路由 */ const dynamicRoutes: RouteRecordRaw[] = mergeRouteModules(dynamicRouteFiles); -/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统 */ +/** 外部路由列表，访问这些页面可以不需要Layout，可能用于内嵌在别的系统(不会显示在菜单中) */ // const externalRoutes: RouteRecordRaw[] = mergeRouteModules(externalRouteFiles); +/** 不需要权限的菜单列表（会显示在菜单中） */ +// const staticRoutes: RouteRecordRaw[] = mergeRouteModules(staticRouteFiles); +const staticRoutes: RouteRecordRaw[] = []; const externalRoutes: RouteRecordRaw[] = []; /** 路由列表，由基本路由+静态路由组成 */ @@ -28,4 +32,6 @@ const routes: RouteRecordRaw[] = [ /** 基本路由列表，这些路由不需要进入权限拦截 */ const coreRouteNames = traverseTreeValues(coreRoutes, (route) => route.name); -export { coreRouteNames, dynamicRoutes, routes }; +const accessRoutes = [...dynamicRoutes, ...staticRoutes]; + +export { accessRoutes, coreRouteNames, routes }; diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 749652f1..32f43b05 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -21,8 +21,8 @@ catalog: '@commitlint/config-conventional': ^19.5.0 '@ctrl/tinycolor': ^4.1.0 '@eslint/js': ^9.13.0 - '@faker-js/faker': ^9.0.3 - '@iconify/json': ^2.2.263 + '@faker-js/faker': ^9.1.0 + '@iconify/json': ^2.2.264 '@iconify/tailwind': ^1.1.3 '@iconify/vue': ^4.1.2 '@intlify/core-base': ^10.0.4 @@ -30,7 +30,7 @@ catalog: '@jspm/generator': ^2.4.1 '@manypkg/get-packages': ^2.2.2 '@nolebase/vitepress-plugin-git-changelog': ^2.6.1 - '@playwright/test': ^1.48.1 + '@playwright/test': ^1.48.2 '@pnpm/workspace.read-manifest': ^2.2.1 '@stylistic/stylelint-plugin': ^3.1.1 '@tailwindcss/nesting': 0.0.0-insiders.565cd3e @@ -42,14 +42,14 @@ catalog: '@types/html-minifier-terser': ^7.0.2 '@types/jsonwebtoken': ^9.0.7 '@types/lodash.clonedeep': ^4.5.9 - '@types/node': ^22.7.9 + '@types/node': ^22.8.1 '@types/nprogress': ^0.2.3 '@types/postcss-import': ^14.0.3 '@types/qrcode': ^1.5.5 '@types/sortablejs': ^1.15.8 '@typescript-eslint/eslint-plugin': ^8.11.0 '@typescript-eslint/parser': ^8.11.0 - '@vee-validate/zod': ^4.14.4 + '@vee-validate/zod': ^4.14.6 '@vite-pwa/vitepress': ^0.5.3 '@vitejs/plugin-vue': ^5.1.4 '@vitejs/plugin-vue-jsx': ^4.0.1 @@ -98,7 +98,7 @@ catalog: eslint-plugin-unused-imports: ^4.1.4 eslint-plugin-vitest: ^0.5.4 eslint-plugin-vue: ^9.29.1 - execa: ^9.4.1 + execa: ^9.5.0 find-up: ^7.0.0 get-port: ^7.1.0 globals: ^15.11.0 @@ -119,9 +119,9 @@ catalog: nprogress: ^0.2.0 ora: ^8.1.0 pinia: 2.2.2 - pinia-plugin-persistedstate: ^4.1.1 + pinia-plugin-persistedstate: ^4.1.2 pkg-types: ^1.2.1 - playwright: ^1.48.1 + playwright: ^1.48.2 postcss: ^8.4.47 postcss-antd-fixes: ^0.2.0 postcss-html: ^1.7.0 @@ -135,7 +135,7 @@ catalog: radix-vue: ^1.9.7 resolve.exports: ^2.0.2 rimraf: ^6.0.1 - rollup: ^4.24.0 + rollup: ^4.24.1 rollup-plugin-visualizer: ^5.12.0 sass: 1.79.5 sortablejs: ^1.15.3 @@ -156,7 +156,7 @@ catalog: typescript: ^5.6.3 unbuild: ^2.0.0 unplugin-element-plus: ^0.8.0 - vee-validate: ^4.14.4 + vee-validate: ^4.14.6 vite: ^5.4.10 vite-plugin-compression: ^0.5.1 vite-plugin-dts: 4.2.1 @@ -164,7 +164,7 @@ catalog: vite-plugin-lazy-import: ^1.0.7 vite-plugin-lib-inject-css: ^2.1.1 vite-plugin-pwa: ^0.20.5 - vite-plugin-vue-devtools: ^7.5.3 + vite-plugin-vue-devtools: ^7.5.4 vitepress: ^1.4.1 vitepress-plugin-group-icons: ^1.3.0 vitest: ^2.1.3 @@ -172,9 +172,9 @@ catalog: vue-eslint-parser: ^9.4.3 vue-i18n: ^10.0.4 vue-router: ^4.4.5 - vue-tsc: ^2.1.6 - vxe-pc-ui: ^4.2.28 - vxe-table: ^4.7.94 + vue-tsc: ^2.1.8 + vxe-pc-ui: ^4.2.33 + vxe-table: ^4.7.97 watermark-js-plus: ^1.5.7 zod: ^3.23.8 zod-defaults: ^0.1.3 diff --git a/scripts/turbo-run/package.json b/scripts/turbo-run/package.json index 3c0016ed..d86072f8 100644 --- a/scripts/turbo-run/package.json +++ b/scripts/turbo-run/package.json @@ -1,6 +1,6 @@ { "name": "@vben/turbo-run", - "version": "5.4.2", + "version": "5.4.3", "private": true, "license": "MIT", "type": "module", diff --git a/scripts/vsh/package.json b/scripts/vsh/package.json index 3d811169..b4d77c10 100644 --- a/scripts/vsh/package.json +++ b/scripts/vsh/package.json @@ -1,6 +1,6 @@ { "name": "@vben/vsh", - "version": "5.4.2", + "version": "5.4.3", "private": true, "license": "MIT", "type": "module",