update the master branch to the latest

src/components/grid/col.vue

@@ -0,0 +1,89 @@
+<template>
+    <div :class="classes" :style="styles">
+        <slot></slot>
+    </div>
+</template>
+<script>
+    import { findComponentUpward } from '../../utils/assist';
+    const prefixCls = 'ivu-col';
+
+    export default {
+        name: 'iCol',
+        props: {
+            span: [Number, String],
+            order: [Number, String],
+            offset: [Number, String],
+            push: [Number, String],
+            pull: [Number, String],
+            className: String,
+            xs: [Number, Object],
+            sm: [Number, Object],
+            md: [Number, Object],
+            lg: [Number, Object],
+            xl: [Number, Object],
+            xxl: [Number, Object]
+        },
+        data () {
+            return {
+                gutter: 0
+            };
+        },
+        computed: {
+            classes () {
+                let classList = [
+                    `${prefixCls}`,
+                    {
+                        [`${prefixCls}-span-${this.span}`]: this.span,
+                        [`${prefixCls}-order-${this.order}`]: this.order,
+                        [`${prefixCls}-offset-${this.offset}`]: this.offset,
+                        [`${prefixCls}-push-${this.push}`]: this.push,
+                        [`${prefixCls}-pull-${this.pull}`]: this.pull,
+                        [`${this.className}`]: !!this.className
+                    }
+                ];
+
+                ['xs', 'sm', 'md', 'lg', 'xl', 'xxl'].forEach(size => {
+                    if (typeof this[size] === 'number') {
+                        classList.push(`${prefixCls}-span-${size}-${this[size]}`);
+                    } else if (typeof this[size] === 'object') {
+                        let props = this[size];
+                        Object.keys(props).forEach(prop => {
+                            classList.push(
+                                prop !== 'span'
+                                    ? `${prefixCls}-${size}-${prop}-${props[prop]}`
+                                    : `${prefixCls}-span-${size}-${props[prop]}`
+                            );
+                        });
+                    }
+                });
+
+                return classList;
+            },
+            styles () {
+                let style = {};
+                if (this.gutter !== 0) {
+                    style = {
+                        paddingLeft: this.gutter / 2 + 'px',
+                        paddingRight: this.gutter / 2 + 'px'
+                    };
+                }
+
+                return style;
+            }
+        },
+        methods: {
+            updateGutter () {
+                const Row = findComponentUpward(this, 'Row');
+                if (Row) {
+                    Row.updateGutter(Row.gutter);
+                }
+            }
+        },
+        mounted () {
+            this.updateGutter();
+        },
+        beforeDestroy () {
+            this.updateGutter();
+        }
+    };
+</script>

src/components/grid/index.js

@@ -0,0 +1,4 @@
+import Row from './row.vue';
+import Col from './col.vue';
+
+export { Row, Col };

src/components/grid/row.vue

@@ -0,0 +1,80 @@
+<template>
+    <div :class="classes" :style="styles">
+        <slot></slot>
+    </div>
+</template>
+<script>
+    import { oneOf, findComponentDownward, findBrothersComponents } from '../../utils/assist';
+
+    const prefixCls = 'ivu-row';
+
+    export default {
+        name: 'Row',
+        props: {
+            type: {
+                validator (value) {
+                    return oneOf(value, ['flex']);
+                }
+            },
+            align: {
+                validator (value) {
+                    return oneOf(value, ['top', 'middle', 'bottom']);
+                }
+            },
+            justify: {
+                validator (value) {
+                    return oneOf(value, ['start', 'end', 'center', 'space-around', 'space-between']);
+                }
+            },
+            gutter: {
+                type: Number,
+                default: 0
+            },
+            className: String
+        },
+        computed: {
+            classes () {
+                return [
+                    {
+                        [`${prefixCls}`]: !this.type,
+                        [`${prefixCls}-${this.type}`]: !!this.type,
+                        [`${prefixCls}-${this.type}-${this.align}`]: !!this.align,
+                        [`${prefixCls}-${this.type}-${this.justify}`]: !!this.justify,
+                        [`${this.className}`]: !!this.className
+                    }
+                ];
+            },
+            styles () {
+                let style = {};
+                if (this.gutter !== 0) {
+                    style = {
+                        marginLeft: this.gutter / -2 + 'px',
+                        marginRight: this.gutter / -2 + 'px'
+                    };
+                }
+
+                return style;
+            }
+        },
+        methods: {
+            updateGutter (val) {
+                // 这里会嵌套寻找，把 Col 里的 Row 里的 Col 也找到，所以用 兄弟找
+//                const Cols = findComponentsDownward(this, 'iCol');
+                const Col = findComponentDownward(this, 'iCol');
+                const Cols = findBrothersComponents(Col, 'iCol', false);
+                if (Cols.length) {
+                    Cols.forEach((child) => {
+                        if (val !== 0) {
+                            child.gutter = val;
+                        }
+                    });
+                }
+            }
+        },
+        watch: {
+            gutter (val) {
+                this.updateGutter(val);
+            }
+        }
+    };
+</script>