From e25070eb84ced97269b66032ccde9c3251ba8696 Mon Sep 17 00:00:00 2001
From: huanghong <huanghong1125@126.com>
Date: Wed, 21 Mar 2018 21:03:32 +0800
Subject: [PATCH] fixed #2871

---
 examples/routers/table.vue     | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/components/table/table.vue |  31 +++++++++++++++++++++++++++++--
 2 files changed, 145 insertions(+), 3 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index e4fba36..cc5cce7 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -15,7 +15,7 @@
             <Table  :width='600' border :columns="columns2" :data="data3"></Table>
         </div>
         <div style='margin:20px 0px'>
-            <Table  :width='600' :height='200' border :columns="columns2" :data="data3"></Table>
+            <Table  :width='600' :height='200' border :columns="columns2" :data="data31"></Table>
         </div>
         <div style='margin:20px 0px;'>
             Table scrolling <i-switch v-model="fixedHeader" style="margin-right: 5px"></i-switch>
@@ -150,9 +150,124 @@
                         province: 'Canada',
                         city: 'Ottawa',
                         zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    }
+                ],
+                data31: [
+                    {
+                        name: 'John Brown',
+                        age: 18,
+                        address: 'New York No. 1 Lake Park',
+                        province: 'America',
+                        city: 'New York',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jim Green',
+                        age: 24,
+                        address: 'Washington, D.C. No. 1 Lake Park',
+                        province: 'America',
+                        city: 'Washington, D.C.',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Joe Black',
+                        age: 30,
+                        address: 'Sydney No. 1 Lake Park',
+                        province: 'Australian',
+                        city: 'Sydney',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jim Green',
+                        age: 24,
+                        address: 'Washington, D.C. No. 1 Lake Park',
+                        province: 'America',
+                        city: 'Washington, D.C.',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Joe Black',
+                        age: 30,
+                        address: 'Sydney No. 1 Lake Park',
+                        province: 'Australian',
+                        city: 'Sydney',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jim Green',
+                        age: 24,
+                        address: 'Washington, D.C. No. 1 Lake Park',
+                        province: 'America',
+                        city: 'Washington, D.C.',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Joe Black',
+                        age: 30,
+                        address: 'Sydney No. 1 Lake Park',
+                        province: 'Australian',
+                        city: 'Sydney',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
                     }
                 ],
                 
+                
                 fixedHeader: false,
                 tableData1: [],
                 tableColumns1: [
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index d8c62b9..19c49a7 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -47,7 +47,8 @@
                         :columns-width="columnsWidth"
                         :data="rebuildData"></table-head>
                 </div>
-                <div :class="[prefixCls + '-fixed-body']" :style="fixedBodyStyle" ref="fixedBody">
+                <div :class="[prefixCls + '-fixed-body']" :style="fixedBodyStyle" ref="fixedBody" 
+                    @wheel="handleFixedMousewheel">
                     <table-body
                         fixed="left"
                         :prefix-cls="prefixCls"
@@ -69,7 +70,8 @@
                         :columns-width="columnsWidth"
                         :data="rebuildData"></table-head>
                 </div>
-                <div :class="[prefixCls + '-fixed-body']" :style="fixedBodyStyle" ref="fixedRightBody">
+                <div :class="[prefixCls + '-fixed-body']" :style="fixedBodyStyle" ref="fixedRightBody"
+                    @wheel="handleFixedMousewheel">
                     <table-body
                         fixed="right"
                         :prefix-cls="prefixCls"
@@ -539,6 +541,31 @@
                 if (this.isRightFixed) this.$refs.fixedRightBody.scrollTop = event.target.scrollTop;
                 this.hideColumnFilter();
             },
+            handleFixedMousewheel(event) {
+                const deltaY = event.deltaY;
+                const body = this.$refs.body;
+                const currentScrollTop = body.scrollTop;
+                if (deltaY < 0 && currentScrollTop !== 0) {
+                    event.preventDefault();
+                }
+                if (deltaY > 0 && body.scrollHeight - body.clientHeight > currentScrollTop) {
+                    event.preventDefault();
+                }
+                //body.scrollTop += deltaY;
+                let step = 0;
+                let timeId = setInterval(()=>{
+                    step+=10;
+                    if(deltaY>0){
+                        body.scrollTop += 10;
+                    }
+                    else{
+                        body.scrollTop += -10;
+                    }
+                    if(step>=Math.abs(deltaY)){
+                        clearInterval(timeId);
+                    }
+                } , 20);
+            },
             handleMouseWheel (event) {
                 const deltaX = event.deltaX;
                 const $body = this.$refs.body;
--
libgit2 0.21.4