[new feature] #734 swipe组件支持垂直滚动 #938
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 27 commits
April 16, 2018 18:54
Codecov Report
@@ Coverage Diff @@
## dev #938 +/- ##
=======================================
Coverage 94.12% 94.12%
=======================================
Files 93 93
Lines 1515 1515
Branches 303 303
=======================================
Hits 1426 1426
Misses 48 48
Partials 41 41Continue to review full report at Codecov.
|
chenjiahan
reviewed
Apr 26, 2018
packages/swipe/index.vue
Outdated
| @@ -115,9 +134,10 @@ export default create({ | |||
| // reset offset when children changes | |||
| clearTimeout(this.timer); | |||
| this.width = this.$el.getBoundingClientRect().width; | |||
| this.height = this.$el.getBoundingClientRect().height; | |||
There was a problem hiding this comment.
const rect = this.$el.getBoundingClientRect();
this.width = rect.width;
this.height = rect.height;
chenjiahan
reviewed
Apr 26, 2018
packages/swipe/index.vue
Outdated
| @@ -17,9 +17,12 @@ | |||
| </div> | |||
| <div | |||
| v-if="showIndicators && count > 1" | |||
| :class="b('indicators')" | |||
| :class="b(indicatorsStyle)" | |||
There was a problem hiding this comment.
:class="b('indicators', { veritical })"
chenjiahan
reviewed
Apr 26, 2018
docs/markdown/en-US/swipe.md
Outdated
| @@ -75,6 +86,7 @@ export default { | |||
| | loop | Whether to enable loop | `Boolean` | `true` | - | | |||
| | show-indicators | Whether to show indocators | `Boolean` | `true` | - | | |||
| | initial-swipe | Index of initial swipe, start from 0 | `Number` | `0` | - | | |||
| | vertical | Vertical Scrolling | `Boolean` | false | - | | |||
chenjiahan
reviewed
Apr 26, 2018
packages/swipe-item/index.vue
Outdated
| @@ -18,6 +18,14 @@ export default create({ | |||
|
|
|||
| computed: { | |||
| style() { | |||
| if (this.$parent.vertical) { | |||
There was a problem hiding this comment.
const { vertical, width, height } = this.$parent;
return {
width: width + 'px',
height: vertical ? height + 'px' : '100%',
transform: `translate${vertical ? 'Y' : 'X'}(${this.offset}px)`
};
chenjiahan
reviewed
Apr 26, 2018
packages/swipe/index.vue
Outdated
| <i | ||
| v-for="index in count" | ||
| :key="index" | ||
| :class="b('indicator', { active: index - 1 === activeIndicator })" /> |
chenjiahan
reviewed
Apr 26, 2018
packages/swipe/index.vue
Outdated
| @@ -206,6 +235,10 @@ export default create({ | |||
|
|
|||
| range(num, arr) { | |||
| return Math.min(Math.max(num, arr[0]), arr[1]); | |||
| }, | |||
|
|
|||
| size() { | |||
chenjiahan
reviewed
Apr 26, 2018
packages/vant-css/src/swipe.css
Outdated
| height: $van-swipe-indicator; | ||
| transform: translate3d(-50%, 0, 0); | ||
| } | ||
|
|
||
| &__indicators-vertical { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
swipe组件支持垂直滚动，增加vertical属性 #734：