Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
73cee06d
Commit
73cee06d
authored
Dec 27, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(iframe): iframe loads early when closing multi-tabs
parent
ac1a3695
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
useMenuSearch.ts
src/components/Application/src/search/useMenuSearch.ts
+1
-1
useFrameKeepAlive.ts
src/layouts/iframe/useFrameKeepAlive.ts
+2
-1
No files found.
CHANGELOG.zh_CN.md
View file @
73cee06d
...
...
@@ -20,6 +20,7 @@
-
修复多语言配置
`Locale.show`
导致配置不生效
-
修复路由类型错误
-
修复菜单分割时权限失效问题
-
关闭多标签页时 iframe 提前加载
## 2.0.0-rc.14 (2020-12-15)
...
...
src/components/Application/src/search/useMenuSearch.ts
View file @
73cee06d
...
...
@@ -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
:
...
...
src/layouts/iframe/useFrameKeepAlive.ts
View file @
73cee06d
...
...
@@ -50,9 +50,10 @@ export function useFrameKeepAlive() {
function
hasRenderFrame
(
name
:
string
)
{
if
(
!
unref
(
getShowMultipleTab
))
{
return
tru
e
;
return
router
.
currentRoute
.
value
.
name
===
nam
e
;
}
return
unref
(
getOpenTabList
).
includes
(
name
);
}
return
{
hasRenderFrame
,
getFramePages
,
showIframe
,
getAllFramePages
};
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment