Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
4bbdc1e8
Commit
4bbdc1e8
authored
Mar 15, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复TagsView组件中,鼠标滚轮按下的时候,可以关闭不可关闭的tag
parent
3b871284
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
ruoyi-ui/src/assets/styles/element-ui.scss
ruoyi-ui/src/assets/styles/element-ui.scss
+5
-0
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
+1
-1
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
+6
-3
No files found.
ruoyi-ui/src/assets/styles/element-ui.scss
View file @
4bbdc1e8
...
@@ -77,3 +77,8 @@
...
@@ -77,3 +77,8 @@
.el-range-editor.el-input__inner
{
.el-range-editor.el-input__inner
{
display
:
inline-flex
!
important
;
display
:
inline-flex
!
important
;
}
}
// to fix el-date-picker css style
.el-range-separator
{
box-sizing
:
content-box
;
}
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
View file @
4bbdc1e8
<
template
>
<
template
>
<div
v-if=
"!item.hidden"
class=
"menu-wrapper"
>
<div
v-if=
"!item.hidden"
>
<template
v-if=
"hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"
>
<template
v-if=
"hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"
>
<app-link
v-if=
"onlyOneChild.meta"
:to=
"resolvePath(onlyOneChild.path)"
>
<app-link
v-if=
"onlyOneChild.meta"
:to=
"resolvePath(onlyOneChild.path)"
>
<el-menu-item
:index=
"resolvePath(onlyOneChild.path)"
:class=
"
{'submenu-title-noDropdown':!isNest}">
<el-menu-item
:index=
"resolvePath(onlyOneChild.path)"
:class=
"
{'submenu-title-noDropdown':!isNest}">
...
...
ruoyi-ui/src/layout/components/TagsView/index.vue
View file @
4bbdc1e8
...
@@ -9,16 +9,16 @@
...
@@ -9,16 +9,16 @@
:to=
"
{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
:to=
"
{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
tag="span"
class="tags-view-item"
class="tags-view-item"
@click.middle.native="
closeSelectedTag(tag)
"
@click.middle.native="
!isAffix(tag)?closeSelectedTag(tag):''
"
@contextmenu.prevent.native="openMenu(tag,$event)"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
>
{{
tag
.
title
}}
{{
tag
.
title
}}
<span
v-if=
"!
tag.meta.affix
"
class=
"el-icon-close"
@
click.prevent.stop=
"closeSelectedTag(tag)"
/>
<span
v-if=
"!
isAffix(tag)
"
class=
"el-icon-close"
@
click.prevent.stop=
"closeSelectedTag(tag)"
/>
</router-link>
</router-link>
</scroll-pane>
</scroll-pane>
<ul
v-show=
"visible"
:style=
"
{left:left+'px',top:top+'px'}" class="contextmenu">
<ul
v-show=
"visible"
:style=
"
{left:left+'px',top:top+'px'}" class="contextmenu">
<li
@
click=
"refreshSelectedTag(selectedTag)"
>
刷新页面
</li>
<li
@
click=
"refreshSelectedTag(selectedTag)"
>
刷新页面
</li>
<li
v-if=
"!
(selectedTag.meta&&selectedTag.meta.affix
)"
@
click=
"closeSelectedTag(selectedTag)"
>
关闭当前
</li>
<li
v-if=
"!
isAffix(selectedTag
)"
@
click=
"closeSelectedTag(selectedTag)"
>
关闭当前
</li>
<li
@
click=
"closeOthersTags"
>
关闭其他
</li>
<li
@
click=
"closeOthersTags"
>
关闭其他
</li>
<li
@
click=
"closeAllTags(selectedTag)"
>
关闭所有
</li>
<li
@
click=
"closeAllTags(selectedTag)"
>
关闭所有
</li>
</ul>
</ul>
...
@@ -69,6 +69,9 @@ export default {
...
@@ -69,6 +69,9 @@ export default {
isActive
(
route
)
{
isActive
(
route
)
{
return
route
.
path
===
this
.
$route
.
path
return
route
.
path
===
this
.
$route
.
path
},
},
isAffix
(
tag
)
{
return
tag
.
meta
&&
tag
.
meta
.
affix
},
filterAffixTags
(
routes
,
basePath
=
'
/
'
)
{
filterAffixTags
(
routes
,
basePath
=
'
/
'
)
{
let
tags
=
[]
let
tags
=
[]
routes
.
forEach
(
route
=>
{
routes
.
forEach
(
route
=>
{
...
...
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