From 630908988286d062bdce9a433ea5e785dbf8659d Mon Sep 17 00:00:00 2001
From: bqy_fe <1743369777@qq.com>
Date: Fri, 14 Jan 2022 11:54:34 +0800
Subject: [PATCH] fix: add menu sort
---
package.json | 12 +-
src/layout/menu/menu-item.vue | 10 +-
src/layout/menu/menu.vue | 5 +-
src/router/generator-router.tsx | 3 +-
src/router/staticModules/error.ts | 5 +
src/store/modules/user.ts | 2 +-
types/vue-router.d.ts | 5 +-
yarn.lock | 188 +++++++++++++++---------------
8 files changed, 124 insertions(+), 106 deletions(-)
diff --git a/package.json b/package.json
index 2e2494852..fcfadc021 100644
--- a/package.json
+++ b/package.json
@@ -33,13 +33,13 @@
"mockjs": "^1.1.0",
"nprogress": "^1.0.0-1",
"pinia": "2.0.9",
- "qs": "^6.10.2",
+ "qs": "^6.10.3",
"socket.io-client": "4.4.1",
"sortablejs": "^1.14.0",
"vue": "^3.2.26",
- "vue-i18n": "^9.2.0-beta.26",
+ "vue-i18n": "^9.2.0-beta.28",
"vue-router": "^4.0.12",
- "xlsx": "^0.17.4"
+ "xlsx": "^0.17.5"
},
"devDependencies": {
"@commitlint/cli": "^16.0.2",
@@ -47,8 +47,8 @@
"@types/lodash-es": "^4.17.5",
"@types/node": "^17.0.8",
"@types/webpack-env": "^1.16.3",
- "@typescript-eslint/eslint-plugin": "^5.9.0",
- "@typescript-eslint/parser": "^5.9.0",
+ "@typescript-eslint/eslint-plugin": "^5.9.1",
+ "@typescript-eslint/parser": "^5.9.1",
"@vue/cli-plugin-babel": "^5.0.0-rc.1",
"@vue/cli-plugin-eslint": "^5.0.0-rc.1",
"@vue/cli-plugin-router": "^5.0.0-rc.1",
@@ -64,7 +64,7 @@
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
- "eslint-plugin-vue": "^8.2.0",
+ "eslint-plugin-vue": "^8.3.0",
"husky": "^7.0.4",
"less": "^4.1.2",
"less-loader": "10.2.0",
diff --git a/src/layout/menu/menu-item.vue b/src/layout/menu/menu-item.vue
index c1e45c0f4..18b06355d 100644
--- a/src/layout/menu/menu-item.vue
+++ b/src/layout/menu/menu-item.vue
@@ -12,7 +12,7 @@
-
+
@@ -34,7 +34,7 @@
diff --git a/src/layout/menu/menu.vue b/src/layout/menu/menu.vue
index f287f1172..87bc7d70d 100644
--- a/src/layout/menu/menu.vue
+++ b/src/layout/menu/menu.vue
@@ -35,7 +35,10 @@
const currentRoute = useRoute();
const router = useRouter();
- const menus = computed(() => userStore.menus);
+ const menus = computed(() =>
+ [...userStore.menus].sort((a, b) => (a?.meta?.orderNum || 0) - (b?.meta?.orderNum || 0)),
+ );
+ console.log('menus', menus.value);
// 根据activeMenu获取指定的menu
const getTargetMenuByActiveMenuName = (activeMenu: string) => {
diff --git a/src/router/generator-router.tsx b/src/router/generator-router.tsx
index f13386771..b65730084 100644
--- a/src/router/generator-router.tsx
+++ b/src/router/generator-router.tsx
@@ -23,7 +23,7 @@ export function filterAsyncRoute(
return routes
.filter((item) => item.type !== 2 && item.isShow && item.parentId == parentRoute?.id)
.map((item) => {
- const { router, viewPath, name, icon, keepalive } = item;
+ const { router, viewPath, name, icon, orderNum, keepalive } = item;
let fullPath = '';
const pathPrefix = lastNamePath.slice(-1)[0] || '';
if (isUrl(router)) {
@@ -47,6 +47,7 @@ export function filterAsyncRoute(
// name: `${viewPath ? toHump(viewPath) : fullPath}-${item.id}`,
name: fullPath,
meta: {
+ orderNum,
title: name,
perms: [],
icon: icon,
diff --git a/src/router/staticModules/error.ts b/src/router/staticModules/error.ts
index 3579a2e80..27cb72bbe 100644
--- a/src/router/staticModules/error.ts
+++ b/src/router/staticModules/error.ts
@@ -7,6 +7,11 @@ const moduleName = 'error';
export const notFound: RouteRecordRaw = {
path: '/:pathMatch(.*)*',
name: 'NotFound',
+ meta: {
+ title: 'NotFound',
+ hideInMenu: true,
+ hideInTabs: true,
+ },
redirect: '/error/404',
component: () => import(/* webpackChunkName: "404" */ '@/views/error/404.vue'),
};
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 9a61f4893..c4b54a10f 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -79,7 +79,7 @@ export const useUserStore = defineStore({
this.userInfo = userInfo;
// 生成路由
const generatorResult = generatorDynamicRouter(menus);
- this.menus = generatorResult.menus;
+ this.menus = generatorResult.menus.filter((item) => !item.meta?.hideInMenu);
wsStore.initSocket();
return { menus, perms, userInfo };
diff --git a/types/vue-router.d.ts b/types/vue-router.d.ts
index 249c9005c..57dde132e 100644
--- a/types/vue-router.d.ts
+++ b/types/vue-router.d.ts
@@ -1,5 +1,6 @@
import { type PermissionType } from '@/core/permission/modules/types';
import { type LocaleType } from '@/locales/config';
+import { type RouteMeta as VRouteMeta } from 'vue-router';
declare global {
type Title18n = {
@@ -8,7 +9,7 @@ declare global {
}
declare module 'vue-router' {
- interface RouteMeta extends Record {
+ interface RouteMeta extends VRouteMeta {
/** 标题 */
title: string | Title18n;
/** 当前路由是否需要权限验证 */
@@ -35,6 +36,8 @@ declare module 'vue-router' {
hideInTabs?: boolean;
/** 设置当前路由高亮的菜单项,值为route fullPath或route name,一般用于详情页 */
activeMenu?: string;
+ /** 菜单排序号 */
+ orderNum?: number;
isLink?: boolean;
}
}
diff --git a/yarn.lock b/yarn.lock
index ff58b7668..0e9876d59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1172,43 +1172,43 @@
resolved "https://registry.npm.taobao.org/@hutson/parse-repository-url/download/@hutson/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
integrity sha1-mMI8lQo9m2yPDa7QbabDrwaYE0A=
-"@intlify/core-base@9.2.0-beta.26":
- version "9.2.0-beta.26"
- resolved "https://registry.npmmirror.com/@intlify/core-base/download/@intlify/core-base-9.2.0-beta.26.tgz#0092cfce681a47db1a502583e0108d61cd7b7327"
- integrity sha512-4OXSF0zC70UElev6gam4FdWfC7u4l2ouNK9Hc6R44QlpEXkzhbwwbpZn9gIGB2l11zQnJkAwaovfYyiNJ/JvkA==
+"@intlify/core-base@9.2.0-beta.28":
+ version "9.2.0-beta.28"
+ resolved "https://registry.npmmirror.com/@intlify/core-base/download/@intlify/core-base-9.2.0-beta.28.tgz#e8b1e4adfa7a262c6ed169ad7b15dbe2a173cb27"
+ integrity sha512-p7iXwVQFyBmEo65KoqRCbT6Ig3OI6rnaS/zeMCKtp6Bjsbg35VGAaiN05Eyrq78BCh2Ir1S6nl+Cz3y00D0yoQ==
dependencies:
- "@intlify/devtools-if" "9.2.0-beta.26"
- "@intlify/message-compiler" "9.2.0-beta.26"
- "@intlify/shared" "9.2.0-beta.26"
- "@intlify/vue-devtools" "9.2.0-beta.26"
+ "@intlify/devtools-if" "9.2.0-beta.28"
+ "@intlify/message-compiler" "9.2.0-beta.28"
+ "@intlify/shared" "9.2.0-beta.28"
+ "@intlify/vue-devtools" "9.2.0-beta.28"
-"@intlify/devtools-if@9.2.0-beta.26":
- version "9.2.0-beta.26"
- resolved "https://registry.npmmirror.com/@intlify/devtools-if/download/@intlify/devtools-if-9.2.0-beta.26.tgz#06e498825aa1f4984476c2da9b1bcf9cdc3d0424"
- integrity sha512-7GiF7v2jlHf7g5hoLF6sKlrX5Di2INfHN4PEAeVr2ashgoSaq1EYIRouBVAnJkOrDOJzCOEY7y53me7+gIbeTw==
+"@intlify/devtools-if@9.2.0-beta.28":
+ version "9.2.0-beta.28"
+ resolved "https://registry.npmmirror.com/@intlify/devtools-if/download/@intlify/devtools-if-9.2.0-beta.28.tgz#daca7b4348a59109778558e7f5769e5f6b422d4e"
+ integrity sha512-3RL38hDBRipipoYRl4Ggu98M4/XqDKm0jW8kcOWpuocB/aZBBEGzoQfeaq09Xa9SA46podjntBlYDAOGQyXqqg==
dependencies:
- "@intlify/shared" "9.2.0-beta.26"
+ "@intlify/shared" "9.2.0-beta.28"
-"@intlify/message-compiler@9.2.0-beta.26":
- version "9.2.0-beta.26"
- resolved "https://registry.npmmirror.com/@intlify/message-compiler/download/@intlify/message-compiler-9.2.0-beta.26.tgz#9cc5f9f112030483c4a35eaef105ba68cc888fa0"
- integrity sha512-qtDgHCMqrXNTekKXGzm0Dm6r3+/X7/jFXP+E07hx+PJbPMv7DzK1iU8h5LlAMQ1/jr2UIRBgXvR5wh35OKoGrA==
+"@intlify/message-compiler@9.2.0-beta.28":
+ version "9.2.0-beta.28"
+ resolved "https://registry.npmmirror.com/@intlify/message-compiler/download/@intlify/message-compiler-9.2.0-beta.28.tgz#caae08ead8c6c02e2d0de39e1e8bdbbb99683c83"
+ integrity sha512-NBH9fZyitN2cijGt8bmU1W7ZPdhKbgW01L1RxJKFJW0cRaCmknJq63Aif1Q6xcxKt9ZhPbvIKHgPGzg1nWMfeA==
dependencies:
- "@intlify/shared" "9.2.0-beta.26"
+ "@intlify/shared" "9.2.0-beta.28"
source-map "0.6.1"
-"@intlify/shared@9.2.0-beta.26":
- version "9.2.0-beta.26"
- resolved "https://registry.npmmirror.com/@intlify/shared/download/@intlify/shared-9.2.0-beta.26.tgz#430f69235c12f002a93796cc74eb28546bed6be4"
- integrity sha512-MjUlkjNThqkqy8yXUcFKBiW/hIfqAn5cP3Vd0b4wdOHS8rPCEbvSbAnF08uiZDkVv8gTcsLyymX21GaU6oYyyQ==
+"@intlify/shared@9.2.0-beta.28":
+ version "9.2.0-beta.28"
+ resolved "https://registry.npmmirror.com/@intlify/shared/download/@intlify/shared-9.2.0-beta.28.tgz#50bd3f769bcab6f80e00027761b3397e268f9d02"
+ integrity sha512-JBMcoj1D4kSAma7Vb0+d8z6lPLIn7hIdZJPxbU8bgeMMniwKLoIS/jGlEfrZihsB5+otckPeQp203z8skwVS0w==
-"@intlify/vue-devtools@9.2.0-beta.26":
- version "9.2.0-beta.26"
- resolved "https://registry.npmmirror.com/@intlify/vue-devtools/download/@intlify/vue-devtools-9.2.0-beta.26.tgz#1528e053d72aadf796bf478daeb33c5f700d8a98"
- integrity sha512-Ghe2xTSezRzL2fBdIbZEus5+5spE2RMxgjBg6GyvbsDy1M05o2OvukBninJ4/Tc2I5A30lYgAsF1gQlOyfmv1g==
+"@intlify/vue-devtools@9.2.0-beta.28":
+ version "9.2.0-beta.28"
+ resolved "https://registry.npmmirror.com/@intlify/vue-devtools/download/@intlify/vue-devtools-9.2.0-beta.28.tgz#60113c137a380433961934045b9cf046c8773341"
+ integrity sha512-kf9Gt64sjP1fJQHUlB3m/RFDeJBcrvRImcEl6g0BV13K/xyA9u9RGM89YpR16F5KKTXdhpkvroLWh2uo4pc6jg==
dependencies:
- "@intlify/core-base" "9.2.0-beta.26"
- "@intlify/shared" "9.2.0-beta.26"
+ "@intlify/core-base" "9.2.0-beta.28"
+ "@intlify/shared" "9.2.0-beta.28"
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
@@ -1535,14 +1535,14 @@
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/eslint-plugin@^5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-5.9.0.tgz#382182d5cb062f52aac54434cfc47c28898c8006"
- integrity sha512-qT4lr2jysDQBQOPsCCvpPUZHjbABoTJW8V9ZzIYKHMfppJtpdtzszDYsldwhFxlhvrp7aCHeXD1Lb9M1zhwWwQ==
+"@typescript-eslint/eslint-plugin@^5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-5.9.1.tgz#e5a86d7e1f9dc0b3df1e6d94feaf20dd838d066c"
+ integrity sha512-Xv9tkFlyD4MQGpJgTo6wqDqGvHIRmRgah/2Sjz1PUnJTawjHWIwBivUE9x0QtU2WVii9baYgavo/bHjrZJkqTw==
dependencies:
- "@typescript-eslint/experimental-utils" "5.9.0"
- "@typescript-eslint/scope-manager" "5.9.0"
- "@typescript-eslint/type-utils" "5.9.0"
+ "@typescript-eslint/experimental-utils" "5.9.1"
+ "@typescript-eslint/scope-manager" "5.9.1"
+ "@typescript-eslint/type-utils" "5.9.1"
debug "^4.3.2"
functional-red-black-tree "^1.0.1"
ignore "^5.1.8"
@@ -1562,15 +1562,15 @@
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
-"@typescript-eslint/experimental-utils@5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-5.9.0.tgz#652762d37d6565ef07af285021b8347b6c79a827"
- integrity sha512-ZnLVjBrf26dn7ElyaSKa6uDhqwvAi4jBBmHK1VxuFGPRAxhdi18ubQYSGA7SRiFiES3q9JiBOBHEBStOFkwD2g==
+"@typescript-eslint/experimental-utils@5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-5.9.1.tgz#8c407c4dd5ffe522329df6e4c9c2b52206d5f7f1"
+ integrity sha512-cb1Njyss0mLL9kLXgS/eEY53SZQ9sT519wpX3i+U457l2UXRDuo87hgKfgRazmu9/tQb0x2sr3Y0yrU+Zz0y+w==
dependencies:
"@types/json-schema" "^7.0.9"
- "@typescript-eslint/scope-manager" "5.9.0"
- "@typescript-eslint/types" "5.9.0"
- "@typescript-eslint/typescript-estree" "5.9.0"
+ "@typescript-eslint/scope-manager" "5.9.1"
+ "@typescript-eslint/types" "5.9.1"
+ "@typescript-eslint/typescript-estree" "5.9.1"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
@@ -1584,14 +1584,14 @@
"@typescript-eslint/typescript-estree" "5.8.1"
debug "^4.3.2"
-"@typescript-eslint/parser@^5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/parser/download/@typescript-eslint/parser-5.9.0.tgz#fdbb08767a4caa6ca6ccfed5f9ffe9387f0c7d97"
- integrity sha512-/6pOPz8yAxEt4PLzgbFRDpZmHnXCeZgPDrh/1DaVKOjvn/UPMlWhbx/gA96xRi2JxY1kBl2AmwVbyROUqys5xQ==
+"@typescript-eslint/parser@^5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/parser/download/@typescript-eslint/parser-5.9.1.tgz#b114011010a87e17b3265ca715e16c76a9834cef"
+ integrity sha512-PLYO0AmwD6s6n0ZQB5kqPgfvh73p0+VqopQQLuNfi7Lm0EpfKyDalchpVwkE+81k5HeiRrTV/9w1aNHzjD7C4g==
dependencies:
- "@typescript-eslint/scope-manager" "5.9.0"
- "@typescript-eslint/types" "5.9.0"
- "@typescript-eslint/typescript-estree" "5.9.0"
+ "@typescript-eslint/scope-manager" "5.9.1"
+ "@typescript-eslint/types" "5.9.1"
+ "@typescript-eslint/typescript-estree" "5.9.1"
debug "^4.3.2"
"@typescript-eslint/scope-manager@5.8.1":
@@ -1602,20 +1602,20 @@
"@typescript-eslint/types" "5.8.1"
"@typescript-eslint/visitor-keys" "5.8.1"
-"@typescript-eslint/scope-manager@5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/download/@typescript-eslint/scope-manager-5.9.0.tgz#02dfef920290c1dcd7b1999455a3eaae7a1a3117"
- integrity sha512-DKtdIL49Qxk2a8icF6whRk7uThuVz4A6TCXfjdJSwOsf+9ree7vgQWcx0KOyCdk0i9ETX666p4aMhrRhxhUkyg==
+"@typescript-eslint/scope-manager@5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/download/@typescript-eslint/scope-manager-5.9.1.tgz#6c27be89f1a9409f284d95dfa08ee3400166fe69"
+ integrity sha512-8BwvWkho3B/UOtzRyW07ffJXPaLSUKFBjpq8aqsRvu6HdEuzCY57+ffT7QoV4QXJXWSU1+7g3wE4AlgImmQ9pQ==
dependencies:
- "@typescript-eslint/types" "5.9.0"
- "@typescript-eslint/visitor-keys" "5.9.0"
+ "@typescript-eslint/types" "5.9.1"
+ "@typescript-eslint/visitor-keys" "5.9.1"
-"@typescript-eslint/type-utils@5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/download/@typescript-eslint/type-utils-5.9.0.tgz#fd5963ead04bc9b7af9c3a8e534d8d39f1ce5f93"
- integrity sha512-uVCb9dJXpBrK1071ri5aEW7ZHdDHAiqEjYznF3HSSvAJXyrkxGOw2Ejibz/q6BXdT8lea8CMI0CzKNFTNI6TEQ==
+"@typescript-eslint/type-utils@5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/download/@typescript-eslint/type-utils-5.9.1.tgz#c6832ffe655b9b1fec642d36db1a262d721193de"
+ integrity sha512-tRSpdBnPRssjlUh35rE9ug5HrUvaB9ntREy7gPXXKwmIx61TNN7+l5YKgi1hMKxo5NvqZCfYhA5FvyuJG6X6vg==
dependencies:
- "@typescript-eslint/experimental-utils" "5.9.0"
+ "@typescript-eslint/experimental-utils" "5.9.1"
debug "^4.3.2"
tsutils "^3.21.0"
@@ -1624,10 +1624,10 @@
resolved "https://registry.npmmirror.com/@typescript-eslint/types/download/@typescript-eslint/types-5.8.1.tgz#04c6b49ebc8c99238238a6b8b43f2fc613983b5a"
integrity sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==
-"@typescript-eslint/types@5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/types/download/@typescript-eslint/types-5.9.0.tgz#e5619803e39d24a03b3369506df196355736e1a3"
- integrity sha512-mWp6/b56Umo1rwyGCk8fPIzb9Migo8YOniBGPAQDNC6C52SeyNGN4gsVwQTAR+RS2L5xyajON4hOLwAGwPtUwg==
+"@typescript-eslint/types@5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/types/download/@typescript-eslint/types-5.9.1.tgz#1bef8f238a2fb32ebc6ff6d75020d9f47a1593c6"
+ integrity sha512-SsWegWudWpkZCwwYcKoDwuAjoZXnM1y2EbEerTHho19Hmm+bQ56QG4L4jrtCu0bI5STaRTvRTZmjprWlTw/5NQ==
"@typescript-eslint/typescript-estree@5.8.1":
version "5.8.1"
@@ -1642,13 +1642,13 @@
semver "^7.3.5"
tsutils "^3.21.0"
-"@typescript-eslint/typescript-estree@5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-5.9.0.tgz#0e5c6f03f982931abbfbc3c1b9df5fbf92a3490f"
- integrity sha512-kxo3xL2mB7XmiVZcECbaDwYCt3qFXz99tBSuVJR4L/sR7CJ+UNAPrYILILktGj1ppfZ/jNt/cWYbziJUlHl1Pw==
+"@typescript-eslint/typescript-estree@5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-5.9.1.tgz#d5b996f49476495070d2b8dd354861cf33c005d6"
+ integrity sha512-gL1sP6A/KG0HwrahVXI9fZyeVTxEYV//6PmcOn1tD0rw8VhUWYeZeuWHwwhnewnvEMcHjhnJLOBhA9rK4vmb8A==
dependencies:
- "@typescript-eslint/types" "5.9.0"
- "@typescript-eslint/visitor-keys" "5.9.0"
+ "@typescript-eslint/types" "5.9.1"
+ "@typescript-eslint/visitor-keys" "5.9.1"
debug "^4.3.2"
globby "^11.0.4"
is-glob "^4.0.3"
@@ -1663,12 +1663,12 @@
"@typescript-eslint/types" "5.8.1"
eslint-visitor-keys "^3.0.0"
-"@typescript-eslint/visitor-keys@5.9.0":
- version "5.9.0"
- resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/download/@typescript-eslint/visitor-keys-5.9.0.tgz#7585677732365e9d27f1878150fab3922784a1a6"
- integrity sha512-6zq0mb7LV0ThExKlecvpfepiB+XEtFv/bzx7/jKSgyXTFD7qjmSu1FoiS0x3OZaiS+UIXpH2vd9O89f02RCtgw==
+"@typescript-eslint/visitor-keys@5.9.1":
+ version "5.9.1"
+ resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/download/@typescript-eslint/visitor-keys-5.9.1.tgz#f52206f38128dd4f675cf28070a41596eee985b7"
+ integrity sha512-Xh37pNz9e9ryW4TVdwiFzmr4hloty8cFj8GTWMXh3Z8swGwyQWeCcNgF0hm6t09iZd6eiZmIf4zHedQVP6TVtg==
dependencies:
- "@typescript-eslint/types" "5.9.0"
+ "@typescript-eslint/types" "5.9.1"
eslint-visitor-keys "^3.0.0"
"@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
@@ -4179,10 +4179,10 @@ eslint-plugin-prettier@^4.0.0:
dependencies:
prettier-linter-helpers "^1.0.0"
-eslint-plugin-vue@^8.2.0:
- version "8.2.0"
- resolved "https://registry.npmmirror.com/eslint-plugin-vue/download/eslint-plugin-vue-8.2.0.tgz#b404bc10e3f43b2b7aad4ebb3b38090a58040202"
- integrity sha512-cLIdTuOAMXyHeQ4drYKcZfoyzdwdBpH279X8/N0DgmotEI9yFKb5O/cAgoie/CkQZCH/MOmh0xw/KEfS90zY2A==
+eslint-plugin-vue@^8.3.0:
+ version "8.3.0"
+ resolved "https://registry.npmmirror.com/eslint-plugin-vue/download/eslint-plugin-vue-8.3.0.tgz#2ae4f915ed3541a58c4a4c1145c1e60b86aa7e85"
+ integrity sha512-IIuLHw4vQxGlHcoP2dG6t/2OVdQf2qoyAzEGAxreU1afZOHGA7y3TWq8I+r3ZA6Wjs6xpeUWGHlT31QGr9Rb5g==
dependencies:
eslint-utils "^3.0.0"
natural-compare "^1.4.0"
@@ -7477,10 +7477,10 @@ qs@6.9.6:
resolved "https://registry.npmmirror.com/qs/download/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
-qs@^6.10.2:
- version "6.10.2"
- resolved "https://registry.npmmirror.com/qs/download/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"
- integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw==
+qs@^6.10.3:
+ version "6.10.3"
+ resolved "https://registry.npmmirror.com/qs/download/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+ integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
dependencies:
side-channel "^1.0.4"
@@ -9080,14 +9080,14 @@ vue-hot-reload-api@^2.3.0:
resolved "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
integrity sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=
-vue-i18n@^9.2.0-beta.26:
- version "9.2.0-beta.26"
- resolved "https://registry.npmmirror.com/vue-i18n/download/vue-i18n-9.2.0-beta.26.tgz#79ff5151837c645c9a91af03724ed28a09a1f3db"
- integrity sha512-xZgisyirT9hXFyXBL8pO8bYgdG7m98NLAUhbb1O9hMQS1qOXYU902+LIJA5k3BtoeiEIfjkGADHhSAlJTTzc9A==
+vue-i18n@^9.2.0-beta.28:
+ version "9.2.0-beta.28"
+ resolved "https://registry.npmmirror.com/vue-i18n/download/vue-i18n-9.2.0-beta.28.tgz#fcfa1d2deafb0914817fb338ed8e5deb54ba4e44"
+ integrity sha512-Jn7DHA3JgOYaB6ahqmuW0wQ2zZx0ivastVDUul8325geyT0Q4PblJvXvfWHi2L0eb+YjWMZvf30MQYJ1FWDlfQ==
dependencies:
- "@intlify/core-base" "9.2.0-beta.26"
- "@intlify/shared" "9.2.0-beta.26"
- "@intlify/vue-devtools" "9.2.0-beta.26"
+ "@intlify/core-base" "9.2.0-beta.28"
+ "@intlify/shared" "9.2.0-beta.28"
+ "@intlify/vue-devtools" "9.2.0-beta.28"
"@vue/devtools-api" "^6.0.0-beta.13"
vue-loader@^16.8.2:
@@ -9429,10 +9429,10 @@ ws@~8.2.3:
resolved "https://registry.npmmirror.com/ws/download/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
integrity sha1-Y6VkVtsbBDZ9C3IaC4DK5ti+y7o=
-xlsx@^0.17.4:
- version "0.17.4"
- resolved "https://registry.npmmirror.com/xlsx/download/xlsx-0.17.4.tgz#dc3e3a0954c835f4d0fdd643645db6f4ac3f28f2"
- integrity sha512-9aKt8g9ZLP0CUdBX8L5xnoMDFwSiLI997eQnDThCaqQMYB9AEBIRzblSSNN/ICMGLYIHUO3VKaItcedZJ3ijIg==
+xlsx@^0.17.5:
+ version "0.17.5"
+ resolved "https://registry.npmmirror.com/xlsx/download/xlsx-0.17.5.tgz#78b788fcfc0773d126cdcd7ea069cb7527c1ce81"
+ integrity sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==
dependencies:
adler-32 "~1.2.0"
cfb "^1.1.4"