diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 93b17f9a164d1e944758ec82c9a09f03bb4ea06f..1f6010d7d5e018dea48f121597b8ed6cc86b8624 100644 --- 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 index ac15a2f4695607fc30382a6c682e3df8964c83e4..e4a3076900ee0cc8bb705c68be420b8932a8da5d 100644 --- 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, scrollWrap: Ref, 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 index 11a25328a243d0228c9737b807497b9cbf6cf8c2..fb06a613ff700fe5ead99df6276d7283765cfe96 100644 --- 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 }; }