From 195d4af514b1f5f17f053b581fc3a2f1d9497a9a Mon Sep 17 00:00:00 2001
From: Rui Ma <xjmarui@gmail.com>
Date: Mon, 15 May 2017 15:59:23 +0800
Subject: [PATCH 01/15] click transfer's title to toggle select status

---
 src/components/transfer/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index 3e12bdf5..e211d5cb 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -2,7 +2,7 @@
     <div :class="classes" :style="style">
         <div :class="prefixCls + '-header'">
             <Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
-            <span>{{ title }}</span>
+            <span @click="toggleSelectAll(!checkedAll)">{{ title }}</span>
             <span :class="prefixCls + '-header-count'">{{ count }}</span>
         </div>
         <div :class="bodyClasses">

From de997724fab683819c9da9e29ee1ff5f478d5235 Mon Sep 17 00:00:00 2001
From: Haven <baoyx007@gmail.com>
Date: Wed, 24 May 2017 00:02:58 +0800
Subject: [PATCH 02/15] Update button.less
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当页面上 button 太多时， transform: translate3d(0, 0, 0)会降低性能，所以删除
---
 src/styles/mixins/button.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/mixins/button.less b/src/styles/mixins/button.less
index c6dd9f5e..b99e852b 100644
--- a/src/styles/mixins/button.less
+++ b/src/styles/mixins/button.less
@@ -133,7 +133,7 @@
     line-height: @line-height-base;
     user-select: none;
     .button-size(@btn-padding-base; @btn-font-size; @btn-border-radius);
-    transform: translate3d(0, 0, 0);
+    //transform: translate3d(0, 0, 0);
     //transition: all @transition-time linear;
     transition: color @transition-time linear, background-color @transition-time linear, border @transition-time linear;
 

From 922145732fa53523adf65736a886009bf66b692b Mon Sep 17 00:00:00 2001
From: WJD <785724102@qq.com>
Date: Thu, 25 May 2017 17:30:02 +0800
Subject: [PATCH 03/15] Update Select.vue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加单选下拉的值为 null 时，不清空框内文字的情况
---
 src/components/select/select.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index bcda26e8..a14fe109 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -155,6 +155,8 @@
                     if (!this.model.length) {
                         status = true;
                     }
+                } else if( this.model === null){
+                    status = true;
                 }
 
                 return status;

From 3239ed9819d669d6c5739996a56e4801e2145bf1 Mon Sep 17 00:00:00 2001
From: renhang <renhang@pindou.com>
Date: Thu, 25 May 2017 18:32:59 +0800
Subject: [PATCH 04/15] backTop

---
 src/components/back-top/back-top.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/back-top/back-top.vue b/src/components/back-top/back-top.vue
index 4ea7cfbb..482397d7 100644
--- a/src/components/back-top/back-top.vue
+++ b/src/components/back-top/back-top.vue
@@ -67,7 +67,8 @@
                 this.backTop = window.pageYOffset >= this.height;
             },
             back () {
-                scrollTop(window, document.body.scrollTop, 0, this.duration);
+                let scrollTop = document.documentElement.scrollTop||document.body.scrollTop;
+                scrollTop(window, scrollTop, 0, this.duration);
                 this.$emit('on-click');
             }
         }

From 4b19f87edf5bf65b42022e75bb4cf1731f355fed Mon Sep 17 00:00:00 2001
From: renhang <renhang@pindou.com>
Date: Thu, 25 May 2017 18:48:46 +0800
Subject: [PATCH 05/15] backTop

---
 src/components/back-top/back-top.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/back-top/back-top.vue b/src/components/back-top/back-top.vue
index 482397d7..391ccf28 100644
--- a/src/components/back-top/back-top.vue
+++ b/src/components/back-top/back-top.vue
@@ -67,8 +67,8 @@
                 this.backTop = window.pageYOffset >= this.height;
             },
             back () {
-                let scrollTop = document.documentElement.scrollTop||document.body.scrollTop;
-                scrollTop(window, scrollTop, 0, this.duration);
+                var sTop = document.documentElement.scrollTop||document.body.scrollTop;
+                scrollTop(window, sTop, 0, this.duration);
                 this.$emit('on-click');
             }
         }

From 46b95937b993e11b581e06bae7c3d9a3e40ba295 Mon Sep 17 00:00:00 2001
From: "Ilya Rumyancev (MacBook)" <explosivebit@gmail.com>
Date: Thu, 25 May 2017 14:52:00 +0300
Subject: [PATCH 06/15] Add Russ lang

Added Russian language
---
 src/locale/lang/ru-RU.js | 96 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/locale/lang/ru-RU.js

diff --git a/src/locale/lang/ru-RU.js b/src/locale/lang/ru-RU.js
new file mode 100644
index 00000000..7a2691d1
--- /dev/null
+++ b/src/locale/lang/ru-RU.js
@@ -0,0 +1,96 @@
+export default {
+    i: {
+        select: {
+            placeholder: 'Выбрать',
+            noMatch: 'Нет соответствующих данных',
+            loading: 'Загрузка'
+        },
+        table: {
+            noDataText: 'Нет данных',
+            noFilteredDataText: 'Нет данных по фильтру',
+            confirmFilter: 'Подтвердить',
+            resetFilter: 'Сброс',
+            clearFilter: 'Все'
+        },
+        datepicker: {
+            selectDate: 'Выбрать дату',
+            selectTime: 'Выбрать время',
+            startTime: 'Начальное время',
+            endTime: 'Конечное время',
+            clear: 'Очистить',
+            ok: 'OK',
+            month: '',
+            month1: 'Январь',
+            month2: 'Февраль',
+            month3: 'Март',
+            month4: 'Апрель',
+            month5: 'Май',
+            month6: 'Июнь',
+            month7: 'Июль',
+            month8: 'Август',
+            month9: 'Сентябрь',
+            month10: 'Октябрь',
+            month11: 'Ноябрь',
+            month12: 'Декабрь',
+            year: '',
+            weeks: {
+                sun: 'Вс',
+                mon: 'Пн',
+                tue: 'Вт',
+                wed: 'Ср',
+                thu: 'Чт',
+                fri: 'Пт',
+                sat: 'Сб'
+            },
+            months: {
+                m1: 'Янв',
+                m2: 'Фев',
+                m3: 'Мар',
+                m4: 'Апр',
+                m5: 'Май',
+                m6: 'Июн',
+                m7: 'Июл',
+                m8: 'Авг',
+                m9: 'Сен',
+                m10: 'Окт',
+                m11: 'Ноя',
+                m12: 'Дек'
+            }
+        },
+        transfer: {
+            titles: {
+                source: 'Источник',
+                target: 'Цель'
+            },
+            filterPlaceholder: 'Искать здесь',
+            notFoundText: 'Не Найдено'
+        },
+        modal: {
+            okText: 'OK',
+            cancelText: 'Отменить'
+        },
+        poptip: {
+            okText: 'OK',
+            cancelText: 'Отменить'
+        },
+        page: {
+            prev: 'Пред. страница',
+            next: 'След. страница',
+            total: 'Всего',
+            item: 'пункт',
+            items: 'пункты',
+            prev5: 'Пред. 5 страниц',
+            next5: 'След. 5 страниц',
+            page: '/page',
+            goto: 'Идти к',
+            p: ''
+        },
+        rate: {
+            star: 'Звезда',
+            stars: 'Звезды'
+        },
+        tree: {
+            emptyText: 'Нет данных'
+        }
+    }
+};
\ No newline at end of file

From 12f7b3a1e3fb46eec3cbb6bed56f3edb8221cdd4 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 09:45:05 +0800
Subject: [PATCH 07/15] update Backtop

---
 src/components/back-top/back-top.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/back-top/back-top.vue b/src/components/back-top/back-top.vue
index 391ccf28..303951d2 100644
--- a/src/components/back-top/back-top.vue
+++ b/src/components/back-top/back-top.vue
@@ -67,7 +67,7 @@
                 this.backTop = window.pageYOffset >= this.height;
             },
             back () {
-                var sTop = document.documentElement.scrollTop||document.body.scrollTop;
+                const sTop = document.documentElement.scrollTop || document.body.scrollTop;
                 scrollTop(window, sTop, 0, this.duration);
                 this.$emit('on-click');
             }

From ea9620eb9e5cd5b89b7d5326c13a854bac513778 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 10:12:27 +0800
Subject: [PATCH 08/15] update Transfer

---
 examples/routers/transfer.vue       | 2 +-
 src/components/transfer/list.vue    | 2 +-
 src/styles/components/transfer.less | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/routers/transfer.vue b/examples/routers/transfer.vue
index 9ebe3ac8..570bb863 100644
--- a/examples/routers/transfer.vue
+++ b/examples/routers/transfer.vue
@@ -178,7 +178,7 @@
                 setTimeout(function() {
                     console.log('--1');
                     // _this.data1 = null;
-                    _this.data1 = _this.getMockData1();
+//                    _this.data1 = _this.getMockData1();
                     console.log('-fetch-', _this.data1);
 
                 }, 1500);
diff --git a/src/components/transfer/list.vue b/src/components/transfer/list.vue
index 2cc7e958..12236c93 100644
--- a/src/components/transfer/list.vue
+++ b/src/components/transfer/list.vue
@@ -2,7 +2,7 @@
     <div :class="classes" :style="listStyle">
         <div :class="prefixCls + '-header'">
             <Checkbox :value="checkedAll" :disabled="checkedAllDisabled" @on-change="toggleSelectAll"></Checkbox>
-            <span @click="toggleSelectAll(!checkedAll)">{{ title }}</span>
+            <span :class="prefixCls + '-header-title'" @click="toggleSelectAll(!checkedAll)">{{ title }}</span>
             <span :class="prefixCls + '-header-count'">{{ count }}</span>
         </div>
         <div :class="bodyClasses">
diff --git a/src/styles/components/transfer.less b/src/styles/components/transfer.less
index 83c05aac..bbadb235 100644
--- a/src/styles/components/transfer.less
+++ b/src/styles/components/transfer.less
@@ -31,6 +31,10 @@
             left: 0;
             width: 100%;
 
+            &-title{
+                cursor: pointer;
+            }
+
             & > span{
                 padding-left: 4px;
             }

From 10d3a3238a25f4188466c08a6a952fe2dacff46e Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 14:00:42 +0800
Subject: [PATCH 09/15] fixed #1011

---
 examples/routers/table.vue    | 81 +++++++----------------------------
 src/components/table/cell.vue |  1 +
 2 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 14815481..23adae41 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,97 +1,48 @@
 <template>
-    <div>
-        <Table border :columns="columns7" :data="data6"></Table>
-        <Button @click="handleAdd"> + 1</Button>
-    </div>
+    <Table border :columns="columns5" :data="data5"></Table>
 </template>
 <script>
-    import abc from '../components/test.vue';
     export default {
-        components: { abc },
         data () {
             return {
-                data1: 1,
-                self: this,
-                columns7: [
+                columns5: [
+                    {
+                        title: '日期',
+                        key: 'date',
+                        sortable: true
+                    },
                     {
                         title: '姓名',
                         key: 'name',
-//                        render (row, column, index) {
-//                            return `<abc></abc>`;
-//                        }
-                        render: (h, row, column, index) => {
-                            return h('div', [
-                                h('Button',{
-                                    on: {
-                                        click: this.handleClick
-                                    }
-                                }, 'hello')
-                            ])
+                        render: (h, params) => {
+                            return h('div', params.row.name);
                         }
                     },
                     {
                         title: '年龄',
-                        key: 'age'
+                        key: 'age',
+                        sortable: true
                     },
                     {
                         title: '地址',
                         key: 'address'
-                    },
-                    {
-                        title: '操作',
-                        key: 'action',
-                        width: 150,
-                        align: 'center',
-//                        render (row, column, index) {
-//                            return `<i-button type="primary" size="small" @click="show(${index})">查看</i-button> <i-button type="error" size="small" @click="remove(${index})">删除</i-button>`;
-//                        }
                     }
                 ],
-                data6: [
+                data5: [
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居'
+                        address: '北京市朝阳区芍药居',
+                        date: '2016-10-03'
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗'
-                    },
-                    {
-                        name: '李小红',
-                        age: 30,
-                        address: '上海市浦东新区世纪大道'
-                    },
-                    {
-                        name: '周小伟',
-                        age: 26,
-                        address: '深圳市南山区深南大道'
+                        address: '北京市海淀区西二旗',
+                        date: '2016-10-01'
                     }
                 ]
             }
-        },
-        computed: {
-            ttt () {
-                return this.data1 + 1;
-            }
-        },
-        methods: {
-            show (index) {
-                this.$Modal.info({
-                    title: '用户信息',
-                    content: `姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`
-                })
-            },
-            remove (index) {
-                this.data6.splice(index, 1);
-            },
-            handleAdd () {
-                this.data1++;
-            },
-            handleClick () {
-                this.$Message.info('111')
-            }
         }
     }
 </script>
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index d6cc78f2..9368e0b3 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -55,6 +55,7 @@
                     if (Table.context) isRealRender = false;
 
                     if (isRealRender) {
+                        this.$el.innerHTML = '';
                         const component = new Vue({
                             functional: true,
                             render: (h) => {

From 67a87e8d8b591d051d1b0ef33066505497d4a834 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 16:38:40 +0800
Subject: [PATCH 10/15] fixed #1017

---
 src/components/input/input.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/input/input.vue b/src/components/input/input.vue
index 6900dc9a..83ba040a 100644
--- a/src/components/input/input.vue
+++ b/src/components/input/input.vue
@@ -37,6 +37,7 @@
             :readonly="readonly"
             :name="name"
             :value="value"
+            :autofocus="autofocus"
             @keyup.enter="handleEnter"
             @focus="handleFocus"
             @blur="handleBlur"

From df64fd36bdfbaa3e3475478e3ed554777d3c9ea1 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 26 May 2017 17:29:58 +0800
Subject: [PATCH 11/15] update styles

---
 examples/routers/notice.vue       |  2 +-
 src/styles/components/notice.less |  4 +++-
 src/styles/custom.less            | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/examples/routers/notice.vue b/examples/routers/notice.vue
index 563b46e0..aa0f4e0b 100644
--- a/examples/routers/notice.vue
+++ b/examples/routers/notice.vue
@@ -14,7 +14,7 @@
         mounted () {
             this.$Notice.config({
                 top: 150,
-                duration: 3
+                duration: 30
             });
         }
     }
diff --git a/src/styles/components/notice.less b/src/styles/components/notice.less
index 88d35eb6..651e7c4d 100644
--- a/src/styles/components/notice.less
+++ b/src/styles/components/notice.less
@@ -50,6 +50,7 @@
         white-space: nowrap;
     }
     &-with-desc &-title{
+        font-weight: bold;
         margin-bottom: 8px;
     }
     &-with-desc&-with-icon &-title{
@@ -58,7 +59,8 @@
 
     &-desc {
         font-size: 12px;
-        color: @legend-color;
+        //color: @legend-color;
+        color: @text-color;
         text-align: justify;
         line-height: 1.5;
     }
diff --git a/src/styles/custom.less b/src/styles/custom.less
index 87649eb1..3ff9d739 100644
--- a/src/styles/custom.less
+++ b/src/styles/custom.less
@@ -3,25 +3,25 @@
 @css-prefix-iconfont    : ivu-icon;
 
 // Color
-@primary-color          : #3399ff;
+@primary-color          : #2d8cf0;
 @info-color             : #2db7f5;
-@success-color          : #00cc66;
+@success-color          : #19be6b;
 @warning-color          : #ff9900;
-@error-color            : #ff3300;
-@link-color             : #3399ff;
+@error-color            : #ed3f14;
+@link-color             : #2D8cF0;
 @link-hover-color       : tint(@link-color, 20%);
 @link-active-color      : shade(@link-color, 5%);
 @selected-color         : fade(@primary-color, 90%);
 @tooltip-color          : #fff;
-@subsidiary-color       : #9ea7b4;
+@subsidiary-color       : #80848f;
 @rate-star-color        : #f5a623;
 
 // Base
 @body-background        : #fff;
 @font-family            : "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 @code-family            : Consolas,Menlo,Courier,monospace;
-@title-color            : #464c5b;
-@text-color             : #657180;
+@title-color            : #1c2438;
+@text-color             : #495060;
 @font-size-base         : 14px;
 @font-size-small        : 12px;
 @line-height-base       : 1.5;
@@ -31,16 +31,16 @@
 @cursor-disabled        : not-allowed;
 
 // Border color
-@border-color-base      : #d7dde4;  // outside
-@border-color-split     : #e3e8ee;  // inside
+@border-color-base      : #dddee1;  // outside
+@border-color-split     : #e9eaec;  // inside
 
 // Background color
 @background-color-base        : #f7f7f7;  // base
 @background-color-select-hover: @input-disabled-bg;
 @tooltip-bg                   : rgba(70, 76, 91, .9);
 @head-bg                      : #f9fafc;
-@table-thead-bg               : #f5f7f9;
-@table-td-stripe-bg           : #f5f7f9;
+@table-thead-bg               : #f8f8f9;
+@table-td-stripe-bg           : #f8f8f9;
 @table-td-hover-bg            : #ebf7ff;
 @table-td-highlight-bg        : #ebf7ff;
 @menu-dark-active-bg          : #313540;
@@ -66,7 +66,7 @@
 @btn-border-radius-small: 3px;
 @btn-group-border       : shade(@primary-color, 5%);
 
-@btn-disable-color      : #c3cbd6;
+@btn-disable-color      : #bbbec4;
 @btn-disable-bg         : @background-color-base;
 @btn-disable-border     : @border-color-base;
 

From 08fd628d1f5badec33d62d12198a58a4eb4f710c Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 15:13:10 +0800
Subject: [PATCH 12/15] Table support expand

---
 examples/components/table.vue       | 101 ++++++++++++++++++++++++++++
 examples/routers/table.vue          |  92 ++++++++++++++++++++++---
 src/components/table/cell.vue       |  27 +++++++-
 src/components/table/expand.vue     |  37 ++++++++++
 src/components/table/table-body.vue |  67 ++++++++++++------
 src/components/table/table-head.vue |   3 +-
 src/components/table/table.vue      |  21 +++++-
 src/styles/components/table.less    |  29 ++++++++
 8 files changed, 339 insertions(+), 38 deletions(-)
 create mode 100644 examples/components/table.vue
 create mode 100644 src/components/table/expand.vue

diff --git a/examples/components/table.vue b/examples/components/table.vue
new file mode 100644
index 00000000..e882eb2f
--- /dev/null
+++ b/examples/components/table.vue
@@ -0,0 +1,101 @@
+<template>
+    <Table width="550" border :columns="columns2" :data="data3"></Table>
+</template>
+<script>
+    export default {
+        name: 'etable',
+        data () {
+            return {
+                columns2: [
+                    {
+                        title: '姓名',
+                        key: 'name',
+                        width: 100,
+                        fixed: 'left'
+                    },
+                    {
+                        title: '年龄',
+                        key: 'age',
+                        width: 100
+                    },
+                    {
+                        title: '省份',
+                        key: 'province',
+                        width: 100
+                    },
+                    {
+                        title: '市区',
+                        key: 'city',
+                        width: 100
+                    },
+                    {
+                        title: '地址',
+                        key: 'address',
+                        width: 200
+                    },
+                    {
+                        title: '邮编',
+                        key: 'zip',
+                        width: 100
+                    },
+                    {
+                        title: '操作',
+                        key: 'action',
+                        fixed: 'right',
+                        width: 120,
+                        render: (h, params) => {
+                            return h('div', [
+                                h('Button', {
+                                    props: {
+                                        type: 'text',
+                                        size: 'small'
+                                    }
+                                }, '查看'),
+                                h('Button', {
+                                    props: {
+                                        type: 'text',
+                                        size: 'small'
+                                    }
+                                }, '编辑')
+                            ]);
+                        }
+                    }
+                ],
+                data3: [
+                    {
+                        name: '王小明',
+                        age: 18,
+                        address: '北京市朝阳区芍药居',
+                        province: '北京市',
+                        city: '朝阳区',
+                        zip: 100000
+                    },
+                    {
+                        name: '张小刚',
+                        age: 25,
+                        address: '北京市海淀区西二旗',
+                        province: '北京市',
+                        city: '海淀区',
+                        zip: 100000
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道',
+                        province: '上海市',
+                        city: '浦东新区',
+                        zip: 100000
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道',
+                        province: '广东',
+                        city: '南山区',
+                        zip: 100000
+                    }
+                ]
+            }
+        }
+    }
+</script>
diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 23adae41..e42834af 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,21 +1,33 @@
 <template>
-    <Table border :columns="columns5" :data="data5"></Table>
+    <Table :columns="columns7" :data="data6" @on-expand="expand"></Table>
 </template>
 <script>
+    import etable from '../components/table.vue';
     export default {
+        components: { etable },
         data () {
             return {
-                columns5: [
+                columns7: [
                     {
-                        title: '日期',
-                        key: 'date',
-                        sortable: true
+                        type: 'expand',
+                        width: 50,
+                        render: (h, params) => {
+//                            return h(etable);
+                            return h('div', params.row.name)
+                        }
                     },
                     {
                         title: '姓名',
                         key: 'name',
                         render: (h, params) => {
-                            return h('div', params.row.name);
+                            return h('div', [
+                                h('Icon', {
+                                    props: {
+                                        type: 'person'
+                                    }
+                                }),
+                                h('strong', params.row.name)
+                            ]);
                         }
                     },
                     {
@@ -26,23 +38,81 @@
                     {
                         title: '地址',
                         key: 'address'
+                    },
+                    {
+                        title: '操作',
+                        key: 'action',
+                        width: 150,
+                        align: 'center',
+                        render: (h, params) => {
+                            return h('div', [
+                                h('Button', {
+                                    props: {
+                                        type: 'primary',
+                                        size: 'small'
+                                    },
+                                    style: {
+                                        marginRight: '5px'
+                                    },
+                                    on: {
+                                        click: () => {
+                                            this.show(params.index)
+                                        }
+                                    }
+                                }, '查看'),
+                                h('Button', {
+                                    props: {
+                                        type: 'error',
+                                        size: 'small'
+                                    },
+                                    on: {
+                                        click: () => {
+                                            this.remove(params.index)
+                                        }
+                                    }
+                                }, '删除')
+                            ]);
+                        }
                     }
                 ],
-                data5: [
+                data6: [
                     {
                         name: '王小明',
                         age: 18,
-                        address: '北京市朝阳区芍药居',
-                        date: '2016-10-03'
+                        address: '北京市朝阳区芍药居'
                     },
                     {
                         name: '张小刚',
                         age: 25,
-                        address: '北京市海淀区西二旗',
-                        date: '2016-10-01'
+                        address: '北京市海淀区西二旗'
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道'
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道'
                     }
                 ]
             }
+        },
+        methods: {
+            show (index) {
+                this.$Modal.info({
+                    title: '用户信息',
+                    content: `姓名：${this.data6[index].name}<br>年龄：${this.data6[index].age}<br>地址：${this.data6[index].address}`
+                })
+            },
+            remove (index) {
+                this.data6.splice(index, 1);
+            },
+            expand (row, s) {
+//                console.log(row);
+//                console.log(s);
+            }
         }
     }
 </script>
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 9368e0b3..d4dfa847 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -5,16 +5,22 @@
             <Checkbox :value="checked" @on-change="toggleSelect" :disabled="disabled"></Checkbox>
         </template>
         <template v-if="renderType === 'normal'"><span v-html="row[column.key]"></span></template>
+        <template v-if="renderType === 'expand'">
+            <div :class="expandCls" @click="toggleExpand">
+                <Icon type="ios-arrow-right"></Icon>
+            </div>
+        </template>
     </div>
 </template>
 <script>
     import Vue from 'vue';
+    import Icon from '../icon/icon.vue';
     import Checkbox from '../checkbox/checkbox.vue';
     import { findComponentUpward } from '../../utils/assist';
 
     export default {
         name: 'TableCell',
-        components: { Checkbox },
+        components: { Icon, Checkbox },
         props: {
             prefixCls: String,
             row: Object,
@@ -23,6 +29,7 @@
             index: Number,           // _index of data
             checked: Boolean,
             disabled: Boolean,
+            expanded: Boolean,
             fixed: {
                 type: [Boolean, String],
                 default: false
@@ -41,14 +48,23 @@
                     `${this.prefixCls}-cell`,
                     {
                         [`${this.prefixCls}-hidden`]: !this.fixed && this.column.fixed && (this.column.fixed === 'left' || this.column.fixed === 'right'),
-                        [`${this.prefixCls}-cell-ellipsis`]: this.column.ellipsis || false
+                        [`${this.prefixCls}-cell-ellipsis`]: this.column.ellipsis || false,
+                        [`${this.prefixCls}-cell-with-expand`]: this.renderType === 'expand'
                     }
                 ];
+            },
+            expandCls () {
+                return [
+                    `${this.prefixCls}-cell-expand`,
+                    {
+                        [`${this.prefixCls}-cell-expand-expanded`]: this.expanded
+                    }
+                ]
             }
         },
         methods: {
             compile () {
-                if (this.column.render) {
+                if (this.column.render && this.renderType === 'render') {
                     // 兼容真 Render，后期废弃旧用法
                     let isRealRender = true;
                     const Table = findComponentUpward(this, 'Table');
@@ -114,6 +130,9 @@
             },
             toggleSelect () {
                 this.$parent.$parent.toggleSelect(this.index);
+            },
+            toggleExpand () {
+                this.$parent.$parent.toggleExpand(this.index);
             }
         },
         created () {
@@ -121,6 +140,8 @@
                 this.renderType = 'index';
             } else if (this.column.type === 'selection') {
                 this.renderType = 'selection';
+            } else if (this.column.type === 'expand') {
+                this.renderType = 'expand';
             } else if (this.column.render) {
                 this.renderType = 'render';
             } else {
diff --git a/src/components/table/expand.vue b/src/components/table/expand.vue
new file mode 100644
index 00000000..fc9a11d0
--- /dev/null
+++ b/src/components/table/expand.vue
@@ -0,0 +1,37 @@
+<template>
+    <div ref="cell"></div>
+</template>
+<script>
+    import Vue from 'vue';
+    export default {
+        name: 'TableExpand',
+        props: {
+            row: Object,
+            render: Function,
+            index: Number,
+        },
+        methods: {
+            compile () {
+                if (this.render) {
+                    this.$el.innerHTML = '';
+                    const component = new Vue({
+                        functional: true,
+                        render: (h) => {
+                            return this.render(h, {
+                                row: this.row,
+                                index: this.index
+                            });
+                        }
+                    });
+                    const Cell = component.$mount();
+                    this.$refs.cell.appendChild(Cell.$el);
+                }
+            }
+        },
+        mounted () {
+            this.$nextTick(() => {
+                this.compile();
+            });
+        }
+    };
+</script>
\ No newline at end of file
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index 73dd9d8b..59e72e7b 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -4,39 +4,47 @@
             <col v-for="(column, index) in columns" :width="setCellWidth(column, index, false)">
         </colgroup>
         <tbody :class="[prefixCls + '-tbody']">
-            <tr
-                v-for="(row, index) in data"
-                :key="row"
-                :class="rowClasses(row._index)"
-                @mouseenter.stop="handleMouseIn(row._index)"
-                @mouseleave.stop="handleMouseOut(row._index)"
-                @click.stop="clickCurrentRow(row._index)"
-                @dblclick.stop="dblclickCurrentRow(row._index)">
-                <td v-for="column in columns" :class="alignCls(column, row)">
-                    <Cell
-                        :fixed="fixed"
-                        :prefix-cls="prefixCls"
-                        :row="row"
-                        :column="column"
-                        :natural-index="index"
-                        :index="row._index"
-                        :checked="rowChecked(row._index)"
-                        :disabled="rowDisabled(row._index)"
+            <template v-for="(row, index) in data">
+                <tr
+                    :key="row"
+                    :class="rowClasses(row._index)"
+                    @mouseenter.stop="handleMouseIn(row._index)"
+                    @mouseleave.stop="handleMouseOut(row._index)"
+                    @click.stop="clickCurrentRow(row._index)"
+                    @dblclick.stop="dblclickCurrentRow(row._index)">
+                    <td v-for="column in columns" :class="alignCls(column, row)">
+                        <Cell
+                            :fixed="fixed"
+                            :prefix-cls="prefixCls"
+                            :row="row"
+                            :column="column"
+                            :natural-index="index"
+                            :index="row._index"
+                            :checked="rowChecked(row._index)"
+                            :disabled="rowDisabled(row._index)"
+                            :expanded="rowExpanded(row._index)"
                         ></Cell>
-                </td>
-            </tr>
+                    </td>
+                </tr>
+                <tr v-if="rowExpanded(row._index)">
+                    <td :colspan="columns.length">
+                        <Expand :row="row" :render="expandRender" :index="row._index"></Expand>
+                    </td>
+                </tr>
+            </template>
         </tbody>
     </table>
 </template>
 <script>
     // todo :key="row"
     import Cell from './cell.vue';
+    import Expand from './expand.vue';
     import Mixin from './mixin';
 
     export default {
         name: 'TableBody',
         mixins: [ Mixin ],
-        components: { Cell },
+        components: { Cell, Expand },
         props: {
             prefixCls: String,
             styleObject: Object,
@@ -49,6 +57,20 @@
                 default: false
             }
         },
+        computed: {
+            expandRender () {
+                let render = function () {
+                    return '';
+                };
+                for (let i = 0; i < this.columns.length; i++) {
+                    const column = this.columns[i];
+                    if (column.type && column.type === 'expand') {
+                        if (column.render) render = column.render;
+                    }
+                }
+                return render;
+            }
+        },
         methods: {
             rowClasses (_index) {
                 return [
@@ -66,6 +88,9 @@
             rowDisabled(_index){
                 return this.objData[_index] && this.objData[_index]._isDisabled;
             },
+            rowExpanded(_index){
+                return this.objData[_index] && this.objData[_index]._isExpanded;
+            },
             rowClsName (_index) {
                 return this.$parent.rowClassName(this.objData[_index], _index);
             },
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 72bb50dd..aa1d69c5 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -7,7 +7,8 @@
             <tr>
                 <th v-for="(column, index) in columns" :class="alignCls(column)">
                     <div :class="cellClasses(column)">
-                        <template v-if="column.type === 'selection'"><Checkbox :value="isSelectAll" @on-change="selectAll"></Checkbox></template>
+                        <template v-if="column.type === 'expand'"></template>
+                        <template v-else-if="column.type === 'selection'"><Checkbox :value="isSelectAll" @on-change="selectAll"></Checkbox></template>
                         <template v-else>
                             <span v-html="renderHeader(column, index)"></span>
                             <span :class="[prefixCls + '-sort']" v-if="column.sortable">
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index d8d5b5fe..c86a49c2 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -404,6 +404,18 @@
                 }
                 this.$emit('on-selection-change', selection);
             },
+            toggleExpand (_index) {
+                let data = {};
+
+                for (let i in this.objData) {
+                    if (parseInt(i) === _index) {
+                        data = this.objData[i];
+                    }
+                }
+                const status = !data._isExpanded;
+                this.objData[_index]._isExpanded = status;
+                this.$emit('on-expand', JSON.parse(JSON.stringify(this.cloneData[_index])), status);
+            },
             selectAll (status) {
                 // this.rebuildData.forEach((data) => {
                 //     if(this.objData[data._index]._isDisabled){
@@ -581,9 +593,9 @@
                 this.data.forEach((row, index) => {
                     const newRow = deepCopy(row);// todo 直接替换
                     newRow._isHover = false;
-                    if(newRow._disabled){
+                    if (newRow._disabled) {
                         newRow._isDisabled = newRow._disabled;
-                    }else{
+                    } else {
                         newRow._isDisabled = false;
                     }
                     if (newRow._checked) {
@@ -591,6 +603,11 @@
                     } else {
                         newRow._isChecked = false;
                     }
+                    if (newRow._expanded) {
+                        newRow._isExpanded = newRow._expanded;
+                    } else {
+                        newRow._isExpanded = false;
+                    }
                     if (newRow._highlight) {
                         newRow._isHighlight = newRow._highlight;
                     } else {
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 576deb5c..4507ac72 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -145,6 +145,24 @@
             overflow: hidden;
             text-overflow: ellipsis;
         }
+
+        &-with-expand{
+            height: 47px;
+            line-height: 47px;
+            padding: 0;
+            text-align: center;
+        }
+
+        &-expand{
+            cursor: pointer;
+            transition: transform @transition-time @ease-in-out;
+            i{
+                font-size: @font-size-base;
+            }
+            &-expanded{
+                transform: rotate(90deg);
+            }
+        }
     }
     &-hidden{
         visibility: hidden;
@@ -184,6 +202,13 @@
             height: 60px;
             line-height: 60px;
         }
+        .@{table-prefix-cls}-cell-with-expand{
+            height: 59px;
+            line-height: 59px;
+            i{
+                font-size: @font-size-base+2;
+            }
+        }
     }
 
     &-small{
@@ -197,6 +222,10 @@
             height: 40px;
             line-height: 40px;
         }
+        .@{table-prefix-cls}-cell-with-expand{
+            height: 39px;
+            line-height: 39px;
+        }
     }
 
     &-row-highlight,

From af6e81cd6484794b9aef7db0068715cb54fd4e9f Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 16:19:28 +0800
Subject: [PATCH 13/15] update Table

---
 src/components/table/cell.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index d4dfa847..50f5a3b3 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -59,7 +59,7 @@
                     {
                         [`${this.prefixCls}-cell-expand-expanded`]: this.expanded
                     }
-                ]
+                ];
             }
         },
         methods: {

From 367a4196a4e1e997fbdd9e5215ae6db3a2344a15 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 16:32:51 +0800
Subject: [PATCH 14/15] update Table

---
 examples/routers/table.vue          | 2 +-
 src/components/table/table-body.vue | 2 +-
 src/styles/components/table.less    | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index e42834af..3a1ac41c 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,5 +1,5 @@
 <template>
-    <Table :columns="columns7" :data="data6" @on-expand="expand"></Table>
+    <Table border :columns="columns7" :data="data6" @on-expand="expand"></Table>
 </template>
 <script>
     import etable from '../components/table.vue';
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index 59e72e7b..ae66e9ed 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -27,7 +27,7 @@
                     </td>
                 </tr>
                 <tr v-if="rowExpanded(row._index)">
-                    <td :colspan="columns.length">
+                    <td :colspan="columns.length" :class="prefixCls + '-expanded-cell'">
                         <Expand :row="row" :render="expandRender" :index="row._index"></Expand>
                     </td>
                 </tr>
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 4507ac72..556ac2e9 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -174,6 +174,11 @@
         vertical-align: middle;
     }
 
+    td&-expanded-cell{
+        padding: 20px 50px;
+        background: @table-thead-bg;
+    }
+
     &-stripe &-body,
     &-stripe &-fixed-body
     {

From d6070b23577d6fdea295aa3008e48925a7df6d54 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Sat, 27 May 2017 18:09:57 +0800
Subject: [PATCH 15/15] update Table

---
 examples/routers/table.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 3a1ac41c..6f52f0c1 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -89,7 +89,8 @@
                     {
                         name: '李小红',
                         age: 30,
-                        address: '上海市浦东新区世纪大道'
+                        address: '上海市浦东新区世纪大道',
+                        _expanded: true
                     },
                     {
                         name: '周小伟',