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

Merge pull request #923 from stenote/patch-2

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

4
src/components/transfer/list.vue
View file

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

4
src/components/transfer/transfer.vue
View file

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