chenhaodong / mew-iview

Commit 3842df9abe06ce79ca11b2d5f80ab23f21240a8b

Authored by Aresn
Committed by GitHub
2 parents c70ff0f2 f031f465

Merge pull request #923 from stenote/patch-2 

'style' cannot be used as component prop.
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/components/transfer/list.vue
  Show/Hide comments   View file @3842df9
1 1 <template>
2   - <div :class="classes" :style="style">
  2 + <div :class="classes" :style="listStyle">
3 3 <div :class="prefixCls + '-header'">
4 4 <Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
5 5 <span>{{ title }}</span>
... ... @@ -40,7 +40,7 @@
40 40 data: Array,
41 41 renderFormat: Function,
42 42 checkedKeys: Array,
43   - style: Object,
  43 + listStyle: Object,
44 44 title: [String, Number],
45 45 filterable: Boolean,
46 46 filterPlaceholder: String,
... ...
src/components/transfer/transfer.vue
  Show/Hide comments   View file @3842df9
... ... @@ -39,7 +39,7 @@
39 39 renderFormat: this.renderFormat,
40 40 checkedKeys: this.leftCheckedKeys,
41 41 validKeysCount: this.leftValidKeysCount,
42   - style: this.listStyle,
  42 + listStyle: this.listStyle,
43 43 title: this.localeTitles[0],
44 44 filterable: this.filterable,
45 45 filterPlaceholder: this.localeFilterPlaceholder,
... ... @@ -68,7 +68,7 @@
68 68 renderFormat: this.renderFormat,
69 69 checkedKeys: this.rightCheckedKeys,
70 70 validKeysCount: this.rightValidKeysCount,
71   - style: this.listStyle,
  71 + listStyle: this.listStyle,
72 72 title: this.localeTitles[1],
73 73 filterable: this.filterable,
74 74 filterPlaceholder: this.localeFilterPlaceholder,
... ...