drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
examples/routers/carousel.vue
View file

@ -1,10 +1,8 @@
<template>
<div>
<Carousel v-model="v1" dots="inside" trigger="hover">
<Carousel v-model="v1" dots="inside" trigger="hover" autoplay loop radius-dot>
<Carousel-item>
<Card>
<div class="demo-carousel">1</div>
</Card>
<div class="demo-carousel">1</div>
</Carousel-item>
<Carousel-item>
<div class="demo-carousel">2</div>
@ -24,8 +22,8 @@
export default {
data () {
return {
v1: 1
}
v1: 0
};
},
methods: {
push () {