From cb5ecf4a8ae416ec3967a3094894313bb90af557 Mon Sep 17 00:00:00 2001 From: Netfan Date: Thu, 26 Dec 2024 19:23:59 +0800 Subject: [PATCH 0001/1032] chore: add apiSelect remote search demo (#5246) --- playground/src/views/examples/form/basic.vue | 52 +++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/playground/src/views/examples/form/basic.vue b/playground/src/views/examples/form/basic.vue index da292b2b..927ab0da 100644 --- a/playground/src/views/examples/form/basic.vue +++ b/playground/src/views/examples/form/basic.vue @@ -1,9 +1,10 @@ diff --git a/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue b/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue index 4ae09130..67729fd3 100644 --- a/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue +++ b/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue @@ -4,6 +4,7 @@ import type { BreadcrumbStyleType, BuiltinThemeType, ContentCompactType, + LayoutHeaderMenuAlignType, LayoutHeaderModeType, LayoutType, NavigationStyleType, @@ -94,6 +95,8 @@ const SidebarExpandOnHover = defineModel('sidebarExpandOnHover'); const headerEnable = defineModel('headerEnable'); const headerMode = defineModel('headerMode'); +const headerMenuAlign = + defineModel('headerMenuAlign'); const breadcrumbEnable = defineModel('breadcrumbEnable'); const breadcrumbShowIcon = defineModel('breadcrumbShowIcon'); @@ -317,6 +320,7 @@ async function handleReset() {
diff --git a/packages/locales/src/langs/en-US/preferences.json b/packages/locales/src/langs/en-US/preferences.json index 5bb58176..57b535c4 100644 --- a/packages/locales/src/langs/en-US/preferences.json +++ b/packages/locales/src/langs/en-US/preferences.json @@ -138,7 +138,11 @@ "modeStatic": "Static", "modeFixed": "Fixed", "modeAuto": "Auto hide & Show", - "modeAutoScroll": "Scroll to Hide & Show" + "modeAutoScroll": "Scroll to Hide & Show", + "menuAlign": "Menu Align", + "menuAlignStart": "Start", + "menuAlignEnd": "End", + "menuAlignCenter": "Center" }, "footer": { "title": "Footer", diff --git a/packages/locales/src/langs/zh-CN/preferences.json b/packages/locales/src/langs/zh-CN/preferences.json index 5c3c2283..4963b6c7 100644 --- a/packages/locales/src/langs/zh-CN/preferences.json +++ b/packages/locales/src/langs/zh-CN/preferences.json @@ -138,7 +138,11 @@ "modeFixed": "固定", "modeAuto": "自动隐藏和显示", "modeAutoScroll": "滚动隐藏和显示", - "visible": "显示顶栏" + "visible": "显示顶栏", + "menuAlign": "菜单位置", + "menuAlignStart": "左侧", + "menuAlignEnd": "右侧", + "menuAlignCenter": "居中" }, "footer": { "title": "底栏", From 548c2e55008523129699addf18df38d2a7c0f3f3 Mon Sep 17 00:00:00 2001 From: Netfan Date: Sat, 28 Dec 2024 17:53:04 +0800 Subject: [PATCH 0004/1032] chore: downgrade vue-tsc version --- pnpm-lock.yaml | 95 +++++++++++++++++++++++---------------------- pnpm-workspace.yaml | 2 +- 2 files changed, 49 insertions(+), 48 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 19f669ed..5d38c036 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -475,8 +475,8 @@ catalogs: specifier: ^4.5.0 version: 4.5.0 vue-tsc: - specifier: ^2.2.0 - version: 2.2.0 + specifier: ^2.1.10 + version: 2.1.10 vxe-pc-ui: specifier: ^4.3.48 version: 4.3.48 @@ -591,7 +591,7 @@ importers: version: 5.6.3 unbuild: specifier: 'catalog:' - version: 3.1.0(typescript@5.6.3)(vue-tsc@2.2.0(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)) + version: 3.1.0(typescript@5.6.3)(vue-tsc@2.1.10(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)) vite: specifier: 'catalog:' version: 6.0.6(@types/node@22.10.2)(jiti@2.4.2)(less@4.2.1)(sass@1.80.6)(terser@5.37.0)(yaml@2.6.1) @@ -603,7 +603,7 @@ importers: version: 3.5.13(typescript@5.6.3) vue-tsc: specifier: 'catalog:' - version: 2.2.0(typescript@5.6.3) + version: 2.1.10(typescript@5.6.3) apps/backend-mock: dependencies: @@ -4593,16 +4593,16 @@ packages: '@vue/devtools-shared@7.6.8': resolution: {integrity: sha512-9MBPO5Z3X1nYGFqTJyohl6Gmf/J7UNN1oicHdyzBVZP4jnhZ4c20MgtaHDIzWmHDHCMYVS5bwKxT3jxh7gOOKA==} - '@vue/language-core@2.1.6': - resolution: {integrity: sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==} + '@vue/language-core@2.1.10': + resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true - '@vue/language-core@2.2.0': - resolution: {integrity: sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==} + '@vue/language-core@2.1.6': + resolution: {integrity: sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==} peerDependencies: typescript: '*' peerDependenciesMeta: @@ -4827,8 +4827,8 @@ packages: resolution: {integrity: sha512-/tfpK2A4FpS0o+S78o3YSdlqXr0MavJIDlFK3XZrlXLy7vaRXJvW5jYg3v5e/wCaF8y0IpMjkYLhoV6QqfpOgw==} engines: {node: '>= 14.0.0'} - alien-signals@0.4.11: - resolution: {integrity: sha512-79GUbcQM5K2zb+HyUMODTgJdVjZWwybDNQRduqP9ks7XZvJylm9uWesOjVcu6/veWsa+XNGVE4xVQ8+RGu8HaA==} + alien-signals@0.2.2: + resolution: {integrity: sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==} ansi-align@3.0.1: resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==} @@ -10115,8 +10115,8 @@ packages: peerDependencies: vue: ^3.5.13 - vue-tsc@2.2.0: - resolution: {integrity: sha512-gtmM1sUuJ8aSb0KoAFmK9yMxb8TxjewmxqTJ1aKphD5Cbu0rULFY6+UQT51zW7SpUcenfPUuflKyVwyx9Qdnxg==} + vue-tsc@2.1.10: + resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==} hasBin: true peerDependencies: typescript: '>=5.0.0' @@ -12428,7 +12428,7 @@ snapshots: '@mapbox/node-pre-gyp@2.0.0-rc.0(encoding@0.1.13)': dependencies: - consola: 3.3.0 + consola: 3.3.3 detect-libc: 2.0.3 https-proxy-agent: 7.0.6(supports-color@9.4.0) node-fetch: 2.7.0(encoding@0.1.13) @@ -12589,7 +12589,7 @@ snapshots: dependencies: '@nuxt/schema': 3.14.1592(magicast@0.3.5)(rollup@4.29.1) c12: 2.0.1(magicast@0.3.5) - consola: 3.3.0 + consola: 3.3.3 defu: 6.1.4 destr: 2.0.3 globby: 14.0.2 @@ -12600,7 +12600,7 @@ snapshots: knitwork: 1.2.0 mlly: 1.7.3 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.0 scule: 1.3.0 semver: 7.6.3 ufo: 1.5.4 @@ -12616,11 +12616,11 @@ snapshots: dependencies: c12: 2.0.1(magicast@0.3.5) compatx: 0.1.8 - consola: 3.3.0 + consola: 3.3.3 defu: 6.1.4 hookable: 5.5.3 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.0 scule: 1.3.0 std-env: 3.8.0 ufo: 1.5.4 @@ -13661,6 +13661,19 @@ snapshots: dependencies: rfdc: 1.4.1 + '@vue/language-core@2.1.10(typescript@5.6.3)': + dependencies: + '@volar/language-core': 2.4.11 + '@vue/compiler-dom': 3.5.13 + '@vue/compiler-vue2': 2.7.16 + '@vue/shared': 3.5.13 + alien-signals: 0.2.2 + minimatch: 9.0.5 + muggle-string: 0.4.1 + path-browserify: 1.0.1 + optionalDependencies: + typescript: 5.6.3 + '@vue/language-core@2.1.6(typescript@5.7.2)': dependencies: '@volar/language-core': 2.4.11 @@ -13674,19 +13687,6 @@ snapshots: optionalDependencies: typescript: 5.7.2 - '@vue/language-core@2.2.0(typescript@5.6.3)': - dependencies: - '@volar/language-core': 2.4.11 - '@vue/compiler-dom': 3.5.13 - '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.5.13 - alien-signals: 0.4.11 - minimatch: 9.0.5 - muggle-string: 0.4.1 - path-browserify: 1.0.1 - optionalDependencies: - typescript: 5.6.3 - '@vue/reactivity@3.5.13': dependencies: '@vue/shared': 3.5.13 @@ -13925,7 +13925,7 @@ snapshots: '@algolia/requester-fetch': 5.18.0 '@algolia/requester-node-http': 5.18.0 - alien-signals@0.4.11: {} + alien-signals@0.2.2: {} ansi-align@3.0.1: dependencies: @@ -15834,7 +15834,7 @@ snapshots: giget@1.2.3: dependencies: citty: 0.1.6 - consola: 3.3.0 + consola: 3.3.3 defu: 6.1.4 node-fetch-native: 1.6.4 nypm: 0.3.12 @@ -16643,7 +16643,7 @@ snapshots: local-pkg@0.5.1: dependencies: mlly: 1.7.3 - pkg-types: 1.2.1 + pkg-types: 1.3.0 locate-path@5.0.0: dependencies: @@ -16955,7 +16955,7 @@ snapshots: mkdirp@3.0.1: {} - mkdist@2.1.0(typescript@5.6.3)(vue-tsc@2.2.0(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)): + mkdist@2.1.0(typescript@5.6.3)(vue-tsc@2.1.10(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)): dependencies: autoprefixer: 10.4.20(postcss@8.4.49) citty: 0.1.6 @@ -16965,7 +16965,7 @@ snapshots: jiti: 1.21.7 mlly: 1.7.3 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.0 postcss: 8.4.49 postcss-nested: 7.0.2(postcss@8.4.49) semver: 7.6.3 @@ -16973,7 +16973,7 @@ snapshots: optionalDependencies: typescript: 5.6.3 vue: 3.5.13(typescript@5.6.3) - vue-tsc: 2.2.0(typescript@5.6.3) + vue-tsc: 2.1.10(typescript@5.6.3) mlly@1.7.3: dependencies: @@ -17221,10 +17221,10 @@ snapshots: nypm@0.3.12: dependencies: citty: 0.1.6 - consola: 3.3.0 + consola: 3.3.3 execa: 8.0.1 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.0 ufo: 1.5.4 object-assign@4.1.1: {} @@ -19204,7 +19204,7 @@ snapshots: has-symbols: 1.1.0 which-boxed-primitive: 1.1.1 - unbuild@3.1.0(typescript@5.6.3)(vue-tsc@2.2.0(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)): + unbuild@3.1.0(typescript@5.6.3)(vue-tsc@2.1.10(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)): dependencies: '@rollup/plugin-alias': 5.1.1(rollup@4.29.1) '@rollup/plugin-commonjs': 28.0.2(rollup@4.29.1) @@ -19213,16 +19213,16 @@ snapshots: '@rollup/plugin-replace': 6.0.2(rollup@4.29.1) '@rollup/pluginutils': 5.1.4(rollup@4.29.1) citty: 0.1.6 - consola: 3.3.0 + consola: 3.3.3 defu: 6.1.4 esbuild: 0.24.0 hookable: 5.5.3 jiti: 2.4.2 magic-string: 0.30.17 - mkdist: 2.1.0(typescript@5.6.3)(vue-tsc@2.2.0(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)) + mkdist: 2.1.0(typescript@5.6.3)(vue-tsc@2.1.10(typescript@5.6.3))(vue@3.5.13(typescript@5.6.3)) mlly: 1.7.3 pathe: 1.1.2 - pkg-types: 1.2.1 + pkg-types: 1.3.0 pretty-bytes: 6.1.1 rollup: 4.29.1 rollup-plugin-dts: 6.1.1(rollup@4.29.1)(typescript@5.6.3) @@ -19389,7 +19389,7 @@ snapshots: untun@0.1.3: dependencies: citty: 0.1.6 - consola: 3.3.0 + consola: 3.3.3 pathe: 1.1.2 untyped@1.5.2: @@ -19619,7 +19619,7 @@ snapshots: dependencies: esbuild: 0.24.0 postcss: 8.4.49 - rollup: 4.28.1 + rollup: 4.29.1 optionalDependencies: '@types/node': 22.10.2 fsevents: 2.3.3 @@ -19631,7 +19631,7 @@ snapshots: dependencies: esbuild: 0.24.0 postcss: 8.4.49 - rollup: 4.28.1 + rollup: 4.29.1 optionalDependencies: '@types/node': 22.10.2 fsevents: 2.3.3 @@ -19775,10 +19775,11 @@ snapshots: '@vue/devtools-api': 6.6.4 vue: 3.5.13(typescript@5.7.2) - vue-tsc@2.2.0(typescript@5.6.3): + vue-tsc@2.1.10(typescript@5.6.3): dependencies: '@volar/typescript': 2.4.11 - '@vue/language-core': 2.2.0(typescript@5.6.3) + '@vue/language-core': 2.1.10(typescript@5.6.3) + semver: 7.6.3 typescript: 5.6.3 vue-types@3.0.2(vue@3.5.13(typescript@5.7.2)): diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 839e6f7d..45cdf919 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -175,7 +175,7 @@ catalog: vue-eslint-parser: ^9.4.3 vue-i18n: ^10.0.5 vue-router: ^4.5.0 - vue-tsc: ^2.2.0 + vue-tsc: ^2.1.10 vxe-pc-ui: ^4.3.48 vxe-table: ^4.9.35 watermark-js-plus: ^1.5.7 From 07c4ad05f40507d7d797619814bf75a47c29a9f4 Mon Sep 17 00:00:00 2001 From: vben Date: Sat, 28 Dec 2024 22:15:00 +0800 Subject: [PATCH 0005/1032] chore: release 5.5.2 --- apps/web-antd/package.json | 2 +- apps/web-ele/package.json | 2 +- apps/web-naive/package.json | 2 +- docs/package.json | 2 +- internal/lint-configs/commitlint-config/package.json | 2 +- internal/lint-configs/stylelint-config/package.json | 2 +- internal/node-utils/package.json | 2 +- internal/tailwind-config/package.json | 2 +- internal/tsconfig/package.json | 2 +- internal/vite-config/package.json | 2 +- package.json | 2 +- packages/@core/base/design/package.json | 2 +- packages/@core/base/icons/package.json | 2 +- packages/@core/base/shared/package.json | 2 +- packages/@core/base/typings/package.json | 2 +- packages/@core/composables/package.json | 2 +- packages/@core/preferences/package.json | 2 +- packages/@core/ui-kit/form-ui/package.json | 2 +- packages/@core/ui-kit/layout-ui/package.json | 2 +- packages/@core/ui-kit/menu-ui/package.json | 2 +- packages/@core/ui-kit/shadcn-ui/package.json | 2 +- packages/@core/ui-kit/tabs-ui/package.json | 2 +- packages/constants/package.json | 2 +- packages/effects/access/package.json | 2 +- packages/effects/common-ui/package.json | 2 +- packages/effects/hooks/package.json | 2 +- packages/effects/layouts/package.json | 2 +- packages/effects/plugins/package.json | 2 +- packages/effects/request/package.json | 2 +- packages/icons/package.json | 2 +- packages/locales/package.json | 2 +- packages/preferences/package.json | 2 +- packages/stores/package.json | 2 +- packages/styles/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- playground/package.json | 2 +- scripts/turbo-run/package.json | 2 +- scripts/vsh/package.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index bbc5593f..33b98764 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-antd", - "version": "5.5.1", + "version": "5.5.2", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index a02376ee..58769400 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-ele", - "version": "5.5.1", + "version": "5.5.2", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index 5bd3b1a7..57857c89 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-naive", - "version": "5.5.1", + "version": "5.5.2", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/docs/package.json b/docs/package.json index 2d56a8ba..5ea22fd1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@vben/docs", - "version": "5.5.1", + "version": "5.5.2", "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 01b43088..d7e4c518 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.5.1", + "version": "5.5.2", "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 64815741..02491dd0 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.5.1", + "version": "5.5.2", "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 9412656a..b2a60da8 100644 --- a/internal/node-utils/package.json +++ b/internal/node-utils/package.json @@ -1,6 +1,6 @@ { "name": "@vben/node-utils", - "version": "5.5.1", + "version": "5.5.2", "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 26da63b4..0b64d1d5 100644 --- a/internal/tailwind-config/package.json +++ b/internal/tailwind-config/package.json @@ -1,6 +1,6 @@ { "name": "@vben/tailwind-config", - "version": "5.5.1", + "version": "5.5.2", "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 d935b671..8ebfeebf 100644 --- a/internal/tsconfig/package.json +++ b/internal/tsconfig/package.json @@ -1,6 +1,6 @@ { "name": "@vben/tsconfig", - "version": "5.5.1", + "version": "5.5.2", "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 60955a1d..6c589a1f 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -1,6 +1,6 @@ { "name": "@vben/vite-config", - "version": "5.5.1", + "version": "5.5.2", "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 c103d7e8..8f6c4d27 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vben-admin-monorepo", - "version": "5.5.1", + "version": "5.5.2", "private": true, "keywords": [ "monorepo", diff --git a/packages/@core/base/design/package.json b/packages/@core/base/design/package.json index 7b46ddd7..1d9888ca 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.5.1", + "version": "5.5.2", "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 754b7450..144814a0 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.5.1", + "version": "5.5.2", "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 20eeea45..c52c040c 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.5.1", + "version": "5.5.2", "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 504e53ed..c7153939 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.5.1", + "version": "5.5.2", "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 736feefa..49f972fe 100644 --- a/packages/@core/composables/package.json +++ b/packages/@core/composables/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/composables", - "version": "5.5.1", + "version": "5.5.2", "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 24b522e2..26232bf5 100644 --- a/packages/@core/preferences/package.json +++ b/packages/@core/preferences/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/preferences", - "version": "5.5.1", + "version": "5.5.2", "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/package.json b/packages/@core/ui-kit/form-ui/package.json index 944fd49e..a3f42ded 100644 --- a/packages/@core/ui-kit/form-ui/package.json +++ b/packages/@core/ui-kit/form-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vben-core/form-ui", - "version": "5.5.1", + "version": "5.5.2", "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/layout-ui/package.json b/packages/@core/ui-kit/layout-ui/package.json index 7aa4a35b..25bf6715 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.5.1", + "version": "5.5.2", "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 4c833cb8..768c6e70 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.5.1", + "version": "5.5.2", "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 cccaa690..439725a2 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.5.1", + "version": "5.5.2", "#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 7e98a842..37970151 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.5.1", + "version": "5.5.2", "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 aeb73387..c9372a50 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -1,6 +1,6 @@ { "name": "@vben/constants", - "version": "5.5.1", + "version": "5.5.2", "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 ca991275..4fa518b1 100644 --- a/packages/effects/access/package.json +++ b/packages/effects/access/package.json @@ -1,6 +1,6 @@ { "name": "@vben/access", - "version": "5.5.1", + "version": "5.5.2", "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 5e318c63..01d82e43 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.5.1", + "version": "5.5.2", "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 a531cf9c..2eb5708d 100644 --- a/packages/effects/hooks/package.json +++ b/packages/effects/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@vben/hooks", - "version": "5.5.1", + "version": "5.5.2", "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 f1eba82e..ec230905 100644 --- a/packages/effects/layouts/package.json +++ b/packages/effects/layouts/package.json @@ -1,6 +1,6 @@ { "name": "@vben/layouts", - "version": "5.5.1", + "version": "5.5.2", "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 ac11e5a0..85f7a86d 100644 --- a/packages/effects/plugins/package.json +++ b/packages/effects/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@vben/plugins", - "version": "5.5.1", + "version": "5.5.2", "homepage": "https://github.com/vbenjs/vue-vben-admin", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/packages/effects/request/package.json b/packages/effects/request/package.json index 106c9517..fb8c7885 100644 --- a/packages/effects/request/package.json +++ b/packages/effects/request/package.json @@ -1,6 +1,6 @@ { "name": "@vben/request", - "version": "5.5.1", + "version": "5.5.2", "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 8bda07bb..f0936abe 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,6 +1,6 @@ { "name": "@vben/icons", - "version": "5.5.1", + "version": "5.5.2", "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 e54354b7..0f887979 100644 --- a/packages/locales/package.json +++ b/packages/locales/package.json @@ -1,6 +1,6 @@ { "name": "@vben/locales", - "version": "5.5.1", + "version": "5.5.2", "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 5d51c8be..65bfc4c6 100644 --- a/packages/preferences/package.json +++ b/packages/preferences/package.json @@ -1,6 +1,6 @@ { "name": "@vben/preferences", - "version": "5.5.1", + "version": "5.5.2", "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 a8707d8b..1deac22c 100644 --- a/packages/stores/package.json +++ b/packages/stores/package.json @@ -1,6 +1,6 @@ { "name": "@vben/stores", - "version": "5.5.1", + "version": "5.5.2", "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 7bb54019..5bfae7e5 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -1,6 +1,6 @@ { "name": "@vben/styles", - "version": "5.5.1", + "version": "5.5.2", "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 8b38a928..e062922e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@vben/types", - "version": "5.5.1", + "version": "5.5.2", "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 b4eafd8a..bd64a1db 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@vben/utils", - "version": "5.5.1", + "version": "5.5.2", "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 720622e0..21e9c4d2 100644 --- a/playground/package.json +++ b/playground/package.json @@ -1,6 +1,6 @@ { "name": "@vben/playground", - "version": "5.5.1", + "version": "5.5.2", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/scripts/turbo-run/package.json b/scripts/turbo-run/package.json index 1690720f..367367bd 100644 --- a/scripts/turbo-run/package.json +++ b/scripts/turbo-run/package.json @@ -1,6 +1,6 @@ { "name": "@vben/turbo-run", - "version": "5.5.1", + "version": "5.5.2", "private": true, "license": "MIT", "type": "module", diff --git a/scripts/vsh/package.json b/scripts/vsh/package.json index 04123e2e..5ec654ea 100644 --- a/scripts/vsh/package.json +++ b/scripts/vsh/package.json @@ -1,6 +1,6 @@ { "name": "@vben/vsh", - "version": "5.5.1", + "version": "5.5.2", "private": true, "license": "MIT", "type": "module", From ff8d5ca3511ee493735dd19d2721fbd03b3c9265 Mon Sep 17 00:00:00 2001 From: Netfan Date: Mon, 30 Dec 2024 14:01:17 +0800 Subject: [PATCH 0006/1032] feat: header mixed layout (#5263) * feat: new layout header-mixed * fix: header-mixed layout update * feat: layout preference update * fix: extra menus follow layout setting --- packages/@core/base/typings/src/app.d.ts | 1 + .../@core/preferences/src/use-preferences.ts | 12 +- .../ui-kit/layout-ui/src/hooks/use-layout.ts | 8 + .../ui-kit/layout-ui/src/vben-layout.vue | 21 +- packages/effects/layouts/src/basic/layout.vue | 20 +- .../layouts/src/basic/menu/use-extra-menu.ts | 57 +++-- .../layouts/src/basic/menu/use-mixed-menu.ts | 22 +- .../preferences/blocks/layout/layout.vue | 7 + .../preferences/blocks/layout/sidebar.vue | 2 +- .../preferences/icons/header-mixed-nav.vue | 202 ++++++++++++++++++ .../src/widgets/preferences/icons/index.ts | 1 + .../locales/src/langs/zh-CN/preferences.json | 4 +- .../utils/src/helpers/find-menu-by-path.ts | 4 +- 13 files changed, 321 insertions(+), 40 deletions(-) create mode 100644 packages/effects/layouts/src/widgets/preferences/icons/header-mixed-nav.vue diff --git a/packages/@core/base/typings/src/app.d.ts b/packages/@core/base/typings/src/app.d.ts index f783c8b5..ae49c786 100644 --- a/packages/@core/base/typings/src/app.d.ts +++ b/packages/@core/base/typings/src/app.d.ts @@ -1,5 +1,6 @@ type LayoutType = | 'full-content' + | 'header-mixed-nav' | 'header-nav' | 'mixed-nav' | 'sidebar-mixed-nav' diff --git a/packages/@core/preferences/src/use-preferences.ts b/packages/@core/preferences/src/use-preferences.ts index fc1e2de5..ecd2bc74 100644 --- a/packages/@core/preferences/src/use-preferences.ts +++ b/packages/@core/preferences/src/use-preferences.ts @@ -82,6 +82,10 @@ function usePreferences() { () => appPreferences.value.layout === 'header-nav', ); + const isHeaderMixedNav = computed( + () => appPreferences.value.layout === 'header-mixed-nav', + ); + /** * @zh_CN 是否为混合导航模式 */ @@ -93,7 +97,12 @@ function usePreferences() { * @zh_CN 是否包含侧边导航模式 */ const isSideMode = computed(() => { - return isMixedNav.value || isSideMixedNav.value || isSideNav.value; + return ( + isMixedNav.value || + isSideMixedNav.value || + isSideNav.value || + isHeaderMixedNav.value + ); }); const sidebarCollapsed = computed(() => { @@ -214,6 +223,7 @@ function usePreferences() { globalSearchShortcutKey, isDark, isFullContent, + isHeaderMixedNav, isHeaderNav, isMixedNav, isMobile, diff --git a/packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts b/packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts index 354fcb44..7b758dc4 100644 --- a/packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts +++ b/packages/@core/ui-kit/layout-ui/src/hooks/use-layout.ts @@ -31,9 +31,17 @@ export function useLayout(props: VbenLayoutProps) { */ const isMixedNav = computed(() => currentLayout.value === 'mixed-nav'); + /** + * 是否为头部混合模式 + */ + const isHeaderMixedNav = computed( + () => currentLayout.value === 'header-mixed-nav', + ); + return { currentLayout, isFullContent, + isHeaderMixedNav, isHeaderNav, isMixedNav, isSidebarMixedNav, 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 fe9b1d85..dee990b3 100644 --- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue +++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue @@ -87,6 +87,7 @@ const { y: mouseY } = useMouse({ target: contentRef, type: 'client' }); const { currentLayout, isFullContent, + isHeaderMixedNav, isHeaderNav, isMixedNav, isSidebarMixedNav, @@ -112,7 +113,9 @@ const getSideCollapseWidth = computed(() => { const { sidebarCollapseShowTitle, sidebarMixedWidth, sideCollapseWidth } = props; - return sidebarCollapseShowTitle || isSidebarMixedNav.value + return sidebarCollapseShowTitle || + isSidebarMixedNav.value || + isHeaderMixedNav.value ? sidebarMixedWidth : sideCollapseWidth; }); @@ -145,12 +148,15 @@ const getSidebarWidth = computed(() => { if ( !sidebarEnableState.value || - (sidebarHidden && !isSidebarMixedNav.value && !isMixedNav.value) + (sidebarHidden && + !isSidebarMixedNav.value && + !isMixedNav.value && + !isHeaderMixedNav.value) ) { return width; } - if (isSidebarMixedNav.value && !isMobile) { + if ((isHeaderMixedNav.value || isSidebarMixedNav.value) && !isMobile) { width = sidebarMixedWidth; } else if (sidebarCollapse.value) { width = isMobile ? 0 : getSideCollapseWidth.value; @@ -176,7 +182,8 @@ const isSideMode = computed( () => currentLayout.value === 'mixed-nav' || currentLayout.value === 'sidebar-mixed-nav' || - currentLayout.value === 'sidebar-nav', + currentLayout.value === 'sidebar-nav' || + currentLayout.value === 'header-mixed-nav', ); /** @@ -213,7 +220,7 @@ const mainStyle = computed(() => { ) { // fixed模式下生效 const isSideNavEffective = - isSidebarMixedNav.value && + (isSidebarMixedNav.value || isHeaderMixedNav.value) && sidebarExpandOnHover.value && sidebarExtraVisible.value; @@ -476,7 +483,7 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT; :extra-width="sidebarExtraWidth" :fixed-extra="sidebarExpandOnHover" :header-height="isMixedNav ? 0 : headerHeight" - :is-sidebar-mixed="isSidebarMixedNav" + :is-sidebar-mixed="isSidebarMixedNav || isHeaderMixedNav" :margin-top="sidebarMarginTop" :mixed-width="sidebarMixedWidth" :show="showSidebar" @@ -489,7 +496,7 @@ const idMainContent = ELEMENT_ID_MAIN_CONTENT; -