Merge branch '2.0' of https://github.com/iview/iview into feature-card

This commit is contained in:
huixisheng 2017-03-02 17:45:47 +08:00
commit 49dd45f46f
28 changed files with 190 additions and 69 deletions

View file

@ -31,6 +31,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
<li><router-link to="/collapse">Collapse</router-link></li>
<li><router-link to="/carousel">Carousel</router-link></li>
<li><router-link to="/card">Card</router-link></li>
<li><router-link to="/tree">Tree</router-link></li>
</ul>
</nav>
<router-view></router-view>

View file

@ -88,6 +88,10 @@ const router = new VueRouter({
{
path: '/card',
component: require('./routers/card.vue')
},
{
path: '/tree',
component: require('./routers/tree.vue')
}
]
});

View file

@ -1,10 +1,12 @@
<template>
<Tree
:data.sync="treeData"
:show-checkbox="true"
:multiple="true"
@on-select-change="selectFn"
@on-check-change="checkFn"></Tree>
<div>
<Tree
v-model="treeData"
:show-checkbox="true"
:multiple="true"
@on-select-change="selectFn"
@on-check-change="checkFn"></Tree>
</div>
</template>
<script>
export default {