Merge branch '2.0' into table_render

This commit is contained in:
anykno 2017-06-03 22:10:48 +08:00 committed by GitHub
commit 8e9002b970
36 changed files with 874 additions and 512 deletions

View file

@ -6,7 +6,7 @@
</template>
<template v-if="renderType === 'html'"><span v-html="row[column.key]"></span></template>
<template v-if="renderType === 'normal'"><span>{{row[column.key]}}</span></template>
<template v-if="renderType === 'expand'">
<template v-if="renderType === 'expand' && !row._disableExpand">
<div :class="expandCls" @click="toggleExpand">
<Icon type="ios-arrow-right"></Icon>
</div>