Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
admin-fe
Commits
68de01e8
Unverified
Commit
68de01e8
authored
6 years ago
by
花裤衩
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
refactor[tagsView]: use el-scrollbar (#995)
parent
6e569c4f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/ScrollPane/index.vue
+20
-36
20 additions, 36 deletions
src/components/ScrollPane/index.vue
src/views/layout/components/TagsView.vue
+8
-4
8 additions, 4 deletions
src/views/layout/components/TagsView.vue
with
28 additions
and
40 deletions
src/components/ScrollPane/index.vue
+
20
−
36
View file @
68de01e8
<
template
>
<div
ref=
"scrollContainer"
class=
"scroll-container"
@
wheel.prevent=
"handleScroll"
>
<div
ref=
"scrollWrapper"
:style=
"
{left: left + 'px'}" class="scroll-wrapper">
<slot/>
</div>
</div>
<el-scrollbar
ref=
"scrollContainer"
:vertical=
"false"
class=
"scroll-container"
@
wheel.native.prevent=
"handleScroll"
>
<slot/>
</el-scrollbar>
</
template
>
<
script
>
...
...
@@ -18,41 +16,22 @@ export default {
},
methods
:
{
handleScroll
(
e
)
{
const
eventDelta
=
e
.
wheelDelta
||
-
e
.
deltaY
*
3
const
$container
=
this
.
$refs
.
scrollContainer
const
$containerWidth
=
$container
.
offsetWidth
const
$wrapper
=
this
.
$refs
.
scrollWrapper
const
$wrapperWidth
=
$wrapper
.
offsetWidth
if
(
eventDelta
>
0
)
{
this
.
left
=
Math
.
min
(
0
,
this
.
left
+
eventDelta
)
}
else
{
if
(
$containerWidth
-
padding
<
$wrapperWidth
)
{
if
(
this
.
left
<
-
(
$wrapperWidth
-
$containerWidth
+
padding
))
{
this
.
left
=
this
.
left
}
else
{
this
.
left
=
Math
.
max
(
this
.
left
+
eventDelta
,
$containerWidth
-
$wrapperWidth
-
padding
)
}
}
else
{
this
.
left
=
0
}
}
const
eventDelta
=
e
.
wheelDelta
||
-
e
.
deltaY
*
40
const
$scrollWrapper
=
this
.
$refs
.
scrollContainer
.
$refs
.
wrap
$scrollWrapper
.
scrollLeft
=
$scrollWrapper
.
scrollLeft
+
eventDelta
/
4
},
moveToTarget
(
$target
)
{
const
$container
=
this
.
$refs
.
scrollContainer
const
$container
=
this
.
$refs
.
scrollContainer
.
$el
const
$containerWidth
=
$container
.
offsetWidth
const
$scrollWrapper
=
this
.
$refs
.
scrollContainer
.
$refs
.
wrap
const
$targetLeft
=
$target
.
offsetLeft
const
$targetWidth
=
$target
.
offsetWidth
if
(
$targetLeft
<
-
this
.
left
)
{
// tag in the left
this
.
left
=
-
$targetLeft
+
padding
}
else
if
(
$targetLeft
+
padding
>
-
this
.
left
&&
$targetLeft
+
$targetWidth
<
-
this
.
left
+
$containerWidth
-
padding
)
{
// tag in the current view
// eslint-disable-line
}
else
{
if
(
$targetLeft
>
$containerWidth
)
{
// tag in the right
this
.
left
=
-
(
$targetLeft
-
(
$containerWidth
-
$targetWidth
)
+
padding
)
$scrollWrapper
.
scrollLeft
=
$targetLeft
-
$containerWidth
+
$targetWidth
+
padding
}
else
{
// tag in the left
$scrollWrapper
.
scrollLeft
=
$targetLeft
-
padding
}
}
}
...
...
@@ -65,8 +44,13 @@ export default {
position
:
relative
;
overflow
:
hidden
;
width
:
100%
;
.scroll-wrapper
{
position
:
absolute
;
/
deep
/
{
.el-scrollbar__bar
{
bottom
:
0px
;
}
.el-scrollbar__wrap
{
height
:
49px
;
}
}
}
</
style
>
This diff is collapsed.
Click to expand it.
src/views/layout/components/TagsView.vue
+
8
−
4
View file @
68de01e8
...
...
@@ -123,11 +123,12 @@ export default {
<
style
rel=
"stylesheet/scss"
lang=
"scss"
scoped
>
.tags-view-container
{
height
:
34px
;
width
:
100%
;
background
:
#fff
;
border-bottom
:
1px
solid
#d8dce5
;
box-shadow
:
0
1px
3px
0
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
3px
0
rgba
(
0
,
0
,
0
,
.04
);
.tags-view-wrapper
{
background
:
#fff
;
height
:
34px
;
border-bottom
:
1px
solid
#d8dce5
;
box-shadow
:
0
1px
3px
0
rgba
(
0
,
0
,
0
,
.12
)
,
0
0
3px
0
rgba
(
0
,
0
,
0
,
.04
);
.tags-view-item
{
display
:
inline-block
;
position
:
relative
;
...
...
@@ -143,6 +144,9 @@ export default {
&
:first-of-type
{
margin-left
:
15px
;
}
&
:last-of-type
{
margin-right
:
15px
;
}
&
.active
{
background-color
:
#42b983
;
color
:
#fff
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment