From 6441700ae19fbef9787846ddc29b034351b160b5 Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Sat, 28 May 2022 19:10:19 +0800
Subject: [PATCH] =?UTF-8?q?'admin-22.05.28:=E6=9B=B4=E6=96=B0=E4=BC=98?=
=?UTF-8?q?=E5=8C=96v2.1.1=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=A0=B9=E7=9B=AE=E5=BD=95CHANGELOG.md'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 14 +
package-lock.json | 521 ++++++++++---------
package.json | 16 +-
src/components/iconSelector/index.vue | 25 +-
src/components/svgIcon/index.vue | 19 +-
src/layout/navBars/breadcrumb/breadcrumb.vue | 5 +-
src/layout/navBars/tagsView/tagsView.vue | 2 +-
src/layout/routerView/parent.vue | 3 +
src/theme/dark.scss | 4 +-
src/utils/toolsValidate.ts | 2 +-
10 files changed, 326 insertions(+), 285 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 691bdfcc..34eedbec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等,适配手机、平板、pc 的后台开源免费模板库(vue2.x 请切换 vue-prev-admin 分支)
+## 2.1.1
+
+`2022.05.27`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 深色模式下,`` 时,`:active` 样式
+- 🎯 优化 [页面缓存在刷新之后失效 #I58U75](https://gitee.com/lyt-top/vue-next-admin/issues/I58U75)),感谢[@ls0428](https://gitee.com/ls0428)
+- 🎯 优化 [SvgIcon 对下载的 Svg 图像设置颜色无效 #I59ND0](https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0)),感谢[@elus_z](https://gitee.com/elus_z)
+- 🎯 优化 `/src/utils/toolsValidate.ts` 工具类
+- 🐞 修复 [布局切换,TagsView 显示的 tab 会多一个出来 #I58WGM](https://gitee.com/lyt-top/vue-next-admin/issues/I58WGM),感谢[@lg_boy](https://gitee.com/lg_boy)
+- 🐞 修复 [如果设置顶部面包屑导航开启图标 isBreadcrumbIcon=true 后,样式有点问题 如果不开启就是正常的 #I58VB8](https://gitee.com/lyt-top/vue-next-admin/issues/I58VB8)
+- 🐞 修复 地址栏路由地址输入错误时,返回首页后,再次输入路由地址错误时,不跳转 404 问题
+- 🐞 修复 [2.1.0 版本的图标选择组件多次点击后功能失效 #I590TH](https://gitee.com/lyt-top/vue-next-admin/issues/I590TH),感谢[@quber](https://gitee.com/quber)
+
## 2.1.0
`2022.04.18`
diff --git a/package-lock.json b/package-lock.json
index e17a3e8f..05ee5335 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,23 +1,23 @@
{
"name": "vue-next-admin",
- "version": "2.1.0",
+ "version": "2.1.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "vue-next-admin",
- "version": "2.1.0",
+ "version": "2.1.1",
"license": "MIT",
"dependencies": {
"@element-plus/icons-vue": "^1.1.4",
- "@wangeditor/editor": "^5.0.1",
+ "@wangeditor/editor": "^5.1.0",
"axios": "^0.27.2",
"countup.js": "^2.2.0",
"cropperjs": "^1.5.12",
"echarts": "^5.3.2",
"echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.0.0",
- "element-plus": "^2.2.1",
+ "element-plus": "^2.2.2",
"js-cookie": "^3.0.1",
"jsplumb": "^2.15.6",
"mitt": "^3.0.0",
@@ -28,7 +28,7 @@
"screenfull": "^6.0.1",
"sortablejs": "^1.15.0",
"splitpanes": "^3.1.1",
- "vue": "^3.2.35",
+ "vue": "^3.2.36",
"vue-clipboard3": "^2.0.0",
"vue-grid-layout": "^3.0.0-beta1",
"vue-i18n": "^9.1.10",
@@ -38,17 +38,17 @@
"@types/node": "^17.0.35",
"@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.13.0",
- "@typescript-eslint/eslint-plugin": "^5.25.0",
- "@typescript-eslint/parser": "^5.25.0",
+ "@typescript-eslint/eslint-plugin": "^5.26.0",
+ "@typescript-eslint/parser": "^5.26.0",
"@vitejs/plugin-vue": "^2.3.3",
- "@vue/compiler-sfc": "^3.2.35",
+ "@vue/compiler-sfc": "^3.2.36",
"dotenv": "^16.0.1",
"eslint": "^8.16.0",
"eslint-plugin-vue": "^9.0.1",
"prettier": "^2.6.2",
"sass": "^1.52.1",
"sass-loader": "^13.0.0",
- "typescript": "^4.6.4",
+ "typescript": "^4.7.2",
"vite": "^2.9.9",
"vue-eslint-parser": "^9.0.2"
},
@@ -524,14 +524,14 @@
"dev": true
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.25.0.tgz",
- "integrity": "sha512-icYrFnUzvm+LhW0QeJNKkezBu6tJs9p/53dpPLFH8zoM9w1tfaKzVurkPotEpAqQ8Vf8uaFyL5jHd0Vs6Z0ZQg==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.26.0.tgz",
+ "integrity": "sha512-oGCmo0PqnRZZndr+KwvvAUvD3kNE4AfyoGCwOZpoCncSh4MVD06JTE8XQa2u9u+NX5CsyZMBTEc2C72zx38eYA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.25.0",
- "@typescript-eslint/type-utils": "5.25.0",
- "@typescript-eslint/utils": "5.25.0",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/type-utils": "5.26.0",
+ "@typescript-eslint/utils": "5.26.0",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -557,14 +557,14 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.25.0.tgz",
- "integrity": "sha512-r3hwrOWYbNKP1nTcIw/aZoH+8bBnh/Lh1iDHoFpyG4DnCpvEdctrSl6LOo19fZbzypjQMHdajolxs6VpYoChgA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.26.0.tgz",
+ "integrity": "sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.25.0",
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/typescript-estree": "5.25.0",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/typescript-estree": "5.26.0",
"debug": "^4.3.4"
},
"engines": {
@@ -584,13 +584,13 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.25.0.tgz",
- "integrity": "sha512-p4SKTFWj+2VpreUZ5xMQsBMDdQ9XdRvODKXN4EksyBjFp2YvQdLkyHqOffakYZPuWJUDNu3jVXtHALDyTv3cww==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz",
+ "integrity": "sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/visitor-keys": "5.25.0"
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/visitor-keys": "5.26.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -601,12 +601,12 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.25.0.tgz",
- "integrity": "sha512-B6nb3GK3Gv1Rsb2pqalebe/RyQoyG/WDy9yhj8EE0Ikds4Xa8RR28nHz+wlt4tMZk5bnAr0f3oC8TuDAd5CPrw==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.26.0.tgz",
+ "integrity": "sha512-7ccbUVWGLmcRDSA1+ADkDBl5fP87EJt0fnijsMFTVHXKGduYMgienC/i3QwoVhDADUAPoytgjbZbCOMj4TY55A==",
"dev": true,
"dependencies": {
- "@typescript-eslint/utils": "5.25.0",
+ "@typescript-eslint/utils": "5.26.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -627,9 +627,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.25.0.tgz",
- "integrity": "sha512-7fWqfxr0KNHj75PFqlGX24gWjdV/FDBABXL5dyvBOWHpACGyveok8Uj4ipPX/1fGU63fBkzSIycEje4XsOxUFA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.26.0.tgz",
+ "integrity": "sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -640,13 +640,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.25.0.tgz",
- "integrity": "sha512-MrPODKDych/oWs/71LCnuO7NyR681HuBly2uLnX3r5i4ME7q/yBqC4hW33kmxtuauLTM0OuBOhhkFaxCCOjEEw==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz",
+ "integrity": "sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/visitor-keys": "5.25.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/visitor-keys": "5.26.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -667,15 +667,15 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.25.0.tgz",
- "integrity": "sha512-qNC9bhnz/n9Kba3yI6HQgQdBLuxDoMgdjzdhSInZh6NaDnFpTUlwNGxplUFWfY260Ya0TRPvkg9dd57qxrJI9g==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz",
+ "integrity": "sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.25.0",
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/typescript-estree": "5.25.0",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/typescript-estree": "5.26.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -691,12 +691,12 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.25.0.tgz",
- "integrity": "sha512-yd26vFgMsC4h2dgX4+LR+GeicSKIfUvZREFLf3DDjZPtqgLx5AJZr6TetMNwFP9hcKreTTeztQYBTNbNoOycwA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz",
+ "integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.25.0",
+ "@typescript-eslint/types": "5.26.0",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -771,36 +771,36 @@
}
},
"node_modules/@vue/compiler-core": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.35.tgz",
- "integrity": "sha512-1Mtmh8ceVUoUsn/PME5oM+Dus648rCeV/fBaZ4ERLFbTHBJXj6QmDPrSn9mfEyPDXE0RYIwyJNn884NdWK+Yiw==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz",
+ "integrity": "sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==",
"dependencies": {
"@babel/parser": "^7.16.4",
- "@vue/shared": "3.2.35",
+ "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"node_modules/@vue/compiler-dom": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.35.tgz",
- "integrity": "sha512-I4bXB9MkRSTJ3gVXRQ4iaYJgABZGew+K/CCBoAh9fdLaeY7A7uUlS5nWGOlICSVfOH0/xk4QlcXeGZYCJkEleA==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz",
+ "integrity": "sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==",
"dependencies": {
- "@vue/compiler-core": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-core": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"node_modules/@vue/compiler-sfc": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.35.tgz",
- "integrity": "sha512-2wKQtnuHfwBFc7uV2Cmtms3Cc7u/u6kKJI3F+i0A+9xnuahK39cCMNJKHzI9x93Xai+uft64fDc5JSh8zDQBQA==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz",
+ "integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==",
"dependencies": {
"@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.35",
- "@vue/compiler-dom": "3.2.35",
- "@vue/compiler-ssr": "3.2.35",
- "@vue/reactivity-transform": "3.2.35",
- "@vue/shared": "3.2.35",
+ "@vue/compiler-core": "3.2.36",
+ "@vue/compiler-dom": "3.2.36",
+ "@vue/compiler-ssr": "3.2.36",
+ "@vue/reactivity-transform": "3.2.36",
+ "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
@@ -808,12 +808,12 @@
}
},
"node_modules/@vue/compiler-ssr": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.35.tgz",
- "integrity": "sha512-dJyqB8fZbvVQEnWl5VGxkWHTqx0ERnZXXqInFzyOX8FpTEidmQbUSmDrXidea7bZTdeg6ly94kZFGPYXT29mgQ==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz",
+ "integrity": "sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==",
"dependencies": {
- "@vue/compiler-dom": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-dom": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"node_modules/@vue/devtools-api": {
@@ -822,60 +822,60 @@
"integrity": "sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ=="
},
"node_modules/@vue/reactivity": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.35.tgz",
- "integrity": "sha512-6j9N9R1SwHVcJas4YqAzwdRS/cgmj3Z9aUert5Mv1jk5B9H9ivN/zot/fgMUbseWXigkkmX60OsfRbz49o8kCw==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.36.tgz",
+ "integrity": "sha512-c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA==",
"dependencies": {
- "@vue/shared": "3.2.35"
+ "@vue/shared": "3.2.36"
}
},
"node_modules/@vue/reactivity-transform": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.35.tgz",
- "integrity": "sha512-VjdQU4nIrgsh1iPqAdYZufWgFqdH9fIl6ttO2PCFlLsrQl7b8BcuawM6moSBLF8damBzSNcqvbvQDBhsI3fyVQ==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz",
+ "integrity": "sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==",
"dependencies": {
"@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.35",
- "@vue/shared": "3.2.35",
+ "@vue/compiler-core": "3.2.36",
+ "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
}
},
"node_modules/@vue/runtime-core": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.35.tgz",
- "integrity": "sha512-P8AeGPRGyIiYdOdvLc/7KR8VSdbUGG8Jxdx6Xlj5okEjyV9IYxeHRIQIoye85K0lZXBH4zuh1syD1mX+oZ0KqQ==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.36.tgz",
+ "integrity": "sha512-PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ==",
"dependencies": {
- "@vue/reactivity": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/reactivity": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"node_modules/@vue/runtime-dom": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.35.tgz",
- "integrity": "sha512-M5xrVJ/b0KqssjPQMdpwLp3KwzG1Tn2w/IrOptVqGY5c9fEBluIbm18AeO4Fr3YxfeyaPWm1rY8POrEso0UE3w==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.36.tgz",
+ "integrity": "sha512-gYPYblm7QXHVuBohqNRRT7Wez0f2Mx2D40rb4fleehrJU9CnkjG0phhcGEZFfGwCmHZRqBCRgbFWE98bPULqkg==",
"dependencies": {
- "@vue/runtime-core": "3.2.35",
- "@vue/shared": "3.2.35",
+ "@vue/runtime-core": "3.2.36",
+ "@vue/shared": "3.2.36",
"csstype": "^2.6.8"
}
},
"node_modules/@vue/server-renderer": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.35.tgz",
- "integrity": "sha512-ZMF8V+bZ0EIjSB7yzPEmDlxRDOIXj04iqG4Rw/H5rIuBCf0b7rNTleiOldlX5haG++zUq6uiL2AVp/A9uyz+cw==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.36.tgz",
+ "integrity": "sha512-uZE0+jfye6yYXWvAQYeHZv+f50sRryvy16uiqzk3jn8hEY8zTjI+rzlmZSGoE915k+W/Ol9XSw6vxOUD8dGkUg==",
"dependencies": {
- "@vue/compiler-ssr": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-ssr": "3.2.36",
+ "@vue/shared": "3.2.36"
},
"peerDependencies": {
- "vue": "3.2.35"
+ "vue": "3.2.36"
}
},
"node_modules/@vue/shared": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.35.tgz",
- "integrity": "sha512-/sxDqMcy0MsfQ3LQixKYDxIinDYNy1dXTsF2Am0pv0toImWabymFQ8cFmPJnPt+gh5ElKwwn7KzQcDbLHar60A=="
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz",
+ "integrity": "sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ=="
},
"node_modules/@vueuse/core": {
"version": "8.5.0",
@@ -959,9 +959,9 @@
}
},
"node_modules/@wangeditor/basic-modules": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/basic-modules/-/basic-modules-1.0.1.tgz",
- "integrity": "sha512-xgMh0f4BBVHyhaNc96b3rfJklRGEAC2brfeLRXoexnhSCcvyvaIsEuukvvPHYAYK72SCa0Zcdx6tD9O5WyLMDA==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/basic-modules/-/basic-modules-1.1.0.tgz",
+ "integrity": "sha512-Qc5U6k2s5AxG7B8Hmen9OeaqDbxfZmOvANdbI2TewV9cnyTs7wrRwaUCg2EAZLHQY1SjPiKCIrdr6lpZvMAkHw==",
"dependencies": {
"is-url": "^1.2.4"
},
@@ -989,9 +989,9 @@
}
},
"node_modules/@wangeditor/core": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/core/-/core-1.0.1.tgz",
- "integrity": "sha512-vqendw2S3sz+fiTbMRe1GWvlFC81BIbwYQM3jEdM5yoHsFDwQo0az7JrjPedUQjkA0+mYKQHkwuuJMeFN/+Ldg==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/core/-/core-1.1.0.tgz",
+ "integrity": "sha512-BC2JoXTDcbqLnWJByR0DeywTHuNV8FN99GfsDtv+yCYLUv5FJ1MRz/cVYAvSGcWAm2jaBobbIamCgpdOO7ezJg==",
"dependencies": {
"@types/event-emitter": "^0.3.3",
"event-emitter": "^0.3.5",
@@ -1018,19 +1018,19 @@
}
},
"node_modules/@wangeditor/editor": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.0.1.tgz",
- "integrity": "sha512-Z2okt5L80u+RQP8MXiR/Tnh6IAu5dewjWP3GlPpH51Qe9PaCD2OvguaC7OxwfVnr4cbPbaaSiUoO1lf8x39Ilw==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.0.tgz",
+ "integrity": "sha512-zcDe/6a4ZlD+csgGwgY2jzLqFaVPbFSyRmpz93p9fhsEMXLocTLgF5duGOg/Ii6uWG37ljw7KhZFh7SFp7lnJg==",
"dependencies": {
"@uppy/core": "^2.1.1",
"@uppy/xhr-upload": "^2.0.3",
- "@wangeditor/basic-modules": "^1.0.1",
+ "@wangeditor/basic-modules": "^1.1.0",
"@wangeditor/code-highlight": "^1.0.1",
- "@wangeditor/core": "^1.0.1",
- "@wangeditor/list-module": "^1.0.1",
- "@wangeditor/table-module": "^1.0.1",
+ "@wangeditor/core": "^1.1.0",
+ "@wangeditor/list-module": "^1.0.2",
+ "@wangeditor/table-module": "^1.1.0",
"@wangeditor/upload-image-module": "^1.0.1",
- "@wangeditor/video-module": "^1.0.1",
+ "@wangeditor/video-module": "^1.1.0",
"dom7": "^3.0.0",
"is-hotkey": "^0.2.0",
"lodash.camelcase": "^4.3.0",
@@ -1046,9 +1046,9 @@
}
},
"node_modules/@wangeditor/list-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/list-module/-/list-module-1.0.1.tgz",
- "integrity": "sha512-hlVwoXCK01eMqwwbZpSAjwHYDeZJei6mvPddcHkT5xws6r4wlT+8Xv3iBiAuutfdPbJTlXBRIWmNDFqN5aRtQg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@wangeditor/list-module/-/list-module-1.0.2.tgz",
+ "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==",
"peerDependencies": {
"@wangeditor/core": "1.x",
"dom7": "^3.0.0",
@@ -1057,13 +1057,14 @@
}
},
"node_modules/@wangeditor/table-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/table-module/-/table-module-1.0.1.tgz",
- "integrity": "sha512-55U77WoypdUsMY35OJ/FN8VfKM7tBd6JCSCr9EE8Z78nfzFxhJcLPasWkFXqPklleDZ+pcIkfiPojn2DdNRy5w==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/table-module/-/table-module-1.1.0.tgz",
+ "integrity": "sha512-QpjCXSzsXcsR0pEI5Pu28e8aYh9+lHcVV4TTmGV6lRGE/etQF3PHUZNGUlfhkCgmGPq+E7n/Whb4RpAM3PJVhw==",
"peerDependencies": {
"@wangeditor/core": "1.x",
"dom7": "^3.0.0",
"lodash.isequal": "^4.5.0",
+ "lodash.throttle": "^4.1.1",
"nanoid": "^3.2.0",
"slate": "^0.72.0",
"snabbdom": "^3.1.0"
@@ -1085,9 +1086,9 @@
}
},
"node_modules/@wangeditor/video-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/video-module/-/video-module-1.0.1.tgz",
- "integrity": "sha512-SiMWfigMK8V5t1PuwLEJy6nDgivpyJqicSZZNwqypsASQviNRGBPpAubkd/SjcMlFvUplsTrqjT6KnlMR54iPQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/video-module/-/video-module-1.1.0.tgz",
+ "integrity": "sha512-VR6x7Vk9ebvXtxCPwobiNiTGZGgqEzCVc6ViWlNH3v4jlDIeo/s7N7OCgpvELR7X/X7GHecBu7wySDkHIskB5w==",
"peerDependencies": {
"@uppy/core": "^2.1.4",
"@uppy/xhr-upload": "^2.0.7",
@@ -1808,9 +1809,9 @@
"peer": true
},
"node_modules/element-plus": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.1.tgz",
- "integrity": "sha512-+U3Rq6S2lrzgFWlO1IvqBRtWuOGfyA84OSJOTDC8DHG6XkbNE507Thueb+9Ghk8eIqjGtpvje5hEQRWOJ85+pA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.2.tgz",
+ "integrity": "sha512-yGcj2Ayb0jZO1WbI51tHJ4efhlfWKlBqqGtWbzhq+tcpfaKzJZN+IHRouuFasqn0ZV3tWCDu1jggDR1+9y7XfQ==",
"dependencies": {
"@ctrl/tinycolor": "^3.4.1",
"@element-plus/icons-vue": "^1.1.4",
@@ -4164,9 +4165,9 @@
}
},
"node_modules/typescript": {
- "version": "4.6.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
- "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+ "version": "4.7.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
+ "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
"devOptional": true,
"bin": {
"tsc": "bin/tsc",
@@ -4235,15 +4236,15 @@
}
},
"node_modules/vue": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.35.tgz",
- "integrity": "sha512-mc/15B0Wjd/4JMMGOcXUQAeXfjyg8MImA2EVZucNdyDPJe1nXhMNbYXOEVPEGfk/mCeyszCzl44dSAhHhQVH8g==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.36.tgz",
+ "integrity": "sha512-5yTXmrE6gW8IQgttzHW5bfBiFA6mx35ZXHjGLDmKYzW6MMmYvCwuKybANRepwkMYeXw2v1buGg3/lPICY5YlZw==",
"dependencies": {
- "@vue/compiler-dom": "3.2.35",
- "@vue/compiler-sfc": "3.2.35",
- "@vue/runtime-dom": "3.2.35",
- "@vue/server-renderer": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-dom": "3.2.36",
+ "@vue/compiler-sfc": "3.2.36",
+ "@vue/runtime-dom": "3.2.36",
+ "@vue/server-renderer": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"node_modules/vue-clipboard3": {
@@ -4868,14 +4869,14 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.25.0.tgz",
- "integrity": "sha512-icYrFnUzvm+LhW0QeJNKkezBu6tJs9p/53dpPLFH8zoM9w1tfaKzVurkPotEpAqQ8Vf8uaFyL5jHd0Vs6Z0ZQg==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.26.0.tgz",
+ "integrity": "sha512-oGCmo0PqnRZZndr+KwvvAUvD3kNE4AfyoGCwOZpoCncSh4MVD06JTE8XQa2u9u+NX5CsyZMBTEc2C72zx38eYA==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.25.0",
- "@typescript-eslint/type-utils": "5.25.0",
- "@typescript-eslint/utils": "5.25.0",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/type-utils": "5.26.0",
+ "@typescript-eslint/utils": "5.26.0",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -4885,52 +4886,52 @@
}
},
"@typescript-eslint/parser": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.25.0.tgz",
- "integrity": "sha512-r3hwrOWYbNKP1nTcIw/aZoH+8bBnh/Lh1iDHoFpyG4DnCpvEdctrSl6LOo19fZbzypjQMHdajolxs6VpYoChgA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.26.0.tgz",
+ "integrity": "sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.25.0",
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/typescript-estree": "5.25.0",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/typescript-estree": "5.26.0",
"debug": "^4.3.4"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.25.0.tgz",
- "integrity": "sha512-p4SKTFWj+2VpreUZ5xMQsBMDdQ9XdRvODKXN4EksyBjFp2YvQdLkyHqOffakYZPuWJUDNu3jVXtHALDyTv3cww==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz",
+ "integrity": "sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/visitor-keys": "5.25.0"
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/visitor-keys": "5.26.0"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.25.0.tgz",
- "integrity": "sha512-B6nb3GK3Gv1Rsb2pqalebe/RyQoyG/WDy9yhj8EE0Ikds4Xa8RR28nHz+wlt4tMZk5bnAr0f3oC8TuDAd5CPrw==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.26.0.tgz",
+ "integrity": "sha512-7ccbUVWGLmcRDSA1+ADkDBl5fP87EJt0fnijsMFTVHXKGduYMgienC/i3QwoVhDADUAPoytgjbZbCOMj4TY55A==",
"dev": true,
"requires": {
- "@typescript-eslint/utils": "5.25.0",
+ "@typescript-eslint/utils": "5.26.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.25.0.tgz",
- "integrity": "sha512-7fWqfxr0KNHj75PFqlGX24gWjdV/FDBABXL5dyvBOWHpACGyveok8Uj4ipPX/1fGU63fBkzSIycEje4XsOxUFA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.26.0.tgz",
+ "integrity": "sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.25.0.tgz",
- "integrity": "sha512-MrPODKDych/oWs/71LCnuO7NyR681HuBly2uLnX3r5i4ME7q/yBqC4hW33kmxtuauLTM0OuBOhhkFaxCCOjEEw==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz",
+ "integrity": "sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/visitor-keys": "5.25.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/visitor-keys": "5.26.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -4939,26 +4940,26 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.25.0.tgz",
- "integrity": "sha512-qNC9bhnz/n9Kba3yI6HQgQdBLuxDoMgdjzdhSInZh6NaDnFpTUlwNGxplUFWfY260Ya0TRPvkg9dd57qxrJI9g==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz",
+ "integrity": "sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.25.0",
- "@typescript-eslint/types": "5.25.0",
- "@typescript-eslint/typescript-estree": "5.25.0",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/typescript-estree": "5.26.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.25.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.25.0.tgz",
- "integrity": "sha512-yd26vFgMsC4h2dgX4+LR+GeicSKIfUvZREFLf3DDjZPtqgLx5AJZr6TetMNwFP9hcKreTTeztQYBTNbNoOycwA==",
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz",
+ "integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.25.0",
+ "@typescript-eslint/types": "5.26.0",
"eslint-visitor-keys": "^3.3.0"
}
},
@@ -5017,36 +5018,36 @@
"requires": {}
},
"@vue/compiler-core": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.35.tgz",
- "integrity": "sha512-1Mtmh8ceVUoUsn/PME5oM+Dus648rCeV/fBaZ4ERLFbTHBJXj6QmDPrSn9mfEyPDXE0RYIwyJNn884NdWK+Yiw==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz",
+ "integrity": "sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==",
"requires": {
"@babel/parser": "^7.16.4",
- "@vue/shared": "3.2.35",
+ "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/compiler-dom": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.35.tgz",
- "integrity": "sha512-I4bXB9MkRSTJ3gVXRQ4iaYJgABZGew+K/CCBoAh9fdLaeY7A7uUlS5nWGOlICSVfOH0/xk4QlcXeGZYCJkEleA==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz",
+ "integrity": "sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==",
"requires": {
- "@vue/compiler-core": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-core": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"@vue/compiler-sfc": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.35.tgz",
- "integrity": "sha512-2wKQtnuHfwBFc7uV2Cmtms3Cc7u/u6kKJI3F+i0A+9xnuahK39cCMNJKHzI9x93Xai+uft64fDc5JSh8zDQBQA==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz",
+ "integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==",
"requires": {
"@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.35",
- "@vue/compiler-dom": "3.2.35",
- "@vue/compiler-ssr": "3.2.35",
- "@vue/reactivity-transform": "3.2.35",
- "@vue/shared": "3.2.35",
+ "@vue/compiler-core": "3.2.36",
+ "@vue/compiler-dom": "3.2.36",
+ "@vue/compiler-ssr": "3.2.36",
+ "@vue/reactivity-transform": "3.2.36",
+ "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
@@ -5054,12 +5055,12 @@
}
},
"@vue/compiler-ssr": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.35.tgz",
- "integrity": "sha512-dJyqB8fZbvVQEnWl5VGxkWHTqx0ERnZXXqInFzyOX8FpTEidmQbUSmDrXidea7bZTdeg6ly94kZFGPYXT29mgQ==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz",
+ "integrity": "sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==",
"requires": {
- "@vue/compiler-dom": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-dom": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"@vue/devtools-api": {
@@ -5068,57 +5069,57 @@
"integrity": "sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ=="
},
"@vue/reactivity": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.35.tgz",
- "integrity": "sha512-6j9N9R1SwHVcJas4YqAzwdRS/cgmj3Z9aUert5Mv1jk5B9H9ivN/zot/fgMUbseWXigkkmX60OsfRbz49o8kCw==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.36.tgz",
+ "integrity": "sha512-c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA==",
"requires": {
- "@vue/shared": "3.2.35"
+ "@vue/shared": "3.2.36"
}
},
"@vue/reactivity-transform": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.35.tgz",
- "integrity": "sha512-VjdQU4nIrgsh1iPqAdYZufWgFqdH9fIl6ttO2PCFlLsrQl7b8BcuawM6moSBLF8damBzSNcqvbvQDBhsI3fyVQ==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz",
+ "integrity": "sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==",
"requires": {
"@babel/parser": "^7.16.4",
- "@vue/compiler-core": "3.2.35",
- "@vue/shared": "3.2.35",
+ "@vue/compiler-core": "3.2.36",
+ "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
}
},
"@vue/runtime-core": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.35.tgz",
- "integrity": "sha512-P8AeGPRGyIiYdOdvLc/7KR8VSdbUGG8Jxdx6Xlj5okEjyV9IYxeHRIQIoye85K0lZXBH4zuh1syD1mX+oZ0KqQ==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.36.tgz",
+ "integrity": "sha512-PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ==",
"requires": {
- "@vue/reactivity": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/reactivity": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"@vue/runtime-dom": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.35.tgz",
- "integrity": "sha512-M5xrVJ/b0KqssjPQMdpwLp3KwzG1Tn2w/IrOptVqGY5c9fEBluIbm18AeO4Fr3YxfeyaPWm1rY8POrEso0UE3w==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.36.tgz",
+ "integrity": "sha512-gYPYblm7QXHVuBohqNRRT7Wez0f2Mx2D40rb4fleehrJU9CnkjG0phhcGEZFfGwCmHZRqBCRgbFWE98bPULqkg==",
"requires": {
- "@vue/runtime-core": "3.2.35",
- "@vue/shared": "3.2.35",
+ "@vue/runtime-core": "3.2.36",
+ "@vue/shared": "3.2.36",
"csstype": "^2.6.8"
}
},
"@vue/server-renderer": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.35.tgz",
- "integrity": "sha512-ZMF8V+bZ0EIjSB7yzPEmDlxRDOIXj04iqG4Rw/H5rIuBCf0b7rNTleiOldlX5haG++zUq6uiL2AVp/A9uyz+cw==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.36.tgz",
+ "integrity": "sha512-uZE0+jfye6yYXWvAQYeHZv+f50sRryvy16uiqzk3jn8hEY8zTjI+rzlmZSGoE915k+W/Ol9XSw6vxOUD8dGkUg==",
"requires": {
- "@vue/compiler-ssr": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-ssr": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"@vue/shared": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.35.tgz",
- "integrity": "sha512-/sxDqMcy0MsfQ3LQixKYDxIinDYNy1dXTsF2Am0pv0toImWabymFQ8cFmPJnPt+gh5ElKwwn7KzQcDbLHar60A=="
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz",
+ "integrity": "sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ=="
},
"@vueuse/core": {
"version": "8.5.0",
@@ -5152,9 +5153,9 @@
"integrity": "sha512-WxsD+Cd+bn+HcjpY6Dl9FJ8ywTRTT9pTwk3bCQpzEhXVYAyNczKDSahk50fCfIJKeWHhyI4B2+/ZEOxQAkUr0g=="
},
"@wangeditor/basic-modules": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/basic-modules/-/basic-modules-1.0.1.tgz",
- "integrity": "sha512-xgMh0f4BBVHyhaNc96b3rfJklRGEAC2brfeLRXoexnhSCcvyvaIsEuukvvPHYAYK72SCa0Zcdx6tD9O5WyLMDA==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/basic-modules/-/basic-modules-1.1.0.tgz",
+ "integrity": "sha512-Qc5U6k2s5AxG7B8Hmen9OeaqDbxfZmOvANdbI2TewV9cnyTs7wrRwaUCg2EAZLHQY1SjPiKCIrdr6lpZvMAkHw==",
"requires": {
"is-url": "^1.2.4"
}
@@ -5168,9 +5169,9 @@
}
},
"@wangeditor/core": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/core/-/core-1.0.1.tgz",
- "integrity": "sha512-vqendw2S3sz+fiTbMRe1GWvlFC81BIbwYQM3jEdM5yoHsFDwQo0az7JrjPedUQjkA0+mYKQHkwuuJMeFN/+Ldg==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/core/-/core-1.1.0.tgz",
+ "integrity": "sha512-BC2JoXTDcbqLnWJByR0DeywTHuNV8FN99GfsDtv+yCYLUv5FJ1MRz/cVYAvSGcWAm2jaBobbIamCgpdOO7ezJg==",
"requires": {
"@types/event-emitter": "^0.3.3",
"event-emitter": "^0.3.5",
@@ -5181,19 +5182,19 @@
}
},
"@wangeditor/editor": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.0.1.tgz",
- "integrity": "sha512-Z2okt5L80u+RQP8MXiR/Tnh6IAu5dewjWP3GlPpH51Qe9PaCD2OvguaC7OxwfVnr4cbPbaaSiUoO1lf8x39Ilw==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.0.tgz",
+ "integrity": "sha512-zcDe/6a4ZlD+csgGwgY2jzLqFaVPbFSyRmpz93p9fhsEMXLocTLgF5duGOg/Ii6uWG37ljw7KhZFh7SFp7lnJg==",
"requires": {
"@uppy/core": "^2.1.1",
"@uppy/xhr-upload": "^2.0.3",
- "@wangeditor/basic-modules": "^1.0.1",
+ "@wangeditor/basic-modules": "^1.1.0",
"@wangeditor/code-highlight": "^1.0.1",
- "@wangeditor/core": "^1.0.1",
- "@wangeditor/list-module": "^1.0.1",
- "@wangeditor/table-module": "^1.0.1",
+ "@wangeditor/core": "^1.1.0",
+ "@wangeditor/list-module": "^1.0.2",
+ "@wangeditor/table-module": "^1.1.0",
"@wangeditor/upload-image-module": "^1.0.1",
- "@wangeditor/video-module": "^1.0.1",
+ "@wangeditor/video-module": "^1.1.0",
"dom7": "^3.0.0",
"is-hotkey": "^0.2.0",
"lodash.camelcase": "^4.3.0",
@@ -5209,15 +5210,15 @@
}
},
"@wangeditor/list-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/list-module/-/list-module-1.0.1.tgz",
- "integrity": "sha512-hlVwoXCK01eMqwwbZpSAjwHYDeZJei6mvPddcHkT5xws6r4wlT+8Xv3iBiAuutfdPbJTlXBRIWmNDFqN5aRtQg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@wangeditor/list-module/-/list-module-1.0.2.tgz",
+ "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==",
"requires": {}
},
"@wangeditor/table-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/table-module/-/table-module-1.0.1.tgz",
- "integrity": "sha512-55U77WoypdUsMY35OJ/FN8VfKM7tBd6JCSCr9EE8Z78nfzFxhJcLPasWkFXqPklleDZ+pcIkfiPojn2DdNRy5w==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/table-module/-/table-module-1.1.0.tgz",
+ "integrity": "sha512-QpjCXSzsXcsR0pEI5Pu28e8aYh9+lHcVV4TTmGV6lRGE/etQF3PHUZNGUlfhkCgmGPq+E7n/Whb4RpAM3PJVhw==",
"requires": {}
},
"@wangeditor/upload-image-module": {
@@ -5227,9 +5228,9 @@
"requires": {}
},
"@wangeditor/video-module": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@wangeditor/video-module/-/video-module-1.0.1.tgz",
- "integrity": "sha512-SiMWfigMK8V5t1PuwLEJy6nDgivpyJqicSZZNwqypsASQviNRGBPpAubkd/SjcMlFvUplsTrqjT6KnlMR54iPQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@wangeditor/video-module/-/video-module-1.1.0.tgz",
+ "integrity": "sha512-VR6x7Vk9ebvXtxCPwobiNiTGZGgqEzCVc6ViWlNH3v4jlDIeo/s7N7OCgpvELR7X/X7GHecBu7wySDkHIskB5w==",
"requires": {}
},
"@webassemblyjs/ast": {
@@ -5815,9 +5816,9 @@
"peer": true
},
"element-plus": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.1.tgz",
- "integrity": "sha512-+U3Rq6S2lrzgFWlO1IvqBRtWuOGfyA84OSJOTDC8DHG6XkbNE507Thueb+9Ghk8eIqjGtpvje5hEQRWOJ85+pA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.2.tgz",
+ "integrity": "sha512-yGcj2Ayb0jZO1WbI51tHJ4efhlfWKlBqqGtWbzhq+tcpfaKzJZN+IHRouuFasqn0ZV3tWCDu1jggDR1+9y7XfQ==",
"requires": {
"@ctrl/tinycolor": "^3.4.1",
"@element-plus/icons-vue": "^1.1.4",
@@ -7447,9 +7448,9 @@
"dev": true
},
"typescript": {
- "version": "4.6.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
- "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
+ "version": "4.7.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
+ "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
"devOptional": true
},
"uri-js": {
@@ -7487,15 +7488,15 @@
}
},
"vue": {
- "version": "3.2.35",
- "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.35.tgz",
- "integrity": "sha512-mc/15B0Wjd/4JMMGOcXUQAeXfjyg8MImA2EVZucNdyDPJe1nXhMNbYXOEVPEGfk/mCeyszCzl44dSAhHhQVH8g==",
+ "version": "3.2.36",
+ "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.36.tgz",
+ "integrity": "sha512-5yTXmrE6gW8IQgttzHW5bfBiFA6mx35ZXHjGLDmKYzW6MMmYvCwuKybANRepwkMYeXw2v1buGg3/lPICY5YlZw==",
"requires": {
- "@vue/compiler-dom": "3.2.35",
- "@vue/compiler-sfc": "3.2.35",
- "@vue/runtime-dom": "3.2.35",
- "@vue/server-renderer": "3.2.35",
- "@vue/shared": "3.2.35"
+ "@vue/compiler-dom": "3.2.36",
+ "@vue/compiler-sfc": "3.2.36",
+ "@vue/runtime-dom": "3.2.36",
+ "@vue/server-renderer": "3.2.36",
+ "@vue/shared": "3.2.36"
}
},
"vue-clipboard3": {
diff --git a/package.json b/package.json
index dfa0943e..0dbbc97b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vue-next-admin",
- "version": "2.1.0",
+ "version": "2.1.1",
"description": "vue3 vite next admin template",
"author": "lyt_20201208",
"license": "MIT",
@@ -11,14 +11,14 @@
},
"dependencies": {
"@element-plus/icons-vue": "^1.1.4",
- "@wangeditor/editor": "^5.0.1",
+ "@wangeditor/editor": "^5.1.0",
"axios": "^0.27.2",
"countup.js": "^2.2.0",
"cropperjs": "^1.5.12",
"echarts": "^5.3.2",
"echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.0.0",
- "element-plus": "^2.2.1",
+ "element-plus": "^2.2.2",
"js-cookie": "^3.0.1",
"jsplumb": "^2.15.6",
"mitt": "^3.0.0",
@@ -29,7 +29,7 @@
"screenfull": "^6.0.1",
"sortablejs": "^1.15.0",
"splitpanes": "^3.1.1",
- "vue": "^3.2.35",
+ "vue": "^3.2.36",
"vue-clipboard3": "^2.0.0",
"vue-grid-layout": "^3.0.0-beta1",
"vue-i18n": "^9.1.10",
@@ -39,17 +39,17 @@
"@types/node": "^17.0.35",
"@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.13.0",
- "@typescript-eslint/eslint-plugin": "^5.25.0",
- "@typescript-eslint/parser": "^5.25.0",
+ "@typescript-eslint/eslint-plugin": "^5.26.0",
+ "@typescript-eslint/parser": "^5.26.0",
"@vitejs/plugin-vue": "^2.3.3",
- "@vue/compiler-sfc": "^3.2.35",
+ "@vue/compiler-sfc": "^3.2.36",
"dotenv": "^16.0.1",
"eslint": "^8.16.0",
"eslint-plugin-vue": "^9.0.1",
"prettier": "^2.6.2",
"sass": "^1.52.1",
"sass-loader": "^13.0.0",
- "typescript": "^4.6.4",
+ "typescript": "^4.7.2",
"vite": "^2.9.9",
"vue-eslint-parser": "^9.0.2"
},
diff --git a/src/components/iconSelector/index.vue b/src/components/iconSelector/index.vue
index 6395a46d..07de7867 100644
--- a/src/components/iconSelector/index.vue
+++ b/src/components/iconSelector/index.vue
@@ -1,6 +1,13 @@
-
+
{
@@ -137,7 +143,7 @@ export default defineComponent({
};
// 处理 icon 双向绑定数值回显
const initModeValueEcho = () => {
- if (props.modelValue === '') return false;
+ if (props.modelValue === '') return ((state.fontIconPlaceholder) = props.placeholder);
(state.fontIconPlaceholder) = props.modelValue;
(state.fontIconPrefix) = props.modelValue;
};
@@ -191,8 +197,6 @@ export default defineComponent({
state.fontIconPlaceholder = props.placeholder;
// 初始化双向绑定回显
initModeValueEcho();
- // 切换时,滚动条置顶。感兴趣可以使用 keep-alive 进行缓存
- selectorScrollbarRef.value.wrap$.scrollTop = 0;
};
// 图标点击切换
const onIconChange = (type: string) => {
@@ -212,14 +216,18 @@ export default defineComponent({
emit('clear', state.fontIconPrefix);
emit('update:modelValue', state.fontIconPrefix);
};
+ // 监听 Popover 打开,用于双向绑定值回显
+ const onPopoverShow = () => {
+ initModeValueEcho();
+ initFontIconTypeEcho();
+ };
// 页面加载时
onMounted(() => {
- // 判断默认进来是什么类型图标,进行 tab 回显
- if (props.type === 'all') initFontIconTypeEcho();
- else onIconChange(props.type);
+ initModeValueEcho();
initResize();
getInputWidth();
});
+
// 监听双向绑定 modelValue 的变化
watch(
() => props.modelValue,
@@ -236,6 +244,7 @@ export default defineComponent({
onClearFontIcon,
onIconFocus,
onIconBlur,
+ onPopoverShow,
...toRefs(state),
};
},
diff --git a/src/components/svgIcon/index.vue b/src/components/svgIcon/index.vue
index 74b101a8..1fab298e 100644
--- a/src/components/svgIcon/index.vue
+++ b/src/components/svgIcon/index.vue
@@ -2,7 +2,9 @@
-
+
+
+
@@ -47,15 +49,24 @@ export default defineComponent({
return `font-size: ${props.size}px;color: ${props.color};`;
});
// 设置图片样式
- const setIconImgStyle = computed(() => {
- return `width: ${props.size}px;height: ${props.size}px`;
+ const setIconImgOutStyle = computed(() => {
+ return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
+ });
+ // 设置图片样式
+ // https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0
+ const setIconSvgInsStyle = computed(() => {
+ const filterStyle: string[] = [];
+ const compatibles: string[] = ['-webkit', '-ms', '-o', '-moz'];
+ compatibles.forEach((j) => filterStyle.push(`${j}-filter: drop-shadow(${props.color} 30px 0);`));
+ return `width: ${props.size}px;height: ${props.size}px;position: relative;left: -${props.size}px;${filterStyle.join('')}`;
});
return {
getIconName,
isShowIconSvg,
isShowIconImg,
setIconSvgStyle,
- setIconImgStyle,
+ setIconImgOutStyle,
+ setIconSvgInsStyle,
};
},
});
diff --git a/src/layout/navBars/breadcrumb/breadcrumb.vue b/src/layout/navBars/breadcrumb/breadcrumb.vue
index 2808b0f9..541a8416 100644
--- a/src/layout/navBars/breadcrumb/breadcrumb.vue
+++ b/src/layout/navBars/breadcrumb/breadcrumb.vue
@@ -100,8 +100,8 @@ export default defineComponent({
state.routeSplitFirst = `/${state.routeSplit[0]}`;
state.routeSplitIndex = 1;
getBreadcrumbList(routesList.value);
- if (route.name === 'home') state.breadcrumbList.shift();
- state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(route);
+ if (route.name === 'home' || (route.name === 'notFound' && state.breadcrumbList.length > 1)) state.breadcrumbList.shift();
+ if (state.breadcrumbList.length > 0) state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(route);
};
// 页面加载时
onMounted(() => {
@@ -140,6 +140,7 @@ export default defineComponent({
}
}
.layout-navbars-breadcrumb-span {
+ display: flex;
opacity: 0.7;
color: var(--next-bg-topBarColor);
}
diff --git a/src/layout/navBars/tagsView/tagsView.vue b/src/layout/navBars/tagsView/tagsView.vue
index 53cb33fc..67e1b579 100644
--- a/src/layout/navBars/tagsView/tagsView.vue
+++ b/src/layout/navBars/tagsView/tagsView.vue
@@ -205,8 +205,8 @@ export default defineComponent({
if (findItem.meta.isLink && !findItem.meta.isIframe) return false;
to.meta.isDynamic ? (findItem.params = to.params) : (findItem.query = to.query);
findItem.url = setTagsViewHighlight(findItem);
- await storesKeepALiveNames.addCachedView(findItem);
state.tagsViewList.push({ ...findItem });
+ await storesKeepALiveNames.addCachedView(findItem);
addBrowserSetSession(state.tagsViewList);
}
};
diff --git a/src/layout/routerView/parent.vue b/src/layout/routerView/parent.vue
index c91892d4..d4eb0683 100644
--- a/src/layout/routerView/parent.vue
+++ b/src/layout/routerView/parent.vue
@@ -16,6 +16,7 @@ import { useRoute } from 'vue-router';
import { storeToRefs } from 'pinia';
import { useKeepALiveNames } from '/@/stores/keepAliveNames';
import { useThemeConfig } from '/@/stores/themeConfig';
+import { Session } from '/@/utils/storage';
// 定义接口来定义对象的类型
interface ParentViewState {
@@ -46,6 +47,8 @@ export default defineComponent({
});
// 页面加载前,处理缓存,页面刷新时路由缓存处理
onBeforeMount(() => {
+ // https://gitee.com/lyt-top/vue-next-admin/issues/I58U75
+ if (themeConfig.value.isCacheTagsView) cachedViews.value = Session.get('tagsViewList').map((item: any) => item.name);
state.keepAliveNameList = keepAliveNames.value;
proxy.mittBus.on('onTagsViewRefreshRouterView', (fullPath: string) => {
state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name);
diff --git a/src/theme/dark.scss b/src/theme/dark.scss
index cf7c9927..c922da12 100644
--- a/src/theme/dark.scss
+++ b/src/theme/dark.scss
@@ -52,10 +52,12 @@
--el-text-color-placeholder: var(--next-text-color-placeholder) !important;
--el-disabled-bg-color: var(--next-color-disabled) !important;
--el-fill-base: var(--next-color-white) !important;
+ --el-fill-colo: var(--next-color-hover-rgba) !important;
+ --el-fill-color: var(--next-color-hover-rgba) !important;
--el-fill-color-blank: var(--next-color-disabled) !important;
--el-fill-color-light: var(--next-color-hover-rgba) !important;
--el-bg-color-overlay: var(--el-color-primary-light-9) !important;
- --el-mask-color:rgb(42 42 42 / 80%);
+ --el-mask-color: rgb(42 42 42 / 80%);
// button
.el-button {
diff --git a/src/utils/toolsValidate.ts b/src/utils/toolsValidate.ts
index 4a90f2dc..f2cb9d6f 100644
--- a/src/utils/toolsValidate.ts
+++ b/src/utils/toolsValidate.ts
@@ -190,7 +190,7 @@ export function verifyNumberCnUppercase(val: any, unit = '仟佰拾亿仟佰拾
*/
export function verifyPhone(val: string) {
// false: 手机号码不正确
- if (!/^((12[0-9])|(13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\d{8}$/.test(val)) return false;
+ if (!/^((12[0-9])|(13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0|1,5-9]))\d{8}$/.test(val)) return false;
// true: 手机号码正确
else return true;
}