提交 73cee06d 编写于 作者: V vben

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

上级 ac1a3695
...@@ -20,6 +20,7 @@ ...@@ -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)
......
...@@ -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>,
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:
......
...@@ -50,9 +50,10 @@ export function useFrameKeepAlive() { ...@@ -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 };
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册