diff --git a/src/components/ScrollPane/index.vue b/src/components/ScrollPane/index.vue index 322b29f0..89998e80 100644 --- a/src/components/ScrollPane/index.vue +++ b/src/components/ScrollPane/index.vue @@ -24,24 +24,26 @@ export default { const $container = this.$refs.scrollContainer.$el const $containerWidth = $container.offsetWidth const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap - const tagList = this.$parent.$refs.tag + let firstTag = null let lastTag = null let prevTag = null let nextTag = null + // find first tag and last tag if (tagList.length > 0) { firstTag = tagList[0] lastTag = tagList[tagList.length - 1] } + // find preTag and nextTag for (let i = 0; i < tagList.length; i++) { if (tagList[i] === currentTag) { if (i === 0) { - nextTag = tagList[i].length > 1 ? tagList[i + 1] : null + nextTag = tagList[i].length > 1 && tagList[i + 1] } else if (i === tagList.length - 1) { - prevTag = tagList[i].length > 1 ? tagList[i - 1] : null + prevTag = tagList[i].length > 1 && tagList[i - 1] } else { prevTag = tagList[i - 1] nextTag = tagList[i + 1] @@ -53,17 +55,15 @@ export default { if (firstTag === currentTag) { $scrollWrapper.scrollLeft = 0 } else if (lastTag === currentTag) { - $scrollWrapper.scrollLeft = - $scrollWrapper.scrollWidth - $containerWidth + $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth } else { // the tag's offsetLeft after of nextTag const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing + // the tag's offsetLeft before of prevTag const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing - if ( - afterNextTagOffsetLeft > - $scrollWrapper.scrollLeft + $containerWidth - ) { + + if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) { $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) { $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft