Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
Administrator
dsk-cr20g
Commits
4dc61074
Commit
4dc61074
authored
Jul 21, 2023
by
danfuman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev20230707' of
http://192.168.60.201/root/dsk-operate-sys
into dev20230707
parents
5dc1cf9f
41621069
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
93 additions
and
2 deletions
+93
-2
ScrollPane.vue
dsk-operate-ui/src/layout/components/TagsView/ScrollPane.vue
+1
-1
index.vue
dsk-operate-ui/src/layout/components/TagsView/index.vue
+92
-1
No files found.
dsk-operate-ui/src/layout/components/TagsView/ScrollPane.vue
View file @
4dc61074
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
height
:
100%
;
height
:
100%
;
padding-top
:
24px
;
padding-top
:
24px
;
margin-bottom
:
0
!
important
;
margin-bottom
:
0
!
important
;
overflow
:
auto
;
overflow
:
hidden
;
}
}
.is-horizontal
{
.is-horizontal
{
width
:
0
;
width
:
0
;
...
...
dsk-operate-ui/src/layout/components/TagsView/index.vue
View file @
4dc61074
...
@@ -28,6 +28,26 @@
...
@@ -28,6 +28,26 @@
<li
v-if=
"!isLastView()"
@
click=
"closeRightTags"
><i
class=
"el-icon-right"
></i>
关闭右侧
</li>
<li
v-if=
"!isLastView()"
@
click=
"closeRightTags"
><i
class=
"el-icon-right"
></i>
关闭右侧
</li>
<li
@
click=
"closeAllTags(selectedTag)"
><i
class=
"el-icon-circle-close"
></i>
全部关闭
</li>
<li
@
click=
"closeAllTags(selectedTag)"
><i
class=
"el-icon-circle-close"
></i>
全部关闭
</li>
</ul>
</ul>
<div
class=
"alltags"
@
click=
"closeall"
>
<div
class=
""
><i
class=
"el-icon-arrow-down"
v-if=
"!showall"
></i>
<i
class=
"el-icon-arrow-up"
v-if=
"showall"
></i></div>
<div
class=
"tagslist"
v-if=
"showall"
>
<router-link
v-for=
"(tag, index) in visitedViews"
ref=
"tag"
:key=
"tag.path"
:class=
"isActive(tag)?'active':''"
:to=
"
{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
<i
class=
"el-icon-check"
></i>
<span
:id=
"isActive(tag)?'tagTitle':''"
>
{{
tag
.
title
}}
</span>
</router-link>
<div
class=
"clasall"
@
click=
"closeAllTag(selectedTag)"
>
关闭全部标签
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -43,7 +63,8 @@ export default {
...
@@ -43,7 +63,8 @@ export default {
top
:
0
,
top
:
0
,
left
:
0
,
left
:
0
,
selectedTag
:
{},
selectedTag
:
{},
affixTags
:
[]
affixTags
:
[],
showall
:
false
,
}
}
},
},
computed
:
{
computed
:
{
...
@@ -90,6 +111,13 @@ export default {
...
@@ -90,6 +111,13 @@ export default {
this
.
addTags
()
this
.
addTags
()
},
},
methods
:
{
methods
:
{
closeall
(){
if
(
this
.
showall
==
true
){
this
.
showall
=
false
}
else
{
this
.
showall
=
true
}
},
isActive
(
route
)
{
isActive
(
route
)
{
return
route
.
path
===
this
.
$route
.
path
return
route
.
path
===
this
.
$route
.
path
},
},
...
@@ -202,6 +230,11 @@ export default {
...
@@ -202,6 +230,11 @@ export default {
this
.
moveToCurrentTag
()
this
.
moveToCurrentTag
()
})
})
},
},
closeAllTag
(
view
){
this
.
showall
=
false
this
.
closeAllTags
(
view
)
},
closeAllTags
(
view
)
{
closeAllTags
(
view
)
{
this
.
$tab
.
closeAllPage
().
then
(({
visitedViews
})
=>
{
this
.
$tab
.
closeAllPage
().
then
(({
visitedViews
})
=>
{
if
(
this
.
affixTags
.
some
(
tag
=>
tag
.
path
===
this
.
$route
.
path
))
{
if
(
this
.
affixTags
.
some
(
tag
=>
tag
.
path
===
this
.
$route
.
path
))
{
...
@@ -257,6 +290,7 @@ export default {
...
@@ -257,6 +290,7 @@ export default {
height
:
56px
;
height
:
56px
;
width
:
100%
;
width
:
100%
;
background
:
#fff
;
background
:
#fff
;
position
:
relative
;
.tags-view-wrapper
{
.tags-view-wrapper
{
.tags-view-item
{
.tags-view-item
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -336,6 +370,63 @@ export default {
...
@@ -336,6 +370,63 @@ export default {
}
}
}
}
}
}
.alltags
{
position
:
absolute
;
align-items
:
center
;
border-radius
:
9px
;
height
:
17px
;
justify-content
:
center
;
width
:
36px
;
right
:
-46px
;
bottom
:
10px
;
cursor
:
pointer
;
text-align
:
center
;
&
:hover
{
background
:
#EFEFEF
;
}
.tagslist
{
position
:
absolute
;
right
:
0
;
top
:
20px
;
background-color
:
#fcfcfc
;
color
:
#141414
;
font-size
:
13px
;
line-height
:
1em
;
margin-bottom
:
0
;
max-height
:
450px
;
overflow-y
:
auto
;
overflow-y
:
overlay
;
padding
:
20px
0
10px
;
width
:
325px
;
text-align
:
left
;
box-shadow
:
0
2px
9px
2px
rgba
(
0
,
0
,
0
,.
09
)
,
0
1px
2px
-2px
rgba
(
0
,
0
,
0
,.
16
);
.tags-view-item
{
padding
:
8px
24px
;
display
:
block
;
position
:
relative
;
&
:hover
{
color
:
#0081FF
;
}
.el-icon-check
{
display
:
none
;
position
:
absolute
;
left
:
5px
;
width
:
13px
;
}
&
.active
{
color
:
#0081FF
;
.el-icon-check
{
display
:
block
;
}
}
}
.clasall
{
border-top
:
1px
solid
#EFEFEF
;
padding
:
10px
24px
0
;
margin-top
:
10px
;
}
}
}
}
}
</
style
>
</
style
>
...
...
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