更新el-admin-layout版本

master
toesbieya 6 years ago
parent 218a265372
commit 0587f322e4
  1. 6
      vue/full/package-lock.json
  2. 2
      vue/full/package.json
  3. 6
      vue/full/src/layout/component/SettingDrawer/mixin/tagsViewShortcut.js
  4. 2
      vue/full/src/layout/index.vue

@ -4535,9 +4535,9 @@
"dev": true "dev": true
}, },
"el-admin-layout": { "el-admin-layout": {
"version": "0.3.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/el-admin-layout/-/el-admin-layout-0.3.0.tgz", "resolved": "https://registry.npmjs.org/el-admin-layout/-/el-admin-layout-0.4.0.tgz",
"integrity": "sha512-mqETeYK9XxTTI7VHD5NIIjORRxzsdE4HPfae8PmaTZVhJH+BlzmFf8OpOmXvei4Z3C35/2BiYCxmbMw9XeiGjQ==" "integrity": "sha512-V4tuNYZVMoBRZjeoRsoMYOqE1iZiaXbSYfWDHYwuQZQ4GVZBvqma9lxujOdeV8E/+JkORAUrffxsOfZxYio7Dw=="
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.633", "version": "1.3.633",

@ -10,7 +10,7 @@
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
"decimal.js": "^10.2.1", "decimal.js": "^10.2.1",
"el-admin-layout": "^0.3.0", "el-admin-layout": "^0.4.0",
"element-ui": "^2.14.1", "element-ui": "^2.14.1",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",

@ -5,6 +5,7 @@
*/ */
import {tagsViewGetters} from "el-admin-layout" import {tagsViewGetters} from "el-admin-layout"
import {getRouterKey} from "el-admin-layout/src/config/logic"
export default { export default {
watch: { watch: {
@ -27,7 +28,8 @@ export default {
const views = tagsViewGetters.visitedViews const views = tagsViewGetters.visitedViews
if (views.length <= 1) return 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 if (index < 0) return
//上一个页签 //上一个页签
@ -39,7 +41,7 @@ export default {
index = index > views.length - 2 ? 0 : index + 1 index = index > views.length - 2 ? 0 : index + 1
} }
return root.$router.push({path: views[index].path}) return root.$router.push(views[index])
}, },
//快捷键监听 //快捷键监听

@ -118,7 +118,7 @@ export default {
</div> </div>
] ]
return customActions.concat(defaultActions) return customActions.concat(defaultActions.map(f => f()))
} }
}, },

Loading…
Cancel
Save