diff --git a/vue/full/package-lock.json b/vue/full/package-lock.json index 563e610..19758f0 100644 --- a/vue/full/package-lock.json +++ b/vue/full/package-lock.json @@ -4535,9 +4535,9 @@ "dev": true }, "el-admin-layout": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/el-admin-layout/-/el-admin-layout-0.3.0.tgz", - "integrity": "sha512-mqETeYK9XxTTI7VHD5NIIjORRxzsdE4HPfae8PmaTZVhJH+BlzmFf8OpOmXvei4Z3C35/2BiYCxmbMw9XeiGjQ==" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/el-admin-layout/-/el-admin-layout-0.4.0.tgz", + "integrity": "sha512-V4tuNYZVMoBRZjeoRsoMYOqE1iZiaXbSYfWDHYwuQZQ4GVZBvqma9lxujOdeV8E/+JkORAUrffxsOfZxYio7Dw==" }, "electron-to-chromium": { "version": "1.3.633", diff --git a/vue/full/package.json b/vue/full/package.json index 233ef7c..2231948 100644 --- a/vue/full/package.json +++ b/vue/full/package.json @@ -10,7 +10,7 @@ "dependencies": { "axios": "^0.21.1", "decimal.js": "^10.2.1", - "el-admin-layout": "^0.3.0", + "el-admin-layout": "^0.4.0", "element-ui": "^2.14.1", "file-saver": "^2.0.5", "js-md5": "^0.7.3", diff --git a/vue/full/src/layout/component/SettingDrawer/mixin/tagsViewShortcut.js b/vue/full/src/layout/component/SettingDrawer/mixin/tagsViewShortcut.js index 66b3f8a..3eca32d 100644 --- a/vue/full/src/layout/component/SettingDrawer/mixin/tagsViewShortcut.js +++ b/vue/full/src/layout/component/SettingDrawer/mixin/tagsViewShortcut.js @@ -5,6 +5,7 @@ */ import {tagsViewGetters} from "el-admin-layout" +import {getRouterKey} from "el-admin-layout/src/config/logic" export default { watch: { @@ -27,7 +28,8 @@ export default { const views = tagsViewGetters.visitedViews if (views.length <= 1) return - let index = views.findIndex(view => view.path === root.$route.path) + const key = getRouterKey(root.$route) + let index = views.findIndex(view => view.key === key) if (index < 0) return //上一个页签 @@ -39,7 +41,7 @@ export default { index = index > views.length - 2 ? 0 : index + 1 } - return root.$router.push({path: views[index].path}) + return root.$router.push(views[index]) }, //快捷键监听 diff --git a/vue/full/src/layout/index.vue b/vue/full/src/layout/index.vue index 7b6bf13..f9c1c23 100644 --- a/vue/full/src/layout/index.vue +++ b/vue/full/src/layout/index.vue @@ -118,7 +118,7 @@ export default { ] - return customActions.concat(defaultActions) + return customActions.concat(defaultActions.map(f => f())) } },