Merge pull request #923 from stenote/patch-2

'style' cannot be used as component prop.
This commit is contained in:
Aresn 2017-05-15 18:05:48 +08:00 committed by GitHub
commit 3842df9abe
2 changed files with 4 additions and 4 deletions

View file

@ -1,5 +1,5 @@
<template>
<div :class="classes" :style="style">
<div :class="classes" :style="listStyle">
<div :class="prefixCls + '-header'">
<Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
<span>{{ title }}</span>
@ -40,7 +40,7 @@
data: Array,
renderFormat: Function,
checkedKeys: Array,
style: Object,
listStyle: Object,
title: [String, Number],
filterable: Boolean,
filterPlaceholder: String,

View file

@ -39,7 +39,7 @@
renderFormat: this.renderFormat,
checkedKeys: this.leftCheckedKeys,
validKeysCount: this.leftValidKeysCount,
style: this.listStyle,
listStyle: this.listStyle,
title: this.localeTitles[0],
filterable: this.filterable,
filterPlaceholder: this.localeFilterPlaceholder,
@ -68,7 +68,7 @@
renderFormat: this.renderFormat,
checkedKeys: this.rightCheckedKeys,
validKeysCount: this.rightValidKeysCount,
style: this.listStyle,
listStyle: this.listStyle,
title: this.localeTitles[1],
filterable: this.filterable,
filterPlaceholder: this.localeFilterPlaceholder,