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

vbenjs · Dec 27, 2020 · 73cee06 · 73cee06
1 parent ac1a369
commit 73cee06
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -20,6 +20,7 @@
 - 修复多语言配置 `Locale.show`导致配置不生效
 - 修复路由类型错误
 - 修复菜单分割时权限失效问题
+- 关闭多标签页时 iframe 提前加载
 
 ## 2.0.0-rc.14 (2020-12-15)
 

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

diff --git a/src/layouts/iframe/useFrameKeepAlive.ts b/src/layouts/iframe/useFrameKeepAlive.ts
@@ -50,9 +50,10 @@ export function useFrameKeepAlive() {
 
   function hasRenderFrame(name: string) {
     if (!unref(getShowMultipleTab)) {
-      return true;
+      return router.currentRoute.value.name === name;
     }
     return unref(getOpenTabList).includes(name);
   }
+
   return { hasRenderFrame, getFramePages, showIframe, getAllFramePages };
 }