From f98947996166777cd402a10b6104652c61c6b908 Mon Sep 17 00:00:00 2001 From: baiyaaaaa <bigpet1991@gmail.com> Date: Thu, 27 Apr 2017 13:07:29 +0800 Subject: [PATCH] support use transitiongroup in el-col (#4483) --- packages/col/src/col.js | 22 ++++++++++------------ packages/row/src/row.vue | 2 ++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/col/src/col.js b/packages/col/src/col.js index 787f86029..2aece0006 100644 --- a/packages/col/src/col.js +++ b/packages/col/src/col.js @@ -17,23 +17,21 @@ export default { computed: { gutter() { - return this.$parent.gutter; - }, - - style() { - var ret = {}; - - if (this.gutter) { - ret.paddingLeft = this.gutter / 2 + 'px'; - ret.paddingRight = ret.paddingLeft; + let parent = this.$parent; + while (parent && parent.$options.componentName !== 'ElRow') { + parent = parent.$parent; } - - return ret; + return parent ? parent.gutter : 0; } }, render(h) { - let { style } = this; let classList = []; + let style = {}; + + if (this.gutter) { + style.paddingLeft = this.gutter / 2 + 'px'; + style.paddingRight = style.paddingLeft; + } ['span', 'offset', 'pull', 'push'].forEach(prop => { if (this[prop]) { diff --git a/packages/row/src/row.vue b/packages/row/src/row.vue index 72b9fd654..5b6c4289c 100644 --- a/packages/row/src/row.vue +++ b/packages/row/src/row.vue @@ -17,6 +17,8 @@ export default { name: 'ElRow', + componentName: 'ElRow', + props: { gutter: Number, type: String,