Commit 73cee06daa26c056131fb5ec78afd912dd9832f7

Authored by vben
1 parent ac1a3695

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

CHANGELOG.zh_CN.md
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 - 修复多语言配置 `Locale.show`导致配置不生效 20 - 修复多语言配置 `Locale.show`导致配置不生效
21 - 修复路由类型错误 21 - 修复路由类型错误
22 - 修复菜单分割时权限失效问题 22 - 修复菜单分割时权限失效问题
  23 +- 关闭多标签页时 iframe 提前加载
23 24
24 ## 2.0.0-rc.14 (2020-12-15) 25 ## 2.0.0-rc.14 (2020-12-15)
25 26
src/components/Application/src/search/useMenuSearch.ts
@@ -146,7 +146,7 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>, @@ -146,7 +146,7 @@ export function useMenuSearch(refs: Ref<HTMLElement[]>, scrollWrap: Ref<ElRef>,
146 emit('close'); 146 emit('close');
147 } 147 }
148 148
149 - useKeyPress(['enter', 'up', 'down'], (events) => { 149 + useKeyPress(['enter', 'up', 'down', 'esc'], (events) => {
150 const keyCode = events.keyCode; 150 const keyCode = events.keyCode;
151 switch (keyCode) { 151 switch (keyCode) {
152 case KeyCodeEnum.UP: 152 case KeyCodeEnum.UP:
src/layouts/iframe/useFrameKeepAlive.ts
@@ -50,9 +50,10 @@ export function useFrameKeepAlive() { @@ -50,9 +50,10 @@ export function useFrameKeepAlive() {
50 50
51 function hasRenderFrame(name: string) { 51 function hasRenderFrame(name: string) {
52 if (!unref(getShowMultipleTab)) { 52 if (!unref(getShowMultipleTab)) {
53 - return true; 53 + return router.currentRoute.value.name === name;
54 } 54 }
55 return unref(getOpenTabList).includes(name); 55 return unref(getOpenTabList).includes(name);
56 } 56 }
  57 +
57 return { hasRenderFrame, getFramePages, showIframe, getAllFramePages }; 58 return { hasRenderFrame, getFramePages, showIframe, getAllFramePages };
58 } 59 }