github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-26 16:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(iframe): iframe loads early when closing multi-tabs

Browse Source
This commit is contained in:
vben
2020-12-27 23:33:33 +08:00
parent ac1a369502
commit 73cee06daa
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.zh_CN.md
View File

@@ -20,6 +20,7 @@
- 修复多语言配置 `Locale.show`导致配置不生效 - 修复多语言配置 `Locale.show`导致配置不生效
- 修复路由类型错误 - 修复路由类型错误
- 修复菜单分割时权限失效问题 - 修复菜单分割时权限失效问题
- 关闭多标签页时 iframe 提前加载
## 2.0.0-rc.14 (2020-12-15) ## 2.0.0-rc.14 (2020-12-15)

2
src/components/Application/src/search/useMenuSearch.ts
View File

@@ -146,7 +146,7 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>,
emit('close'); emit('close');
} }
useKeyPress(['enter', 'up', 'down'], (events) => { useKeyPress(['enter', 'up', 'down', 'esc'], (events) => {
const keyCode = events.keyCode; const keyCode = events.keyCode;
switch (keyCode) { switch (keyCode) {
case KeyCodeEnum.UP: case KeyCodeEnum.UP:

3
src/layouts/iframe/useFrameKeepAlive.ts
View File

@@ -50,9 +50,10 @@ export function useFrameKeepAlive() {
function hasRenderFrame(name: string) { function hasRenderFrame(name: string) {
if (!unref(getShowMultipleTab)) { if (!unref(getShowMultipleTab)) {
return true; return router.currentRoute.value.name === name;
} }
return unref(getOpenTabList).includes(name); return unref(getOpenTabList).includes(name);
} }
return { hasRenderFrame, getFramePages, showIframe, getAllFramePages }; return { hasRenderFrame, getFramePages, showIframe, getAllFramePages };
} }