Merge branch 'master' of https://github.com/iview/iview into 2.0

Update carousel component: add loop and radiusDot property
# Conflicts:
#	package.json
#	src/components/date-picker/picker.vue
#	src/components/select/select.vue
This commit is contained in:
houyl 2017-10-24 16:47:12 +08:00
parent 9b24f1ab7b
commit ccf544dcc2
4 changed files with 115 additions and 19 deletions

View file

@ -27,6 +27,15 @@
mounted () {
this.$parent.slotChange();
},
watch: {
width (val) {
if (val && this.$parent.loop) {
this.$nextTick(() => {
this.$parent.initCopyTrackDom();
});
}
}
},
beforeDestroy () {
this.$parent.slotChange();
}