From 3ef4dfb9ef0717e104bb0390fc6d81f4049ba069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 25 Nov 2016 22:51:50 +0800
Subject: [PATCH] update Table

update Table
---
 src/components/table/cell.vue         | 26 ++++++++++++++--
 src/components/table/table-body.vue   |  4 ++-
 src/components/table/table-column.vue | 21 -------------
 src/components/table/table-head.vue   |  2 +-
 src/components/table/table.vue        | 45 +++++++++++++++++----------
 src/styles/components/table.less      |  5 ++-
 test/routers/table.vue                | 11 ++++---
 7 files changed, 68 insertions(+), 46 deletions(-)
 delete mode 100644 src/components/table/table-column.vue

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 1fa8a1fb..15be5a74 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -1,16 +1,23 @@
 <template>
-    <div :class="[prefixCls + '-cell']">
+    <div :class="classes">
         <template v-if="renderType === 'index'">{{index + 1}}</template>
+        <template v-if="renderType === 'selection'">
+            <Checkbox :checked="checked" @on-change="toggleSelect(index)"></Checkbox>
+        </template>
         <template v-if="renderType === 'normal'">{{{ row[column.key] }}}</template>
     </div>
 </template>
 <script>
+    import Checkbox from '../checkbox/checkbox.vue';
+
     export default {
+        components: { Checkbox },
         props: {
             prefixCls: String,
             row: Object,
             column: Object,
-            index: Number
+            index: Number,
+            checked: Boolean
         },
         data () {
             return {
@@ -18,6 +25,16 @@
                 uid: -1
             }
         },
+        computed: {
+            classes () {
+                return [
+                    `${this.prefixCls}-cell`,
+                    {
+                        [`${this.prefixCls}-hidden`]: this.column.fixed && (this.column.fixed === 'left' || this.column.fixed === 'right')
+                    }
+                ]
+            }
+        },
         methods: {
             compile () {
                 if (this.column.render) {
@@ -41,11 +58,16 @@
                         this.$parent.$parent.$children[i].$destroy();
                     }
                 }
+            },
+            toggleSelect (index) {
+                this.$parent.toggleSelect(index);
             }
         },
         compiled () {
             if (this.column.type === 'index') {
                 this.renderType = 'index';
+            } else if (this.column.type === 'selection') {
+                this.renderType = 'selection';
             } else if (this.column.render) {
                 this.renderType = 'render';
             } else {
diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index a0f797dd..080ffc4f 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -1,5 +1,7 @@
 <template>
-    
+    <table cellspacing="0" cellpadding="0" border="0">
+
+    </table>
 </template>
 <script>
     export default {
diff --git a/src/components/table/table-column.vue b/src/components/table/table-column.vue
deleted file mode 100644
index a0f797dd..00000000
--- a/src/components/table/table-column.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-    
-</template>
-<script>
-    export default {
-        props: {
-        
-        },
-        data () {
-            return {
-            
-            }
-        },
-        computed: {
-        
-        },
-        methods: {
-        
-        }
-    }
-</script>
\ No newline at end of file
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 7c831512..7761338e 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -2,7 +2,7 @@
     <thead>
         <tr>
             <th v-for="column in columns" :class="alignCls(column)">
-                <div :class="[prefixCls + '-cell']">
+                <div :class="[prefixCls + '-cell', {[prefixCls + '-hidden']: column.fixed && (column.fixed === 'left' || column.fixed === 'right')}]">
                     <template v-if="column.type === 'selection'"><Checkbox :checked="isSelectAll" @on-change="selectAll"></Checkbox></template>
                     <template v-else>{{{ renderHeader(column, $index) }}}</template>
                 </div>
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index a1bb4d03..33a96cb6 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -13,7 +13,7 @@
                     :columns="cloneColumns"></thead>
             </table>
         </div>
-        <div :class="[prefixCls + '-body']" :style="bodyStyle" @scroll="handleBodyScroll">
+        <div :class="[prefixCls + '-body']" :style="bodyStyle" v-el:body @scroll="handleBodyScroll">
             <table cellspacing="0" cellpadding="0" border="0" :style="tableStyle" v-el:tbody>
                 <colgroup>
                     <col v-for="column in cloneColumns" :width="setCellWidth(column, $index)">
@@ -26,26 +26,28 @@
                         @mouseleave.stop="handleMouseOut(index)"
                         @click.stop="highlightCurrentRow(index)">
                         <td v-for="column in cloneColumns" :class="alignCls(column)">
-                            <div :class="[prefixCls + '-cell']" v-if="column.type === 'selection'">
-                                <Checkbox :checked="cloneData[index] && cloneData[index]._isChecked" @on-change="toggleSelect(index)"></Checkbox>
-                            </div>
-                            <Cell v-else :prefix-cls="prefixCls" :row="row" :column="column" :index="index"></Cell>
-                            <!--<div :class="[prefixCls + '-cell']" v-else>-->
-                                <!--{{{ renderRow(row, column, index) }}}-->
-                            <!--</div>-->
-                            <!--<div :class="[prefixCls + '-cell']">-->
-                                <!--<template v-if="column.type === 'selection'">-->
-                                    <!--<Checkbox :checked="cloneData[index] && cloneData[index]._isChecked" @on-change="toggleSelect(index)"></Checkbox>-->
-                                <!--</template>-->
-                                <!--<template v-else>{{{ renderRow(row, column, index) }}}</template>-->
-                            <!--</div>-->
+                            <Cell
+                                :prefix-cls="prefixCls"
+                                :row="row"
+                                :column="column"
+                                :index="index"
+                                :checked="cloneData[index] && cloneData[index]._isChecked"></Cell>
                         </td>
                     </tr>
                 </tbody>
             </table>
         </div>
         <div :class="[prefixCls + '-fixed']">
+            <table cellspacing="0" cellpadding="0" border="0">
+                <colgroup>
+                    <col v-for="column in leftFixedColumns" :width="setCellWidth(column, $index)">
+                </colgroup>
+                <tbody :class="[prefixCls + '-tbody']">
+                    <tr>
 
+                    </tr>
+                </tbody>
+            </table>
         </div>
         <div :class="[prefixCls + '-fixed-right']">
 
@@ -82,6 +84,9 @@
                     return oneOf(value, ['small', 'large']);
                 }
             },
+            width: {
+                type: [Number, String]
+            },
             height: {
                 type: [Number, String]
             },
@@ -141,6 +146,7 @@
             styles () {
                 let style = {};
                 if (!!this.height) style.height = `${this.height}px`;
+                if (!!this.width) style.width = `${this.width}px`;
                 return style;
             },
             tableStyle () {
@@ -277,8 +283,15 @@
 
                 // todo 固定时上下滚动，固定的表头也滚动 scrollTop
             },
-            handleMouseWheel () {
-                console.log(111)
+            handleMouseWheel (event) {
+                const deltaX = event.deltaX;
+                const $body = this.$els.body;
+
+                if (deltaX > 0) {
+                    $body.scrollLeft = $body.scrollLeft + 10;
+                } else {
+                    $body.scrollLeft = $body.scrollLeft - 10;
+                }
             }
         },
         compiled () {
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index ba86218e..ff102ed4 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -10,7 +10,7 @@
     border: 1px solid @border-color-base;
     border-bottom: 0;
     border-right: 0;
-    border-collapse: collapse;
+    //border-collapse: collapse;
     box-sizing: border-box;
     position: relative;
 
@@ -130,6 +130,9 @@
         word-break: break-all;
         box-sizing: border-box;
     }
+    &-hidden{
+        visibility: hidden;
+    }
     th &-cell{
         display: inline-block;
         position: relative;
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 7be2d62d..c27ad4c9 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -8,9 +8,8 @@
         <!--<i-table size="large" border stripe :columns="columns" :data="data"></i-table>-->
         <br>
         <i-table
-                style="width:450px"
+                width="450"
                 border
-                highlight-row
                 :columns="columns"
                 :data="data"
                 :row-class-name="rowClsName"
@@ -37,6 +36,10 @@
                         type: 'selection',
                         width: 50
                     },
+                    {
+                        type: 'index',
+                        width: 50
+                    },
                     {
                         title: '姓名',
                         key: 'name',
@@ -48,7 +51,7 @@
                         title: '年龄',
                         key: 'age',
                         align: 'right',
-                        fixed: 'left',
+//                        fixed: 'left',
                         width: 100
 //                        render (row) {
 //                            return `<i-button>${row.age}</i-button>`
@@ -151,7 +154,7 @@
 //                    address: '北京市东城区2',
 //                    edit: false
 //                });
-                this.data.splice(1, 1)
+//                this.data.splice(1, 1)
             }, 1000);
         }
     }