From 4b082de2220c7a574658e4775e07b5dccd983441 Mon Sep 17 00:00:00 2001
From: Sergio Crisostomo <sergiosbox@gmail.com>
Date: Fri, 16 Mar 2018 11:16:44 +0100
Subject: [PATCH 1/4] Always apply same increment to not splited panels

---
 src/components/date-picker/panel/Date/date-range.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/date-picker/panel/Date/date-range.vue b/src/components/date-picker/panel/Date/date-range.vue
index 1f0a18ca..a3f9458b 100644
--- a/src/components/date-picker/panel/Date/date-range.vue
+++ b/src/components/date-picker/panel/Date/date-range.vue
@@ -295,9 +295,7 @@
                     const otherPanel = panel === 'left' ? 'right' : 'left';
                     const otherCurrent = new Date(this[`${otherPanel}PanelDate`]);
                     otherCurrent[`set${type}`](otherCurrent[`get${type}`]() + increment);
-                    if (current[`get${type}`]() !== otherCurrent[`get${type}`]()){
-                        this[`${otherPanel}PanelDate`] = otherCurrent;
-                    }
+                    this[`${otherPanel}PanelDate`] = otherCurrent;
                 }
             },
             showYearPicker (panel) {

From 94790b84e79640bb9daaa2d30e4460a3167aba59 Mon Sep 17 00:00:00 2001
From: Sergio Crisostomo <sergiosbox@gmail.com>
Date: Fri, 16 Mar 2018 11:49:55 +0100
Subject: [PATCH 2/4] Fix type passed when no value is given for timerange

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

diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index 8d1939d9..a6220642 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -334,7 +334,7 @@
                         if (typeof val === 'string') {
                             val = parser(val, format);
                         } else if (type === 'timerange') {
-                            val = parser(val, format);
+                            val = parser(val, format).map(v => v || '');
                         } else {
                             val = val.map(date => new Date(date)); // try to parse
                             val = val.map(date => isNaN(date.getTime()) ? null : date); // check if parse passed

From 19c208d38065e17c2867b7f564ecd36c9180624b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 21 Mar 2018 10:59:23 +0800
Subject: [PATCH 3/4] Poptip add prop `popper-class`, Table update

---
 examples/routers/table.vue          | 87 ++++-------------------------
 src/components/poptip/poptip.vue    |  6 +-
 src/components/table/cell.vue       |  2 +-
 src/components/table/table-head.vue |  2 +
 src/styles/components/table.less    | 23 +++++---
 5 files changed, 32 insertions(+), 88 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index ede1ff4c..c1ecae16 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,27 +1,16 @@
 <template>
     <div>
-        <Table border ref="selection" :columns="columns4" :data="data1"></Table>
-        <Button @click="handleSetData">Set Data</Button>
-        <Button @click="handleClearData">Clear Data</Button>
-        <Button @click="handleSelectAll(true)">Set all selected</Button>
-        <Button @click="handleSelectAll(false)">Cancel all selected</Button>
-        <div style="margin:20px 0px;">
-            <Table :data="tableData1" :columns="tableColumns1"  style="width: 100%;" stripe></Table>
-            <div style="margin: 10px;overflow: hidden">
-                <div style="float: right;">
-                    <Page :total="100" show-sizer :current="1" @on-change="changePage"></Page>
-                </div>
-            </div>
-        </div>
+        <Table highlight-row ref="currentRowTable" :columns="columns3" :data="data1"></Table>
+        <Button @click="handleClearCurrentRow">Clear</Button>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                columns4: [
+                columns3: [
                     {
-                        type: 'selection',
+                        type: 'index',
                         width: 60,
                         align: 'center'
                     },
@@ -39,47 +28,6 @@
                     }
                 ],
                 data1: [
-
-                ],
-                
-                tableData1: [],
-                tableColumns1: [
-                    {
-                        title: 'Data1',
-                        key: 'data1'
-                    },
-                    {
-                        title: 'Data2',
-                        key: 'data2'
-                    },
-                    {
-                        title: 'Data3',
-                        key: 'data3'
-                    },
-                    {
-                        title: 'Data4',
-                        key: 'data4'
-                    },
-                    {
-                        title: 'Data5',
-                        key: 'data5'
-                    },
-                    {
-                        title: 'Data6',
-                        key: 'data6'
-                    },
-                ]
-            }
-        },
-        mounted(){
-            this.refreshData();
-        },
-        methods: {
-            handleSelectAll (status) {
-                this.$refs.selection.selectAll(status);
-            },
-            handleSetData () {
-                this.data1 = [
                     {
                         name: 'John Brown',
                         age: 18,
@@ -104,27 +52,12 @@
                         address: 'Ottawa No. 2 Lake Park',
                         date: '2016-10-04'
                     }
-                ];
-            },
-            handleClearData () {
-                this.data1 = [];
-            },
-            refreshData(){
-                let data = [];
-                for (let i = 0; i < 10; i++) {
-                    data.push({
-                        data1: Math.floor(Math.random () * 10000),
-                        data2: Math.floor(Math.random () * 1000000),
-                        data3: Math.floor(Math.random () * 100000000),
-                        data4: Math.floor(Math.random () * Math.random () * 10000),
-                        data5: Math.floor(Math.random () * Math.random () * 1000000),
-                        data6: Math.floor(Math.random () * Math.random () * 100000000),
-                    });
-                }
-                this.tableData1 = data;
-            },
-            changePage(){
-                this.refreshData();
+                ]
+            }
+        },
+        methods: {
+            handleClearCurrentRow () {
+                this.$refs.currentRowTable.clearCurrentRow();
             }
         }
     }
diff --git a/src/components/poptip/poptip.vue b/src/components/poptip/poptip.vue
index 862c3013..a4f68a36 100644
--- a/src/components/poptip/poptip.vue
+++ b/src/components/poptip/poptip.vue
@@ -97,6 +97,9 @@
             transfer: {
                 type: Boolean,
                 default: false
+            },
+            popperClass: {
+                type: String
             }
         },
         data () {
@@ -120,7 +123,8 @@
                 return [
                     `${prefixCls}-popper`,
                     {
-                        [`${prefixCls}-confirm`]: this.transfer && this.confirm
+                        [`${prefixCls}-confirm`]: this.transfer && this.confirm,
+                        [`${this.popperClass}`]: !!this.popperClass
                     }
                 ];
             },
diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 0cd7a533..e03247c1 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -1,6 +1,6 @@
 <template>
     <div :class="classes" ref="cell">
-        <template v-if="renderType === 'index'">{{naturalIndex + 1}}</template>
+        <template v-if="renderType === 'index'"><span>{{naturalIndex + 1}}</span></template>
         <template v-if="renderType === 'selection'">
             <Checkbox :value="checked" @click.native.stop="handleClick" @on-change="toggleSelect" :disabled="disabled"></Checkbox>
         </template>
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 5bca78ec..db111090 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -23,6 +23,8 @@
                                 v-if="isPopperShow(column)"
                                 v-model="column._filterVisible"
                                 placement="bottom"
+                                popper-class="ivu-table-popper"
+                                transfer
                                 @on-popper-hide="handleFilterHide(column._index)">
                                 <span :class="[prefixCls + '-filter']">
                                     <i class="ivu-icon ivu-icon-funnel" :class="{on: column._isFiltered}"></i>
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 725f0a74..9c91f524 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -345,15 +345,13 @@
         &-footer{
             padding: 4px;
             border-top: 1px solid @border-color-split;
-        }
-    }
-    .ivu-poptip-popper{
-        min-width: 0;
-        text-align: left;
-    }
-    thead .ivu-poptip-popper{
-        .ivu-poptip-body{
-            padding: 0;
+            overflow: hidden;
+            button:first-child{
+                float: left;
+            }
+            button:last-child{
+                float: right;
+            }
         }
     }
 
@@ -371,3 +369,10 @@
         visibility: hidden;
     }
 }
+.ivu-table-popper{
+    min-width: 0;
+    text-align: left;
+    .ivu-poptip-body{
+        padding: 0;
+    }
+}
\ No newline at end of file

From 4ad72493f6b145ea91613d2a47fac0c8b1178fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 21 Mar 2018 11:12:31 +0800
Subject: [PATCH 4/4] Revert Table demo

---
 examples/routers/table.vue | 89 +++++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 11 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index c1ecae16..0b316438 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,16 +1,27 @@
 <template>
     <div>
-        <Table highlight-row ref="currentRowTable" :columns="columns3" :data="data1"></Table>
-        <Button @click="handleClearCurrentRow">Clear</Button>
+        <Table border ref="selection" :columns="columns4" :data="data1"></Table>
+        <Button @click="handleSetData">Set Data</Button>
+        <Button @click="handleClearData">Clear Data</Button>
+        <Button @click="handleSelectAll(true)">Set all selected</Button>
+        <Button @click="handleSelectAll(false)">Cancel all selected</Button>
+        <div style="margin:20px 0px;">
+            <Table :data="tableData1" :columns="tableColumns1"  style="width: 100%;" stripe></Table>
+            <div style="margin: 10px;overflow: hidden">
+                <div style="float: right;">
+                    <Page :total="100" show-sizer :current="1" @on-change="changePage"></Page>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                columns3: [
+                columns4: [
                     {
-                        type: 'index',
+                        type: 'selection',
                         width: 60,
                         align: 'center'
                     },
@@ -28,6 +39,47 @@
                     }
                 ],
                 data1: [
+
+                ],
+
+                tableData1: [],
+                tableColumns1: [
+                    {
+                        title: 'Data1',
+                        key: 'data1'
+                    },
+                    {
+                        title: 'Data2',
+                        key: 'data2'
+                    },
+                    {
+                        title: 'Data3',
+                        key: 'data3'
+                    },
+                    {
+                        title: 'Data4',
+                        key: 'data4'
+                    },
+                    {
+                        title: 'Data5',
+                        key: 'data5'
+                    },
+                    {
+                        title: 'Data6',
+                        key: 'data6'
+                    },
+                ]
+            }
+        },
+        mounted(){
+            this.refreshData();
+        },
+        methods: {
+            handleSelectAll (status) {
+                this.$refs.selection.selectAll(status);
+            },
+            handleSetData () {
+                this.data1 = [
                     {
                         name: 'John Brown',
                         age: 18,
@@ -52,13 +104,28 @@
                         address: 'Ottawa No. 2 Lake Park',
                         date: '2016-10-04'
                     }
-                ]
-            }
-        },
-        methods: {
-            handleClearCurrentRow () {
-                this.$refs.currentRowTable.clearCurrentRow();
+                ];
+            },
+            handleClearData () {
+                this.data1 = [];
+            },
+            refreshData(){
+                let data = [];
+                for (let i = 0; i < 10; i++) {
+                    data.push({
+                        data1: Math.floor(Math.random () * 10000),
+                        data2: Math.floor(Math.random () * 1000000),
+                        data3: Math.floor(Math.random () * 100000000),
+                        data4: Math.floor(Math.random () * Math.random () * 10000),
+                        data5: Math.floor(Math.random () * Math.random () * 1000000),
+                        data6: Math.floor(Math.random () * Math.random () * 100000000),
+                    });
+                }
+                this.tableData1 = data;
+            },
+            changePage(){
+                this.refreshData();
             }
         }
     }
-</script>
+</script>
\ No newline at end of file