From 2c9604a829418b9b5fc5b64b4f6d0bc03ea592b2 Mon Sep 17 00:00:00 2001 From: zclzone Date: Sat, 6 Jan 2024 18:47:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3vite5=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E5=BC=95=E7=94=A8=E5=AF=BC=E8=87=B4=E7=83=AD=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 391 +++++++++++++------------- src/layouts/components/RoleSelect.vue | 3 +- src/router/basic-routes.js | 40 +++ src/router/index.js | 78 +---- src/store/helper.js | 29 ++ src/store/modules/auth.js | 19 +- src/store/modules/index.js | 1 + src/store/modules/permission.js | 23 +- src/store/modules/router.js | 26 ++ src/store/modules/tab.js | 10 +- src/store/modules/user.js | 30 +- src/utils/naiveTools.js | 2 +- src/views/profile/index.vue | 14 +- 14 files changed, 351 insertions(+), 317 deletions(-) create mode 100644 src/router/basic-routes.js create mode 100644 src/store/helper.js create mode 100644 src/store/modules/router.js diff --git a/package.json b/package.json index ec4aec4..1e8d442 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "rollup-plugin-visualizer": "^5.9.2", "unplugin-auto-import": "^0.16.6", "unplugin-vue-components": "^0.26.0", - "vite": "^5.0.10", + "vite": "^5.0.11", "vite-plugin-simple-html": "^0.1.2", "vite-plugin-vue-devtools": "7.0.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f91d45e..b6473fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,7 +46,7 @@ dependencies: version: registry.npmmirror.com/sass@1.69.5 unocss: specifier: ^0.58.3 - version: registry.npmmirror.com/unocss@0.58.3(postcss@8.4.32)(vite@5.0.10) + version: registry.npmmirror.com/unocss@0.58.3(postcss@8.4.32)(vite@5.0.11) vue: specifier: ^3.4.3 version: registry.npmmirror.com/vue@3.4.3(typescript@5.3.2) @@ -63,7 +63,7 @@ dependencies: devDependencies: '@vitejs/plugin-vue': specifier: ^5.0.2 - version: registry.npmmirror.com/@vitejs/plugin-vue@5.0.2(vite@5.0.10)(vue@3.4.3) + version: registry.npmmirror.com/@vitejs/plugin-vue@5.0.2(vite@5.0.11)(vue@3.4.3) '@zclzone/eslint-config': specifier: ^0.0.5 version: registry.npmmirror.com/@zclzone/eslint-config@0.0.5 @@ -86,14 +86,14 @@ devDependencies: specifier: ^0.26.0 version: registry.npmmirror.com/unplugin-vue-components@0.26.0(vue@3.4.3) vite: - specifier: ^5.0.10 - version: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + specifier: ^5.0.11 + version: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) vite-plugin-simple-html: specifier: ^0.1.2 - version: registry.npmmirror.com/vite-plugin-simple-html@0.1.2(vite@5.0.10) + version: registry.npmmirror.com/vite-plugin-simple-html@0.1.2(vite@5.0.11) vite-plugin-vue-devtools: specifier: 7.0.2 - version: registry.npmmirror.com/vite-plugin-vue-devtools@7.0.2(vite@5.0.10) + version: registry.npmmirror.com/vite-plugin-vue-devtools@7.0.2(vite@5.0.11) packages: @@ -630,6 +630,16 @@ packages: version: 0.8.0 dev: false + registry.npmmirror.com/@esbuild/aix-ppc64@0.19.11: + resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==, tarball: https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz} + name: '@esbuild/aix-ppc64' + version: 0.19.11 + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + optional: true + registry.npmmirror.com/@esbuild/android-arm64@0.18.20: resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==, tarball: https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz} name: '@esbuild/android-arm64' @@ -641,10 +651,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/android-arm64@0.19.9: - resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==, tarball: https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/android-arm64@0.19.11: + resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==, tarball: https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz} name: '@esbuild/android-arm64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -662,10 +672,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/android-arm@0.19.9: - resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==, tarball: https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.19.9.tgz} + registry.npmmirror.com/@esbuild/android-arm@0.19.11: + resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==, tarball: https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.19.11.tgz} name: '@esbuild/android-arm' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm] os: [android] @@ -683,10 +693,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/android-x64@0.19.9: - resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==, tarball: https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/android-x64@0.19.11: + resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==, tarball: https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.19.11.tgz} name: '@esbuild/android-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [android] @@ -704,10 +714,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/darwin-arm64@0.19.9: - resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==, tarball: https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/darwin-arm64@0.19.11: + resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==, tarball: https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz} name: '@esbuild/darwin-arm64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -725,10 +735,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/darwin-x64@0.19.9: - resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==, tarball: https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/darwin-x64@0.19.11: + resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==, tarball: https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz} name: '@esbuild/darwin-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -746,10 +756,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/freebsd-arm64@0.19.9: - resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==, tarball: https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/freebsd-arm64@0.19.11: + resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==, tarball: https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz} name: '@esbuild/freebsd-arm64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -767,10 +777,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/freebsd-x64@0.19.9: - resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==, tarball: https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/freebsd-x64@0.19.11: + resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==, tarball: https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz} name: '@esbuild/freebsd-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -788,10 +798,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-arm64@0.19.9: - resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==, tarball: https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-arm64@0.19.11: + resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==, tarball: https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz} name: '@esbuild/linux-arm64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -809,10 +819,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-arm@0.19.9: - resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==, tarball: https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-arm@0.19.11: + resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==, tarball: https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz} name: '@esbuild/linux-arm' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -830,10 +840,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-ia32@0.19.9: - resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==, tarball: https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-ia32@0.19.11: + resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==, tarball: https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz} name: '@esbuild/linux-ia32' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -851,10 +861,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-loong64@0.19.9: - resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==, tarball: https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-loong64@0.19.11: + resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==, tarball: https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz} name: '@esbuild/linux-loong64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -872,10 +882,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-mips64el@0.19.9: - resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==, tarball: https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-mips64el@0.19.11: + resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==, tarball: https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz} name: '@esbuild/linux-mips64el' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -893,10 +903,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-ppc64@0.19.9: - resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==, tarball: https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-ppc64@0.19.11: + resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==, tarball: https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz} name: '@esbuild/linux-ppc64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -914,10 +924,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-riscv64@0.19.9: - resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==, tarball: https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-riscv64@0.19.11: + resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==, tarball: https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz} name: '@esbuild/linux-riscv64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -935,10 +945,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-s390x@0.19.9: - resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==, tarball: https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-s390x@0.19.11: + resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==, tarball: https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz} name: '@esbuild/linux-s390x' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -956,10 +966,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/linux-x64@0.19.9: - resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==, tarball: https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/linux-x64@0.19.11: + resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==, tarball: https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz} name: '@esbuild/linux-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -977,10 +987,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/netbsd-x64@0.19.9: - resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==, tarball: https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/netbsd-x64@0.19.11: + resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==, tarball: https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz} name: '@esbuild/netbsd-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -998,10 +1008,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/openbsd-x64@0.19.9: - resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==, tarball: https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/openbsd-x64@0.19.11: + resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==, tarball: https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz} name: '@esbuild/openbsd-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -1019,10 +1029,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/sunos-x64@0.19.9: - resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==, tarball: https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/sunos-x64@0.19.11: + resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==, tarball: https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz} name: '@esbuild/sunos-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -1040,10 +1050,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/win32-arm64@0.19.9: - resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==, tarball: https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/win32-arm64@0.19.11: + resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==, tarball: https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz} name: '@esbuild/win32-arm64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -1061,10 +1071,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/win32-ia32@0.19.9: - resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==, tarball: https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.19.9.tgz} + registry.npmmirror.com/@esbuild/win32-ia32@0.19.11: + resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==, tarball: https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz} name: '@esbuild/win32-ia32' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -1082,10 +1092,10 @@ packages: dev: true optional: true - registry.npmmirror.com/@esbuild/win32-x64@0.19.9: - resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==, tarball: https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.19.9.tgz} + registry.npmmirror.com/@esbuild/win32-x64@0.19.11: + resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==, tarball: https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz} name: '@esbuild/win32-x64' - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -1342,123 +1352,123 @@ packages: estree-walker: registry.npmmirror.com/estree-walker@2.0.2 picomatch: registry.npmmirror.com/picomatch@2.3.1 - registry.npmmirror.com/@rollup/rollup-android-arm-eabi@4.8.0: - resolution: {integrity: sha512-zdTObFRoNENrdPpnTNnhOljYIcOX7aI7+7wyrSpPFFIOf/nRdedE6IYsjaBE7tjukphh1tMTojgJ7p3lKY8x6Q==, tarball: https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-android-arm-eabi@4.9.4: + resolution: {integrity: sha512-ub/SN3yWqIv5CWiAZPHVS1DloyZsJbtXmX4HxUTIpS0BHm9pW5iYBo2mIZi+hE3AeiTzHz33blwSnhdUo+9NpA==, tarball: https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.4.tgz} name: '@rollup/rollup-android-arm-eabi' - version: 4.8.0 + version: 4.9.4 cpu: [arm] os: [android] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-android-arm64@4.8.0: - resolution: {integrity: sha512-aiItwP48BiGpMFS9Znjo/xCNQVwTQVcRKkFKsO81m8exrGjHkCBDvm9PHay2kpa8RPnZzzKcD1iQ9KaLY4fPQQ==, tarball: https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-android-arm64@4.9.4: + resolution: {integrity: sha512-ehcBrOR5XTl0W0t2WxfTyHCR/3Cq2jfb+I4W+Ch8Y9b5G+vbAecVv0Fx/J1QKktOrgUYsIKxWAKgIpvw56IFNA==, tarball: https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.4.tgz} name: '@rollup/rollup-android-arm64' - version: 4.8.0 + version: 4.9.4 cpu: [arm64] os: [android] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-darwin-arm64@4.8.0: - resolution: {integrity: sha512-zhNIS+L4ZYkYQUjIQUR6Zl0RXhbbA0huvNIWjmPc2SL0cB1h5Djkcy+RZ3/Bwszfb6vgwUvcVJYD6e6Zkpsi8g==, tarball: https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-darwin-arm64@4.9.4: + resolution: {integrity: sha512-1fzh1lWExwSTWy8vJPnNbNM02WZDS8AW3McEOb7wW+nPChLKf3WG2aG7fhaUmfX5FKw9zhsF5+MBwArGyNM7NA==, tarball: https://registry.npmmirror.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.4.tgz} name: '@rollup/rollup-darwin-arm64' - version: 4.8.0 + version: 4.9.4 cpu: [arm64] os: [darwin] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-darwin-x64@4.8.0: - resolution: {integrity: sha512-A/FAHFRNQYrELrb/JHncRWzTTXB2ticiRFztP4ggIUAfa9Up1qfW8aG2w/mN9jNiZ+HB0t0u0jpJgFXG6BfRTA==, tarball: https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-darwin-x64@4.9.4: + resolution: {integrity: sha512-Gc6cukkF38RcYQ6uPdiXi70JB0f29CwcQ7+r4QpfNpQFVHXRd0DfWFidoGxjSx1DwOETM97JPz1RXL5ISSB0pA==, tarball: https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.4.tgz} name: '@rollup/rollup-darwin-x64' - version: 4.8.0 + version: 4.9.4 cpu: [x64] os: [darwin] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf@4.8.0: - resolution: {integrity: sha512-JsidBnh3p2IJJA4/2xOF2puAYqbaczB3elZDT0qHxn362EIoIkq7hrR43Xa8RisgI6/WPfvb2umbGsuvf7E37A==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf@4.9.4: + resolution: {integrity: sha512-g21RTeFzoTl8GxosHbnQZ0/JkuFIB13C3T7Y0HtKzOXmoHhewLbVTFBQZu+z5m9STH6FZ7L/oPgU4Nm5ErN2fw==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.4.tgz} name: '@rollup/rollup-linux-arm-gnueabihf' - version: 4.8.0 + version: 4.9.4 cpu: [arm] os: [linux] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu@4.8.0: - resolution: {integrity: sha512-hBNCnqw3EVCkaPB0Oqd24bv8SklETptQWcJz06kb9OtiShn9jK1VuTgi7o4zPSt6rNGWQOTDEAccbk0OqJmS+g==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu@4.9.4: + resolution: {integrity: sha512-TVYVWD/SYwWzGGnbfTkrNpdE4HON46orgMNHCivlXmlsSGQOx/OHHYiQcMIOx38/GWgwr/po2LBn7wypkWw/Mg==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.4.tgz} name: '@rollup/rollup-linux-arm64-gnu' - version: 4.8.0 + version: 4.9.4 cpu: [arm64] os: [linux] libc: [glibc] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-linux-arm64-musl@4.8.0: - resolution: {integrity: sha512-Fw9ChYfJPdltvi9ALJ9wzdCdxGw4wtq4t1qY028b2O7GwB5qLNSGtqMsAel1lfWTZvf4b6/+4HKp0GlSYg0ahA==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-linux-arm64-musl@4.9.4: + resolution: {integrity: sha512-XcKvuendwizYYhFxpvQ3xVpzje2HHImzg33wL9zvxtj77HvPStbSGI9czrdbfrf8DGMcNNReH9pVZv8qejAQ5A==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.4.tgz} name: '@rollup/rollup-linux-arm64-musl' - version: 4.8.0 + version: 4.9.4 cpu: [arm64] os: [linux] libc: [musl] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu@4.8.0: - resolution: {integrity: sha512-BH5xIh7tOzS9yBi8dFrCTG8Z6iNIGWGltd3IpTSKp6+pNWWO6qy8eKoRxOtwFbMrid5NZaidLYN6rHh9aB8bEw==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu@4.9.4: + resolution: {integrity: sha512-LFHS/8Q+I9YA0yVETyjonMJ3UA+DczeBd/MqNEzsGSTdNvSJa1OJZcSH8GiXLvcizgp9AlHs2walqRcqzjOi3A==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.4.tgz} name: '@rollup/rollup-linux-riscv64-gnu' - version: 4.8.0 + version: 4.9.4 cpu: [riscv64] os: [linux] libc: [glibc] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-linux-x64-gnu@4.8.0: - resolution: {integrity: sha512-PmvAj8k6EuWiyLbkNpd6BLv5XeYFpqWuRvRNRl80xVfpGXK/z6KYXmAgbI4ogz7uFiJxCnYcqyvZVD0dgFog7Q==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-linux-x64-gnu@4.9.4: + resolution: {integrity: sha512-dIYgo+j1+yfy81i0YVU5KnQrIJZE8ERomx17ReU4GREjGtDW4X+nvkBak2xAUpyqLs4eleDSj3RrV72fQos7zw==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.4.tgz} name: '@rollup/rollup-linux-x64-gnu' - version: 4.8.0 + version: 4.9.4 cpu: [x64] os: [linux] libc: [glibc] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-linux-x64-musl@4.8.0: - resolution: {integrity: sha512-mdxnlW2QUzXwY+95TuxZ+CurrhgrPAMveDWI97EQlA9bfhR8tw3Pt7SUlc/eSlCNxlWktpmT//EAA8UfCHOyXg==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-linux-x64-musl@4.9.4: + resolution: {integrity: sha512-RoaYxjdHQ5TPjaPrLsfKqR3pakMr3JGqZ+jZM0zP2IkDtsGa4CqYaWSfQmZVgFUCgLrTnzX+cnHS3nfl+kB6ZQ==, tarball: https://registry.npmmirror.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.4.tgz} name: '@rollup/rollup-linux-x64-musl' - version: 4.8.0 + version: 4.9.4 cpu: [x64] os: [linux] libc: [musl] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc@4.8.0: - resolution: {integrity: sha512-ge7saUz38aesM4MA7Cad8CHo0Fyd1+qTaqoIo+Jtk+ipBi4ATSrHWov9/S4u5pbEQmLjgUjB7BJt+MiKG2kzmA==, tarball: https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc@4.9.4: + resolution: {integrity: sha512-T8Q3XHV+Jjf5e49B4EAaLKV74BbX7/qYBRQ8Wop/+TyyU0k+vSjiLVSHNWdVd1goMjZcbhDmYZUYW5RFqkBNHQ==, tarball: https://registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.4.tgz} name: '@rollup/rollup-win32-arm64-msvc' - version: 4.8.0 + version: 4.9.4 cpu: [arm64] os: [win32] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc@4.8.0: - resolution: {integrity: sha512-p9E3PZlzurhlsN5h9g7zIP1DnqKXJe8ZUkFwAazqSvHuWfihlIISPxG9hCHCoA+dOOspL/c7ty1eeEVFTE0UTw==, tarball: https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc@4.9.4: + resolution: {integrity: sha512-z+JQ7JirDUHAsMecVydnBPWLwJjbppU+7LZjffGf+Jvrxq+dVjIE7By163Sc9DKc3ADSU50qPVw0KonBS+a+HQ==, tarball: https://registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.4.tgz} name: '@rollup/rollup-win32-ia32-msvc' - version: 4.8.0 + version: 4.9.4 cpu: [ia32] os: [win32] requiresBuild: true optional: true - registry.npmmirror.com/@rollup/rollup-win32-x64-msvc@4.8.0: - resolution: {integrity: sha512-kb4/auKXkYKqlUYTE8s40FcJIj5soOyRLHKd4ugR0dCq0G2EfcF54eYcfQiGkHzjidZ40daB4ulsFdtqNKZtBg==, tarball: https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.8.0.tgz} + registry.npmmirror.com/@rollup/rollup-win32-x64-msvc@4.9.4: + resolution: {integrity: sha512-LfdGXCV9rdEify1oxlN9eamvDSjv9md9ZVMAbNHA87xqIfFCxImxan9qZ8+Un54iK2nnqPlbnSi4R54ONtbWBw==, tarball: https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.4.tgz} name: '@rollup/rollup-win32-x64-msvc' - version: 4.8.0 + version: 4.9.4 cpu: [x64] os: [win32] requiresBuild: true @@ -1585,7 +1595,7 @@ packages: name: '@ungap/structured-clone' version: 1.2.0 - registry.npmmirror.com/@unocss/astro@0.58.3(vite@5.0.10): + registry.npmmirror.com/@unocss/astro@0.58.3(vite@5.0.11): resolution: {integrity: sha512-qJL+XkWYJhEIX4AmOtbfb2Zu4holTDpRscfvVci4T+2VWjyE3mgtsyNzi9ZChe/hdEPRa7g26gSpNQeMhjh/Kw==, tarball: https://registry.npmmirror.com/@unocss/astro/-/astro-0.58.3.tgz} id: registry.npmmirror.com/@unocss/astro/0.58.3 name: '@unocss/astro' @@ -1598,8 +1608,8 @@ packages: dependencies: '@unocss/core': registry.npmmirror.com/@unocss/core@0.58.3 '@unocss/reset': registry.npmmirror.com/@unocss/reset@0.58.3 - '@unocss/vite': registry.npmmirror.com/@unocss/vite@0.58.3(vite@5.0.10) - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + '@unocss/vite': registry.npmmirror.com/@unocss/vite@0.58.3(vite@5.0.11) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) transitivePeerDependencies: - rollup dev: false @@ -1867,7 +1877,7 @@ packages: '@unocss/core': registry.npmmirror.com/@unocss/core@0.58.3 dev: false - registry.npmmirror.com/@unocss/vite@0.58.3(vite@5.0.10): + registry.npmmirror.com/@unocss/vite@0.58.3(vite@5.0.11): resolution: {integrity: sha512-gmB2//z7lDEK7Bw5HbHTSQ3abOM0iveAY/W3L3FFXpvduoxMQyuI5dDk0hOCtzhAWeJoynnVN4MBGVmXM4Y/Mg==, tarball: https://registry.npmmirror.com/@unocss/vite/-/vite-0.58.3.tgz} id: registry.npmmirror.com/@unocss/vite/0.58.3 name: '@unocss/vite' @@ -1885,12 +1895,12 @@ packages: chokidar: registry.npmmirror.com/chokidar@3.5.3 fast-glob: registry.npmmirror.com/fast-glob@3.3.2 magic-string: registry.npmmirror.com/magic-string@0.30.5 - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) transitivePeerDependencies: - rollup dev: false - registry.npmmirror.com/@vitejs/plugin-vue@5.0.2(vite@5.0.10)(vue@3.4.3): + registry.npmmirror.com/@vitejs/plugin-vue@5.0.2(vite@5.0.11)(vue@3.4.3): resolution: {integrity: sha512-kEjJHrLb5ePBvjD0SPZwJlw1QTRcjjCA9sB5VyfonoXVBxTS7TMnqL6EkLt1Eu61RDeiuZ/WN9Hf6PxXhPI2uA==, tarball: https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.0.2.tgz} id: registry.npmmirror.com/@vitejs/plugin-vue/5.0.2 name: '@vitejs/plugin-vue' @@ -1900,7 +1910,7 @@ packages: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) vue: registry.npmmirror.com/vue@3.4.3(typescript@5.3.2) dev: true @@ -2000,7 +2010,7 @@ packages: version: 6.5.1 dev: false - registry.npmmirror.com/@vue/devtools-core@7.0.2(vite@5.0.10): + registry.npmmirror.com/@vue/devtools-core@7.0.2(vite@5.0.11): resolution: {integrity: sha512-tyGuDlKmRVyR+7Pb8ImrOzRVKHGt+mT17k8qxjov1D1vcEsnz7VkjZRYhfckscAkFIoLqTTotPAh6oVEsD6U1w==, tarball: https://registry.npmmirror.com/@vue/devtools-core/-/devtools-core-7.0.2.tgz} id: registry.npmmirror.com/@vue/devtools-core/7.0.2 name: '@vue/devtools-core' @@ -2014,9 +2024,9 @@ packages: image-meta: registry.npmmirror.com/image-meta@0.2.0 mitt: registry.npmmirror.com/mitt@3.0.1 pathe: registry.npmmirror.com/pathe@1.1.1 - vite-dev-rpc: registry.npmmirror.com/vite-dev-rpc@0.1.4(vite@5.0.10) - vite-hot-client: registry.npmmirror.com/vite-hot-client@0.2.3(vite@5.0.10) - vite-plugin-inspect: registry.npmmirror.com/vite-plugin-inspect@0.8.1(vite@5.0.10) + vite-dev-rpc: registry.npmmirror.com/vite-dev-rpc@0.1.4(vite@5.0.11) + vite-hot-client: registry.npmmirror.com/vite-hot-client@0.2.3(vite@5.0.11) + vite-plugin-inspect: registry.npmmirror.com/vite-plugin-inspect@0.8.1(vite@5.0.11) transitivePeerDependencies: - '@nuxt/kit' - rollup @@ -2785,36 +2795,37 @@ packages: '@esbuild/win32-x64': registry.npmmirror.com/@esbuild/win32-x64@0.18.20 dev: true - registry.npmmirror.com/esbuild@0.19.9: - resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.19.9.tgz} + registry.npmmirror.com/esbuild@0.19.11: + resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==, tarball: https://registry.npmmirror.com/esbuild/-/esbuild-0.19.11.tgz} name: esbuild - version: 0.19.9 + version: 0.19.11 engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': registry.npmmirror.com/@esbuild/android-arm@0.19.9 - '@esbuild/android-arm64': registry.npmmirror.com/@esbuild/android-arm64@0.19.9 - '@esbuild/android-x64': registry.npmmirror.com/@esbuild/android-x64@0.19.9 - '@esbuild/darwin-arm64': registry.npmmirror.com/@esbuild/darwin-arm64@0.19.9 - '@esbuild/darwin-x64': registry.npmmirror.com/@esbuild/darwin-x64@0.19.9 - '@esbuild/freebsd-arm64': registry.npmmirror.com/@esbuild/freebsd-arm64@0.19.9 - '@esbuild/freebsd-x64': registry.npmmirror.com/@esbuild/freebsd-x64@0.19.9 - '@esbuild/linux-arm': registry.npmmirror.com/@esbuild/linux-arm@0.19.9 - '@esbuild/linux-arm64': registry.npmmirror.com/@esbuild/linux-arm64@0.19.9 - '@esbuild/linux-ia32': registry.npmmirror.com/@esbuild/linux-ia32@0.19.9 - '@esbuild/linux-loong64': registry.npmmirror.com/@esbuild/linux-loong64@0.19.9 - '@esbuild/linux-mips64el': registry.npmmirror.com/@esbuild/linux-mips64el@0.19.9 - '@esbuild/linux-ppc64': registry.npmmirror.com/@esbuild/linux-ppc64@0.19.9 - '@esbuild/linux-riscv64': registry.npmmirror.com/@esbuild/linux-riscv64@0.19.9 - '@esbuild/linux-s390x': registry.npmmirror.com/@esbuild/linux-s390x@0.19.9 - '@esbuild/linux-x64': registry.npmmirror.com/@esbuild/linux-x64@0.19.9 - '@esbuild/netbsd-x64': registry.npmmirror.com/@esbuild/netbsd-x64@0.19.9 - '@esbuild/openbsd-x64': registry.npmmirror.com/@esbuild/openbsd-x64@0.19.9 - '@esbuild/sunos-x64': registry.npmmirror.com/@esbuild/sunos-x64@0.19.9 - '@esbuild/win32-arm64': registry.npmmirror.com/@esbuild/win32-arm64@0.19.9 - '@esbuild/win32-ia32': registry.npmmirror.com/@esbuild/win32-ia32@0.19.9 - '@esbuild/win32-x64': registry.npmmirror.com/@esbuild/win32-x64@0.19.9 + '@esbuild/aix-ppc64': registry.npmmirror.com/@esbuild/aix-ppc64@0.19.11 + '@esbuild/android-arm': registry.npmmirror.com/@esbuild/android-arm@0.19.11 + '@esbuild/android-arm64': registry.npmmirror.com/@esbuild/android-arm64@0.19.11 + '@esbuild/android-x64': registry.npmmirror.com/@esbuild/android-x64@0.19.11 + '@esbuild/darwin-arm64': registry.npmmirror.com/@esbuild/darwin-arm64@0.19.11 + '@esbuild/darwin-x64': registry.npmmirror.com/@esbuild/darwin-x64@0.19.11 + '@esbuild/freebsd-arm64': registry.npmmirror.com/@esbuild/freebsd-arm64@0.19.11 + '@esbuild/freebsd-x64': registry.npmmirror.com/@esbuild/freebsd-x64@0.19.11 + '@esbuild/linux-arm': registry.npmmirror.com/@esbuild/linux-arm@0.19.11 + '@esbuild/linux-arm64': registry.npmmirror.com/@esbuild/linux-arm64@0.19.11 + '@esbuild/linux-ia32': registry.npmmirror.com/@esbuild/linux-ia32@0.19.11 + '@esbuild/linux-loong64': registry.npmmirror.com/@esbuild/linux-loong64@0.19.11 + '@esbuild/linux-mips64el': registry.npmmirror.com/@esbuild/linux-mips64el@0.19.11 + '@esbuild/linux-ppc64': registry.npmmirror.com/@esbuild/linux-ppc64@0.19.11 + '@esbuild/linux-riscv64': registry.npmmirror.com/@esbuild/linux-riscv64@0.19.11 + '@esbuild/linux-s390x': registry.npmmirror.com/@esbuild/linux-s390x@0.19.11 + '@esbuild/linux-x64': registry.npmmirror.com/@esbuild/linux-x64@0.19.11 + '@esbuild/netbsd-x64': registry.npmmirror.com/@esbuild/netbsd-x64@0.19.11 + '@esbuild/openbsd-x64': registry.npmmirror.com/@esbuild/openbsd-x64@0.19.11 + '@esbuild/sunos-x64': registry.npmmirror.com/@esbuild/sunos-x64@0.19.11 + '@esbuild/win32-arm64': registry.npmmirror.com/@esbuild/win32-arm64@0.19.11 + '@esbuild/win32-ia32': registry.npmmirror.com/@esbuild/win32-ia32@0.19.11 + '@esbuild/win32-x64': registry.npmmirror.com/@esbuild/win32-x64@0.19.11 registry.npmmirror.com/escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==, tarball: https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz} @@ -4311,26 +4322,28 @@ packages: yargs: registry.npmmirror.com/yargs@17.7.2 dev: true - registry.npmmirror.com/rollup@4.8.0: - resolution: {integrity: sha512-NpsklK2fach5CdI+PScmlE5R4Ao/FSWtF7LkoIrHDxPACY/xshNasPsbpG0VVHxUTbf74tJbVT4PrP8JsJ6ZDA==, tarball: https://registry.npmmirror.com/rollup/-/rollup-4.8.0.tgz} + registry.npmmirror.com/rollup@4.9.4: + resolution: {integrity: sha512-2ztU7pY/lrQyXSCnnoU4ICjT/tCG9cdH3/G25ERqE3Lst6vl2BCM5hL2Nw+sslAvAf+ccKsAq1SkKQALyqhR7g==, tarball: https://registry.npmmirror.com/rollup/-/rollup-4.9.4.tgz} name: rollup - version: 4.8.0 + version: 4.9.4 engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + dependencies: + '@types/estree': registry.npmmirror.com/@types/estree@1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': registry.npmmirror.com/@rollup/rollup-android-arm-eabi@4.8.0 - '@rollup/rollup-android-arm64': registry.npmmirror.com/@rollup/rollup-android-arm64@4.8.0 - '@rollup/rollup-darwin-arm64': registry.npmmirror.com/@rollup/rollup-darwin-arm64@4.8.0 - '@rollup/rollup-darwin-x64': registry.npmmirror.com/@rollup/rollup-darwin-x64@4.8.0 - '@rollup/rollup-linux-arm-gnueabihf': registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf@4.8.0 - '@rollup/rollup-linux-arm64-gnu': registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu@4.8.0 - '@rollup/rollup-linux-arm64-musl': registry.npmmirror.com/@rollup/rollup-linux-arm64-musl@4.8.0 - '@rollup/rollup-linux-riscv64-gnu': registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu@4.8.0 - '@rollup/rollup-linux-x64-gnu': registry.npmmirror.com/@rollup/rollup-linux-x64-gnu@4.8.0 - '@rollup/rollup-linux-x64-musl': registry.npmmirror.com/@rollup/rollup-linux-x64-musl@4.8.0 - '@rollup/rollup-win32-arm64-msvc': registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc@4.8.0 - '@rollup/rollup-win32-ia32-msvc': registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc@4.8.0 - '@rollup/rollup-win32-x64-msvc': registry.npmmirror.com/@rollup/rollup-win32-x64-msvc@4.8.0 + '@rollup/rollup-android-arm-eabi': registry.npmmirror.com/@rollup/rollup-android-arm-eabi@4.9.4 + '@rollup/rollup-android-arm64': registry.npmmirror.com/@rollup/rollup-android-arm64@4.9.4 + '@rollup/rollup-darwin-arm64': registry.npmmirror.com/@rollup/rollup-darwin-arm64@4.9.4 + '@rollup/rollup-darwin-x64': registry.npmmirror.com/@rollup/rollup-darwin-x64@4.9.4 + '@rollup/rollup-linux-arm-gnueabihf': registry.npmmirror.com/@rollup/rollup-linux-arm-gnueabihf@4.9.4 + '@rollup/rollup-linux-arm64-gnu': registry.npmmirror.com/@rollup/rollup-linux-arm64-gnu@4.9.4 + '@rollup/rollup-linux-arm64-musl': registry.npmmirror.com/@rollup/rollup-linux-arm64-musl@4.9.4 + '@rollup/rollup-linux-riscv64-gnu': registry.npmmirror.com/@rollup/rollup-linux-riscv64-gnu@4.9.4 + '@rollup/rollup-linux-x64-gnu': registry.npmmirror.com/@rollup/rollup-linux-x64-gnu@4.9.4 + '@rollup/rollup-linux-x64-musl': registry.npmmirror.com/@rollup/rollup-linux-x64-musl@4.9.4 + '@rollup/rollup-win32-arm64-msvc': registry.npmmirror.com/@rollup/rollup-win32-arm64-msvc@4.9.4 + '@rollup/rollup-win32-ia32-msvc': registry.npmmirror.com/@rollup/rollup-win32-ia32-msvc@4.9.4 + '@rollup/rollup-win32-x64-msvc': registry.npmmirror.com/@rollup/rollup-win32-x64-msvc@4.9.4 fsevents: registry.npmmirror.com/fsevents@2.3.3 registry.npmmirror.com/run-applescript@5.0.0: @@ -4731,7 +4744,7 @@ packages: engines: {node: '>= 10.0.0'} dev: true - registry.npmmirror.com/unocss@0.58.3(postcss@8.4.32)(vite@5.0.10): + registry.npmmirror.com/unocss@0.58.3(postcss@8.4.32)(vite@5.0.11): resolution: {integrity: sha512-2rnvghfiIDRQ2cOrmN4P7J7xV2p3yBK+bPAt1aoUxCXcszkLczAnQzh9c7IZ+p70kSVstK45cJTYV6TMzOLF7Q==, tarball: https://registry.npmmirror.com/unocss/-/unocss-0.58.3.tgz} id: registry.npmmirror.com/unocss/0.58.3 name: unocss @@ -4746,7 +4759,7 @@ packages: vite: optional: true dependencies: - '@unocss/astro': registry.npmmirror.com/@unocss/astro@0.58.3(vite@5.0.10) + '@unocss/astro': registry.npmmirror.com/@unocss/astro@0.58.3(vite@5.0.11) '@unocss/cli': registry.npmmirror.com/@unocss/cli@0.58.3 '@unocss/core': registry.npmmirror.com/@unocss/core@0.58.3 '@unocss/extractor-arbitrary-variants': registry.npmmirror.com/@unocss/extractor-arbitrary-variants@0.58.3 @@ -4765,8 +4778,8 @@ packages: '@unocss/transformer-compile-class': registry.npmmirror.com/@unocss/transformer-compile-class@0.58.3 '@unocss/transformer-directives': registry.npmmirror.com/@unocss/transformer-directives@0.58.3 '@unocss/transformer-variant-group': registry.npmmirror.com/@unocss/transformer-variant-group@0.58.3 - '@unocss/vite': registry.npmmirror.com/@unocss/vite@0.58.3(vite@5.0.10) - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + '@unocss/vite': registry.npmmirror.com/@unocss/vite@0.58.3(vite@5.0.11) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) transitivePeerDependencies: - postcss - rollup @@ -4889,7 +4902,7 @@ packages: vue: registry.npmmirror.com/vue@3.4.3(typescript@5.3.2) dev: false - registry.npmmirror.com/vite-dev-rpc@0.1.4(vite@5.0.10): + registry.npmmirror.com/vite-dev-rpc@0.1.4(vite@5.0.11): resolution: {integrity: sha512-6I/qF7EDGLQfm3DGdcbkZ7JRl3FIbaVgD1TqDWBaCosJ1QljLzNzDBmMEa7cYkEyAMxHDBqT7zJrOiuYlFYcAA==, tarball: https://registry.npmmirror.com/vite-dev-rpc/-/vite-dev-rpc-0.1.4.tgz} id: registry.npmmirror.com/vite-dev-rpc/0.1.4 name: vite-dev-rpc @@ -4898,11 +4911,11 @@ packages: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 dependencies: birpc: registry.npmmirror.com/birpc@0.2.14 - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) - vite-hot-client: registry.npmmirror.com/vite-hot-client@0.2.3(vite@5.0.10) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) + vite-hot-client: registry.npmmirror.com/vite-hot-client@0.2.3(vite@5.0.11) dev: true - registry.npmmirror.com/vite-hot-client@0.2.3(vite@5.0.10): + registry.npmmirror.com/vite-hot-client@0.2.3(vite@5.0.11): resolution: {integrity: sha512-rOGAV7rUlUHX89fP2p2v0A2WWvV3QMX2UYq0fRqsWSvFvev4atHWqjwGoKaZT1VTKyLGk533ecu3eyd0o59CAg==, tarball: https://registry.npmmirror.com/vite-hot-client/-/vite-hot-client-0.2.3.tgz} id: registry.npmmirror.com/vite-hot-client/0.2.3 name: vite-hot-client @@ -4910,10 +4923,10 @@ packages: peerDependencies: vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 dependencies: - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) dev: true - registry.npmmirror.com/vite-plugin-inspect@0.8.1(vite@5.0.10): + registry.npmmirror.com/vite-plugin-inspect@0.8.1(vite@5.0.11): resolution: {integrity: sha512-oPBPVGp6tBd5KdY/qY6lrbLXqrbHRG0hZLvEaJfiZ/GQfDB+szRuLHblQh1oi1Hhh8GeLit/50l4xfs2SA+TCA==, tarball: https://registry.npmmirror.com/vite-plugin-inspect/-/vite-plugin-inspect-0.8.1.tgz} id: registry.npmmirror.com/vite-plugin-inspect/0.8.1 name: vite-plugin-inspect @@ -4934,13 +4947,13 @@ packages: open: registry.npmmirror.com/open@9.1.0 picocolors: registry.npmmirror.com/picocolors@1.0.0 sirv: registry.npmmirror.com/sirv@2.0.4 - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) transitivePeerDependencies: - rollup - supports-color dev: true - registry.npmmirror.com/vite-plugin-simple-html@0.1.2(vite@5.0.10): + registry.npmmirror.com/vite-plugin-simple-html@0.1.2(vite@5.0.11): resolution: {integrity: sha512-Eu/6wH2zy7TYGh1VRyWQ+nB+yrxPfHF2n0qBVSlv3tlivbylxqRobRAdLIcSDwQfcRIFN2PuT9u6Dz74sQk7Pw==, tarball: https://registry.npmmirror.com/vite-plugin-simple-html/-/vite-plugin-simple-html-0.1.2.tgz} id: registry.npmmirror.com/vite-plugin-simple-html/0.1.2 name: vite-plugin-simple-html @@ -4953,10 +4966,10 @@ packages: optional: true dependencies: html-minifier-terser: registry.npmmirror.com/html-minifier-terser@7.2.0 - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) dev: true - registry.npmmirror.com/vite-plugin-vue-devtools@7.0.2(vite@5.0.10): + registry.npmmirror.com/vite-plugin-vue-devtools@7.0.2(vite@5.0.11): resolution: {integrity: sha512-Hf0u0HVajzE3op1Ij+PgtbN+6SipGJJbKnsw4GClDENrauDzROIHAWrkRslIjLP0X+bf+esjDOkU0cGgHWzdEw==, tarball: https://registry.npmmirror.com/vite-plugin-vue-devtools/-/vite-plugin-vue-devtools-7.0.2.tgz} id: registry.npmmirror.com/vite-plugin-vue-devtools/7.0.2 name: vite-plugin-vue-devtools @@ -4965,22 +4978,22 @@ packages: peerDependencies: vite: ^3.1.0 || ^4.0.0-0 || ^5.0.0-0 dependencies: - '@vue/devtools-core': registry.npmmirror.com/@vue/devtools-core@7.0.2(vite@5.0.10) + '@vue/devtools-core': registry.npmmirror.com/@vue/devtools-core@7.0.2(vite@5.0.11) '@vue/devtools-kit': registry.npmmirror.com/@vue/devtools-kit@7.0.2 '@vue/devtools-shared': registry.npmmirror.com/@vue/devtools-shared@7.0.2 birpc: registry.npmmirror.com/birpc@0.2.14 execa: registry.npmmirror.com/execa@8.0.1 sirv: registry.npmmirror.com/sirv@2.0.4 - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) - vite-plugin-inspect: registry.npmmirror.com/vite-plugin-inspect@0.8.1(vite@5.0.10) - vite-plugin-vue-inspector: registry.npmmirror.com/vite-plugin-vue-inspector@4.0.2(vite@5.0.10) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) + vite-plugin-inspect: registry.npmmirror.com/vite-plugin-inspect@0.8.1(vite@5.0.11) + vite-plugin-vue-inspector: registry.npmmirror.com/vite-plugin-vue-inspector@4.0.2(vite@5.0.11) transitivePeerDependencies: - '@nuxt/kit' - rollup - supports-color dev: true - registry.npmmirror.com/vite-plugin-vue-inspector@4.0.2(vite@5.0.10): + registry.npmmirror.com/vite-plugin-vue-inspector@4.0.2(vite@5.0.11): resolution: {integrity: sha512-KPvLEuafPG13T7JJuQbSm5PwSxKFnVS965+MP1we2xGw9BPkkc/+LPix5MMWenpKWqtjr0ws8THrR+KuoDC8hg==, tarball: https://registry.npmmirror.com/vite-plugin-vue-inspector/-/vite-plugin-vue-inspector-4.0.2.tgz} id: registry.npmmirror.com/vite-plugin-vue-inspector/4.0.2 name: vite-plugin-vue-inspector @@ -4997,16 +5010,16 @@ packages: '@vue/compiler-dom': registry.npmmirror.com/@vue/compiler-dom@3.3.11 kolorist: registry.npmmirror.com/kolorist@1.8.0 magic-string: registry.npmmirror.com/magic-string@0.30.5 - vite: registry.npmmirror.com/vite@5.0.10(sass@1.69.5) + vite: registry.npmmirror.com/vite@5.0.11(sass@1.69.5) transitivePeerDependencies: - supports-color dev: true - registry.npmmirror.com/vite@5.0.10(sass@1.69.5): - resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==, tarball: https://registry.npmmirror.com/vite/-/vite-5.0.10.tgz} - id: registry.npmmirror.com/vite/5.0.10 + registry.npmmirror.com/vite@5.0.11(sass@1.69.5): + resolution: {integrity: sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==, tarball: https://registry.npmmirror.com/vite/-/vite-5.0.11.tgz} + id: registry.npmmirror.com/vite/5.0.11 name: vite - version: 5.0.10 + version: 5.0.11 engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -5033,9 +5046,9 @@ packages: terser: optional: true dependencies: - esbuild: registry.npmmirror.com/esbuild@0.19.9 + esbuild: registry.npmmirror.com/esbuild@0.19.11 postcss: registry.npmmirror.com/postcss@8.4.32 - rollup: registry.npmmirror.com/rollup@4.8.0 + rollup: registry.npmmirror.com/rollup@4.9.4 sass: registry.npmmirror.com/sass@1.69.5 optionalDependencies: fsevents: registry.npmmirror.com/fsevents@2.3.3 diff --git a/src/layouts/components/RoleSelect.vue b/src/layouts/components/RoleSelect.vue index 5431051..4e21416 100644 --- a/src/layouts/components/RoleSelect.vue +++ b/src/layouts/components/RoleSelect.vue @@ -62,7 +62,8 @@ function open(options) { async function setCurrentRole() { try { okLoading.value = true - await userStore.switchCurrentRole(roleCode.value) + const { data } = await api.switchCurrentRole(roleCode.value) + await authStore.switchCurrentRole(data) okLoading.value = false $message.success('切换成功') modalRef.value?.handleOk() diff --git a/src/router/basic-routes.js b/src/router/basic-routes.js new file mode 100644 index 0000000..e8321ab --- /dev/null +++ b/src/router/basic-routes.js @@ -0,0 +1,40 @@ +export const basicRoutes = [ + { + name: 'Login', + path: '/login', + component: () => import('@/views/login/index.vue'), + meta: { + title: '登录页', + layout: 'empty', + }, + }, + + { + name: 'Home', + path: '/', + component: () => import('@/views/home/index.vue'), + meta: { + title: '首页', + }, + }, + + { + name: '404', + path: '/404', + component: () => import('@/views/error-page/404.vue'), + meta: { + title: '页面飞走了', + layout: 'empty', + }, + }, + + { + name: '403', + path: '/403', + component: () => import('@/views/error-page/403.vue'), + meta: { + title: '没有权限', + layout: 'empty', + }, + }, +] diff --git a/src/router/index.js b/src/router/index.js index 4ab9972..de22792 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,47 +9,8 @@ import { createRouter, createWebHistory, createWebHashHistory } from 'vue-router' import { setupRouterGuards } from './guards' import { useAuthStore, usePermissionStore, useUserStore } from '@/store' - -export const basicRoutes = [ - { - name: 'Login', - path: '/login', - component: () => import('@/views/login/index.vue'), - meta: { - title: '登录页', - layout: 'empty', - }, - }, - - { - name: 'Home', - path: '/', - component: () => import('@/views/home/index.vue'), - meta: { - title: '首页', - }, - }, - - { - name: '404', - path: '/404', - component: () => import('@/views/error-page/404.vue'), - meta: { - title: '页面飞走了', - layout: 'empty', - }, - }, - - { - name: '403', - path: '/403', - component: () => import('@/views/error-page/403.vue'), - meta: { - title: '没有权限', - layout: 'empty', - }, - }, -] +import { getPermissions, getUserInfo } from '@/store/helper' +import { basicRoutes } from './basic-routes' export const router = createRouter({ history: @@ -74,32 +35,21 @@ export async function initUserAndPermissions() { const authStore = useAuthStore() if (!authStore.accessToken) { - authStore.toLogin() + const route = unref(router.currentRoute) + if (route.path !== '/login') { + router.replace({ + path: '/login', + query: route.query, + }) + } return } - await Promise.all([userStore.getUserInfo(), permissionStore.initPermissions()]) + const [user, permissions] = await Promise.all([getUserInfo(), getPermissions()]) + userStore.setUser(user) + permissionStore.setPermissions(permissions) + const routeComponents = import.meta.glob('@/views/**/*.vue') permissionStore.accessRoutes.forEach((route) => { + route.component = routeComponents[route.component] || undefined !router.hasRoute(route.name) && router.addRoute(route) }) } - -export async function resetRouter() { - const basicRouteNames = getRouteNames(basicRoutes) - router.getRoutes().forEach((route) => { - const name = route.name - if (!basicRouteNames.includes(name)) { - router.removeRoute(name) - } - }) -} - -export function getRouteNames(routes) { - const names = [] - for (const route of routes) { - names.push(route.name) - if (route.children?.length) { - names.push(...getRouteNames(route.children)) - } - } - return names -} diff --git a/src/store/helper.js b/src/store/helper.js new file mode 100644 index 0000000..3204405 --- /dev/null +++ b/src/store/helper.js @@ -0,0 +1,29 @@ +import { basePermissions } from '@/settings' +import api from '@/api' + +export async function getUserInfo() { + const res = await api.getUser() + const { id, username, profile, roles, currentRole } = res.data || {} + return { + id, + username, + avatar: profile?.avatar, + nickName: profile?.nickName, + gender: profile?.gender, + address: profile?.address, + email: profile?.email, + roles, + currentRole, + } +} + +export async function getPermissions() { + let asyncPermissions = [] + try { + const res = await api.getRolePermissions() + asyncPermissions = res?.data || [] + } catch (error) { + console.error(error) + } + return basePermissions.concat(asyncPermissions) +} diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js index 4b68f37..16f6164 100644 --- a/src/store/modules/auth.js +++ b/src/store/modules/auth.js @@ -7,8 +7,7 @@ **********************************/ import { defineStore } from 'pinia' -import { useUserStore, usePermissionStore, useTabStore } from '@/store' -import { resetRouter, router } from '@/router' +import { useUserStore, usePermissionStore, useTabStore, useRouterStore } from '@/store' export const useAuthStore = defineStore('auth', { state: () => ({ @@ -22,24 +21,30 @@ export const useAuthStore = defineStore('auth', { this.$reset() }, toLogin() { - const currentRoute = unref(router.currentRoute) + const { router, route } = useRouterStore() router.replace({ path: '/login', - query: currentRoute.query, + query: route.query, }) }, + async switchCurrentRole(data) { + this.resetLoginState() + await nextTick() + this.setToken(data) + }, resetLoginState() { const { resetUser } = useUserStore() - const { resetPermission } = usePermissionStore() + const { resetRouter } = useRouterStore() + const { resetPermission, accessRoutes } = usePermissionStore() const { resetTabs } = useTabStore() + // 重置路由 + resetRouter(accessRoutes) // 重置用户 resetUser() // 重置权限 resetPermission() // 重置Tabs resetTabs() - // 重置路由 - resetRouter() // 重置token this.resetToken() }, diff --git a/src/store/modules/index.js b/src/store/modules/index.js index 5e83e85..9672b79 100644 --- a/src/store/modules/index.js +++ b/src/store/modules/index.js @@ -3,3 +3,4 @@ export * from './auth' export * from './permission' export * from './tab' export * from './user' +export * from './router' diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 4dbf0e0..0996192 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -7,27 +7,16 @@ **********************************/ import { defineStore } from 'pinia' -import { isExternal } from '@/utils' -import { basePermissions } from '@/settings' -import api from '@/api' - -const routeComponents = import.meta.glob('@/views/**/*.vue') export const usePermissionStore = defineStore('permission', { state: () => ({ - menus: [], accessRoutes: [], - asyncPermissions: [], + permissions: [], + menus: [], }), - getters: { - permissions() { - return basePermissions.concat(this.asyncPermissions) - }, - }, actions: { - async initPermissions() { - const { data } = (await api.getRolePermissions()) || [] - this.asyncPermissions = data + setPermissions(permissions) { + this.permissions = permissions this.menus = this.permissions .filter((item) => item.type === 'MENU') .map((item) => this.getMenuItem(item)) @@ -36,7 +25,7 @@ export const usePermissionStore = defineStore('permission', { }, getMenuItem(item, parent) { const route = this.generateRoute(item, item.show ? null : parent?.key) - if (item.enable && route.path && !isExternal(route.path)) this.accessRoutes.push(route) + if (item.enable && route.path && !route.path.startsWith('http')) this.accessRoutes.push(route) if (!item.show) return null const menuItem = { label: route.meta.title, @@ -60,7 +49,7 @@ export const usePermissionStore = defineStore('permission', { name: item.code, path: item.path, redirect: item.redirect, - component: routeComponents[item.component] || undefined, + component: item.component, meta: { icon: item.icon, title: item.name, diff --git a/src/store/modules/router.js b/src/store/modules/router.js new file mode 100644 index 0000000..51a5b59 --- /dev/null +++ b/src/store/modules/router.js @@ -0,0 +1,26 @@ +/********************************** + * @Author: Ronnie Zhang + * @LastEditor: Ronnie Zhang + * @LastEditTime: 2024/01/06 17:18:40 + * @Email: zclzone@outlook.com + * Copyright © 2023 Ronnie Zhang(大脸怪) | https://isme.top + **********************************/ + +import { defineStore } from 'pinia' + +export const useRouterStore = defineStore('router', () => { + const router = useRouter() + const route = useRoute() + + function resetRouter(accessRoutes) { + accessRoutes.forEach((item) => { + router.hasRoute(item.name) && router.removeRoute(item.name) + }) + } + + return { + router, + route, + resetRouter, + } +}) diff --git a/src/store/modules/tab.js b/src/store/modules/tab.js index 4037358..ea4317f 100644 --- a/src/store/modules/tab.js +++ b/src/store/modules/tab.js @@ -7,7 +7,7 @@ **********************************/ import { defineStore } from 'pinia' -import { router } from '@/router' +import { useRouterStore } from './router' export const useTabStore = defineStore('tab', { state: () => ({ @@ -55,13 +55,13 @@ export const useTabStore = defineStore('tab', { async removeTab(path) { this.setTabs(this.tabs.filter((tab) => tab.path !== path)) if (path === this.activeTab) { - router.push(this.tabs[this.tabs.length - 1].path) + useRouterStore().router?.push(this.tabs[this.tabs.length - 1].path) } }, removeOther(curPath = this.activeTab) { this.setTabs(this.tabs.filter((tab) => tab.path === curPath)) if (curPath !== this.activeTab) { - router.push(this.tabs[this.tabs.length - 1].path) + useRouterStore().router?.push(this.tabs[this.tabs.length - 1].path) } }, removeLeft(curPath) { @@ -69,7 +69,7 @@ export const useTabStore = defineStore('tab', { const filterTabs = this.tabs.filter((item, index) => index >= curIndex) this.setTabs(filterTabs) if (!filterTabs.find((item) => item.path === this.activeTab)) { - router.push(filterTabs[filterTabs.length - 1].path) + useRouterStore().router?.push(filterTabs[filterTabs.length - 1].path) } }, removeRight(curPath) { @@ -77,7 +77,7 @@ export const useTabStore = defineStore('tab', { const filterTabs = this.tabs.filter((item, index) => index <= curIndex) this.setTabs(filterTabs) if (!filterTabs.find((item) => item.path === this.activeTab.value)) { - router.push(filterTabs[filterTabs.length - 1].path) + useRouterStore().router?.push(filterTabs[filterTabs.length - 1].path) } }, resetTabs() { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5a3f98d..c434737 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,8 +7,6 @@ **********************************/ import { defineStore } from 'pinia' -import api from '@/api' -import { useAuthStore } from '@/store' export const useUserStore = defineStore('user', { state: () => ({ @@ -35,32 +33,8 @@ export const useUserStore = defineStore('user', { }, }, actions: { - async getUserInfo() { - try { - const res = await api.getUser() - const { id, username, profile, roles, currentRole } = res.data || {} - this.userInfo = { - id, - username, - avatar: profile?.avatar, - nickName: profile?.nickName, - gender: profile?.gender, - address: profile?.address, - email: profile?.email, - roles, - currentRole, - } - return Promise.resolve(res.data) - } catch (error) { - return Promise.reject(error) - } - }, - async switchCurrentRole(roleCode) { - const { data } = await api.switchCurrentRole(roleCode) - const authStore = useAuthStore() - authStore.resetLoginState() - await nextTick() - authStore.setToken(data) + setUser(user) { + this.userInfo = user }, resetUser() { this.$reset() diff --git a/src/utils/naiveTools.js b/src/utils/naiveTools.js index 5f647d1..b5edb79 100644 --- a/src/utils/naiveTools.js +++ b/src/utils/naiveTools.js @@ -9,7 +9,7 @@ import * as NaiveUI from 'naive-ui' import { isNullOrUndef } from '@/utils' -import { useAppStore } from '@/store/modules/app' +import { useAppStore } from '@/store' export function setupMessage(NMessage) { class Message { diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue index d330589..4a81ce6 100644 --- a/src/views/profile/index.vue +++ b/src/views/profile/index.vue @@ -100,9 +100,10 @@ import { MeModal } from '@/components' import { useForm, useModal } from '@/composables' import { useUserStore } from '@/store' +import { getUserInfo } from '@/store/helper' import api from './api' -const userStore = useUserStore() +const userStore = useUserStore() const required = { required: true, message: '此为必填项', @@ -116,7 +117,7 @@ async function handlePwdSave() { await pwdValidation() await api.changePassword(pwdForm.value) $message.success('密码修改成功') - userStore.getUserInfo() + refreshUserInfo() } const newAvatar = ref(userStore.avatar) @@ -128,7 +129,7 @@ async function handleAvatarSave() { } await api.updateProfile({ id: userStore.userId, avatar: newAvatar.value }) $message.success('头像修改成功') - userStore.getUserInfo() + refreshUserInfo() } const genders = [ @@ -148,6 +149,11 @@ async function handleProfileSave() { await profileValidation() await api.updateProfile(profileForm.value) $message.success('资料修改成功') - userStore.getUserInfo() + refreshUserInfo() +} + +async function refreshUserInfo() { + const user = await getUserInfo() + userStore.setUser(user) }