diff --git a/.eslintrc.js b/.eslintrc.js index 7624127..d876c74 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -56,5 +56,6 @@ module.exports = { 'no-multiple-template-root': 'off', 'no-unused-vars': 'error', 'no-v-model-argument': 'off', + 'no-case-declarations': 'off', }, }; diff --git a/CHANGELODG.md b/CHANGELODG.md new file mode 100644 index 0000000..c9f7223 --- /dev/null +++ b/CHANGELODG.md @@ -0,0 +1,11 @@ +# vue-next-admin 更新日志 + +🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支） + +## 1.0.1 + +`2021.05.31` + +- 🎉 新增 更新日志文件 `CHANGELODG.md`，以后每次更新都会在这里显示对应内容 +- 🌟 更新 依赖更新最新版本 +- 🐞 修复 分栏布局路由设置 `meta.isHide` 为 `true` 时报错问题，感谢群友@29 diff --git a/package-lock.json b/package-lock.json index e199cff..83ea7e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,14 +7,14 @@ "": { "version": "1.0.0", "dependencies": { - "@antv/g6": "^4.3.0", + "@antv/g6": "^4.3.2", "axios": "^0.21.1", "clipboard": "^2.0.8", "countup.js": "^2.0.7", "cropperjs": "^1.5.11", "echarts": "^5.1.1", "echarts-wordcloud": "^2.0.0", - "element-plus": "^1.0.2-beta.44", + "element-plus": "^1.0.2-beta.45", "mitt": "^2.1.0", "nprogress": "^0.2.0", "print-js": "^1.6.0", @@ -42,11 +42,11 @@ "@vue/compiler-sfc": "^3.0.11", "dotenv": "^10.0.0", "eslint": "^7.27.0", - "eslint-plugin-vue": "^7.9.0", + "eslint-plugin-vue": "^7.10.0", "prettier": "^2.3.0", "sass": "^1.34.0", "sass-loader": "^11.1.1", - "typescript": "^4.2.4", + "typescript": "^4.3.2", "vite": "^2.3.4", "vue-eslint-parser": "^7.6.0" } @@ -213,17 +213,17 @@ } }, "node_modules/@antv/g6": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-4.3.0.tgz", - "integrity": "sha512-aQQ8vfmP9I/u10lCQ551VzkXx7sK5nqT4I9iGTKJQi0qB1T0xIxQ695RRCrPGZgWZSeMTfQm83R+SHzhMWNyJg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-4.3.2.tgz", + "integrity": "sha512-x6gNw6q3oo+1PFCqoeA3OkLLkTyyrjHDGV7b08NuSuQPYPT4PYAyNHyBJWkjSkftgcz/E0+NdPz0uc9aAfhxCQ==", "dependencies": { - "@antv/g6-pc": "0.3.0" + "@antv/g6-pc": "0.3.2" } }, "node_modules/@antv/g6-core": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.3.1.tgz", - "integrity": "sha512-Ykt0Q0yOlE9a5Tka0hU4QNqWDhYtaBetgR3V27mWuinKtdZYfXG2bX/SzphJK+oAIkKDqxvBega5qeN23g97cw==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.3.2.tgz", + "integrity": "sha512-axRCA1lfeLZ55HJkWdu9CNOeJy/QeL1TkKwXNoUSB5DighfcnluW9Gag7yvr+X3bVkh4PiuodMQfr33fUBy2WQ==", "dependencies": { "@antv/algorithm": "^0.1.8", "@antv/dom-util": "^2.0.1", @@ -253,19 +253,19 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@antv/g6-element": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.3.0.tgz", - "integrity": "sha512-yWcXz1It3LE+cnP5o8iWEGtlWzfS9RNSbjFE+dTd3Z1Cud/O4VZAGdfBgW+p/iyjgNnuzcV0oAbQ19qU0TElTg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.3.2.tgz", + "integrity": "sha512-8gSLE4FOP1nTBHxzTYu8PCSv6E5XvbD65wBqE5PIISc5CAgw3s6P4/Jq1bYqlJyD+LZ24d94NQ+pAj0IM2AdvA==", "dependencies": { "@antv/g-base": "^0.5.1", - "@antv/g6-core": "0.3.1", + "@antv/g6-core": "0.3.2", "@antv/util": "~2.0.5" } }, "node_modules/@antv/g6-pc": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.3.0.tgz", - "integrity": "sha512-3CG1JcPfuGyIBPjrRSwJEPY0rSfOm7Rvu+bCP4YmEvqjaPyWK6LmKQPEVgAvBGrVM/UrjFkwd+rf9z1lGC2cTg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.3.2.tgz", + "integrity": "sha512-QrRDMefrk+SNH7XXgaiWoHCmj0BGBhXcJCWV1N9EItxO6gEnhDqAx5PG03/wYhLP8Wdl5KB8e0JOEddm38xZEA==", "dependencies": { "@ant-design/colors": "^4.0.5", "@antv/algorithm": "^0.1.8", @@ -275,11 +275,11 @@ "@antv/g-canvas": "^0.5.2", "@antv/g-math": "^0.1.1", "@antv/g-svg": "^0.5.1", - "@antv/g6-core": "0.3.1", - "@antv/g6-element": "0.3.0", - "@antv/g6-plugin": "0.3.0", + "@antv/g6-core": "0.3.2", + "@antv/g6-element": "0.3.2", + "@antv/g6-plugin": "0.3.2", "@antv/hierarchy": "^0.6.7", - "@antv/layout": "^0.1.12", + "@antv/layout": "^0.1.14", "@antv/matrix-util": "^3.0.4", "@antv/path-util": "^2.0.3", "@antv/util": "~2.0.5", @@ -291,15 +291,15 @@ } }, "node_modules/@antv/g6-plugin": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.3.0.tgz", - "integrity": "sha512-Pkw/qUn+JtV5ZVNCJwCMO3NtIALma0kjg/Lwe0ew9sQAm9zu9gKkAmXVYt1fIOn4j25+mHy/EAaJgn6rycx+rQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.3.2.tgz", + "integrity": "sha512-kHszgGt7b9ZBaYLi9N/pNeAbKA2ozHqCKGV47Lpvro3zOsrQLARPAhRybe2hlua+s9Idcvumok5UN0aO1b5oxw==", "dependencies": { "@antv/dom-util": "^2.0.2", "@antv/g-base": "^0.5.1", "@antv/g-canvas": "^0.5.2", "@antv/g-svg": "^0.5.2", - "@antv/g6-core": "0.3.1", + "@antv/g6-core": "0.3.2", "@antv/matrix-util": "^3.0.4", "@antv/scale": "^0.3.4", "@antv/util": "^2.0.9", @@ -315,9 +315,9 @@ } }, "node_modules/@antv/layout": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/@antv/layout/-/layout-0.1.13.tgz", - "integrity": "sha512-JDEy2P3H4B1HoQesrlysZWzKbXeY9DVQrIc6SBv/tjoZ1D617BjW8z6vYySp4CqT3FdNWg6nbuqQ/lIJLpXzaA==", + "version": "0.1.14", + "resolved": "https://registry.npmjs.org/@antv/layout/-/layout-0.1.14.tgz", + "integrity": "sha512-w4jGWybLWBn1F+ilPnZkMwUywTRIoYZXJknEdCbxmP3MBF81wQ6K9zeVjDCPgjFgGJOI0aNVz86JLooWQtPVLA==", "dependencies": { "@antv/g-webgpu": "0.5.5", "d3-force": "^2.0.1", @@ -1943,9 +1943,9 @@ "peer": true }, "node_modules/element-plus": { - "version": "1.0.2-beta.44", - "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.44.tgz", - "integrity": "sha512-PmGfOnV/66LPGSsSbaesiTnmrcQ5PnoZLr2eKRv2/lJ06xUc0AiSBiktGrds0mETgC1O/mRHswXk/Se6aJtpKQ==", + "version": "1.0.2-beta.45", + "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.45.tgz", + "integrity": "sha512-F5U+fx3Lg7fvUPVSxrDQ02HKQbD9Az0fd7SYoqUOZhTuC9PPYlLezs7Pzpme0893cki18Dh7BS1mBcWcUg9ZWQ==", "dependencies": { "@popperjs/core": "^2.4.4", "@types/lodash": "^4.14.161", @@ -2102,9 +2102,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz", - "integrity": "sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz", + "integrity": "sha512-xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A==", "dev": true, "dependencies": { "eslint-utils": "^2.1.0", @@ -4070,9 +4070,9 @@ } }, "node_modules/typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", + "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -4591,17 +4591,17 @@ } }, "@antv/g6": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-4.3.0.tgz", - "integrity": "sha512-aQQ8vfmP9I/u10lCQ551VzkXx7sK5nqT4I9iGTKJQi0qB1T0xIxQ695RRCrPGZgWZSeMTfQm83R+SHzhMWNyJg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-4.3.2.tgz", + "integrity": "sha512-x6gNw6q3oo+1PFCqoeA3OkLLkTyyrjHDGV7b08NuSuQPYPT4PYAyNHyBJWkjSkftgcz/E0+NdPz0uc9aAfhxCQ==", "requires": { - "@antv/g6-pc": "0.3.0" + "@antv/g6-pc": "0.3.2" } }, "@antv/g6-core": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.3.1.tgz", - "integrity": "sha512-Ykt0Q0yOlE9a5Tka0hU4QNqWDhYtaBetgR3V27mWuinKtdZYfXG2bX/SzphJK+oAIkKDqxvBega5qeN23g97cw==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.3.2.tgz", + "integrity": "sha512-axRCA1lfeLZ55HJkWdu9CNOeJy/QeL1TkKwXNoUSB5DighfcnluW9Gag7yvr+X3bVkh4PiuodMQfr33fUBy2WQ==", "requires": { "@antv/algorithm": "^0.1.8", "@antv/dom-util": "^2.0.1", @@ -4635,19 +4635,19 @@ } }, "@antv/g6-element": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.3.0.tgz", - "integrity": "sha512-yWcXz1It3LE+cnP5o8iWEGtlWzfS9RNSbjFE+dTd3Z1Cud/O4VZAGdfBgW+p/iyjgNnuzcV0oAbQ19qU0TElTg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.3.2.tgz", + "integrity": "sha512-8gSLE4FOP1nTBHxzTYu8PCSv6E5XvbD65wBqE5PIISc5CAgw3s6P4/Jq1bYqlJyD+LZ24d94NQ+pAj0IM2AdvA==", "requires": { "@antv/g-base": "^0.5.1", - "@antv/g6-core": "0.3.1", + "@antv/g6-core": "0.3.2", "@antv/util": "~2.0.5" } }, "@antv/g6-pc": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.3.0.tgz", - "integrity": "sha512-3CG1JcPfuGyIBPjrRSwJEPY0rSfOm7Rvu+bCP4YmEvqjaPyWK6LmKQPEVgAvBGrVM/UrjFkwd+rf9z1lGC2cTg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.3.2.tgz", + "integrity": "sha512-QrRDMefrk+SNH7XXgaiWoHCmj0BGBhXcJCWV1N9EItxO6gEnhDqAx5PG03/wYhLP8Wdl5KB8e0JOEddm38xZEA==", "requires": { "@ant-design/colors": "^4.0.5", "@antv/algorithm": "^0.1.8", @@ -4657,11 +4657,11 @@ "@antv/g-canvas": "^0.5.2", "@antv/g-math": "^0.1.1", "@antv/g-svg": "^0.5.1", - "@antv/g6-core": "0.3.1", - "@antv/g6-element": "0.3.0", - "@antv/g6-plugin": "0.3.0", + "@antv/g6-core": "0.3.2", + "@antv/g6-element": "0.3.2", + "@antv/g6-plugin": "0.3.2", "@antv/hierarchy": "^0.6.7", - "@antv/layout": "^0.1.12", + "@antv/layout": "^0.1.14", "@antv/matrix-util": "^3.0.4", "@antv/path-util": "^2.0.3", "@antv/util": "~2.0.5", @@ -4673,15 +4673,15 @@ } }, "@antv/g6-plugin": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.3.0.tgz", - "integrity": "sha512-Pkw/qUn+JtV5ZVNCJwCMO3NtIALma0kjg/Lwe0ew9sQAm9zu9gKkAmXVYt1fIOn4j25+mHy/EAaJgn6rycx+rQ==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.3.2.tgz", + "integrity": "sha512-kHszgGt7b9ZBaYLi9N/pNeAbKA2ozHqCKGV47Lpvro3zOsrQLARPAhRybe2hlua+s9Idcvumok5UN0aO1b5oxw==", "requires": { "@antv/dom-util": "^2.0.2", "@antv/g-base": "^0.5.1", "@antv/g-canvas": "^0.5.2", "@antv/g-svg": "^0.5.2", - "@antv/g6-core": "0.3.1", + "@antv/g6-core": "0.3.2", "@antv/matrix-util": "^3.0.4", "@antv/scale": "^0.3.4", "@antv/util": "^2.0.9", @@ -4697,9 +4697,9 @@ } }, "@antv/layout": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/@antv/layout/-/layout-0.1.13.tgz", - "integrity": "sha512-JDEy2P3H4B1HoQesrlysZWzKbXeY9DVQrIc6SBv/tjoZ1D617BjW8z6vYySp4CqT3FdNWg6nbuqQ/lIJLpXzaA==", + "version": "0.1.14", + "resolved": "https://registry.npmjs.org/@antv/layout/-/layout-0.1.14.tgz", + "integrity": "sha512-w4jGWybLWBn1F+ilPnZkMwUywTRIoYZXJknEdCbxmP3MBF81wQ6K9zeVjDCPgjFgGJOI0aNVz86JLooWQtPVLA==", "requires": { "@antv/g-webgpu": "0.5.5", "d3-force": "^2.0.1", @@ -6022,9 +6022,9 @@ "peer": true }, "element-plus": { - "version": "1.0.2-beta.44", - "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.44.tgz", - "integrity": "sha512-PmGfOnV/66LPGSsSbaesiTnmrcQ5PnoZLr2eKRv2/lJ06xUc0AiSBiktGrds0mETgC1O/mRHswXk/Se6aJtpKQ==", + "version": "1.0.2-beta.45", + "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.45.tgz", + "integrity": "sha512-F5U+fx3Lg7fvUPVSxrDQ02HKQbD9Az0fd7SYoqUOZhTuC9PPYlLezs7Pzpme0893cki18Dh7BS1mBcWcUg9ZWQ==", "requires": { "@popperjs/core": "^2.4.4", "@types/lodash": "^4.14.161", @@ -6158,9 +6158,9 @@ } }, "eslint-plugin-vue": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz", - "integrity": "sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz", + "integrity": "sha512-xdr6e4t/L2moRAeEQ9HKgge/hFq+w9v5Dj+BA54nTAzSFdUyKLiSOdZaRQjCHMY0Pk2WaQBFH9QiWG60xiC+6A==", "dev": true, "requires": { "eslint-utils": "^2.1.0", @@ -7635,9 +7635,9 @@ "dev": true }, "typescript": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", - "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz", + "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==", "dev": true }, "uniq": { diff --git a/package.json b/package.json index d1664f4..33a420e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-next-admin", - "version": "1.0.0", + "version": "1.0.1", "scripts": { "dev": "vite", "build": "vite build", @@ -14,7 +14,7 @@ "cropperjs": "^1.5.11", "echarts": "^5.1.1", "echarts-wordcloud": "^2.0.0", - "element-plus": "^1.0.2-beta.44", + "element-plus": "^1.0.2-beta.45", "mitt": "^2.1.0", "nprogress": "^0.2.0", "print-js": "^1.6.0", @@ -42,7 +42,7 @@ "@vue/compiler-sfc": "^3.0.11", "dotenv": "^10.0.0", "eslint": "^7.27.0", - "eslint-plugin-vue": "^7.9.0", + "eslint-plugin-vue": "^7.10.0", "prettier": "^2.3.0", "sass": "^1.34.0", "sass-loader": "^11.1.1", diff --git a/src/router/index.ts b/src/router/index.ts index 77f8d72..8593d0e 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1047,7 +1047,7 @@ export function setFilterRouteEnd() { // 添加动态路由 export function setAddRoute() { setFilterRouteEnd().forEach((route: any) => { - router.addRoute((route as unknown) as RouteRecordRaw); + router.addRoute(route as unknown as RouteRecordRaw); }); } diff --git a/src/views/layout/component/columnsAside.vue b/src/views/layout/component/columnsAside.vue index 85cd2c5..af6bb8f 100644 --- a/src/views/layout/component/columnsAside.vue +++ b/src/views/layout/component/columnsAside.vue @@ -92,6 +92,7 @@ export default { const setFilterRoutes = () => { state.columnsAsideList = filterRoutesFun(store.state.routesList.routesList); const resData: any = setSendChildren(route.path); + if (Object.keys(resData).length <= 0) return false; onColumnsAsideDown(resData.item[0].k); proxy.mittBus.emit('setSendColumnsChildren', resData); }; @@ -125,6 +126,7 @@ export default { state.routeSplit.shift(); const routeFirst = `/${state.routeSplit[0]}`; const currentSplitRoute = state.columnsAsideList.find((v: any) => v.path === routeFirst); + if (!currentSplitRoute) return false; // 延迟拿值，防止取不到 setTimeout(() => { onColumnsAsideDown(currentSplitRoute.k);