From 39311a508f44cc6174feb6da6ce90dee7c98d15d Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Tue, 29 Nov 2016 18:42:34 +0800
Subject: [PATCH] update Table

---
 src/components/table/table-body.vue |  2 +-
 src/components/table/table-head.vue |  2 +-
 src/components/table/table.vue      | 72 ++++++++++++++++++++++++++++++++++++------------------------------------
 src/styles/components/table.less    | 22 ++++++++++++++++++----
 test/routers/table.vue              | 13 +++++++++++--
 5 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/src/components/table/table-body.vue b/src/components/table/table-body.vue
index a8bc8c1..bb1f6e7 100644
--- a/src/components/table/table-body.vue
+++ b/src/components/table/table-body.vue
@@ -70,4 +70,4 @@
             }
         }
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index ecb2e98..5d26f58 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -128,4 +128,4 @@
             }
         }
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index c5f370e..9ce296e 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -1,62 +1,62 @@
 <template>
     <div :class="wrapClasses" :style="styles">
-        <div :class="classes" :style="styles">
+        <div :class="classes">
             <div :class="[prefixCls + '-title']" v-if="showSlotHeader" v-el:title><slot name="header"></slot></div>
             <div :class="[prefixCls + '-header']" v-if="showHeader" v-el:header @mousewheel="handleMouseWheel">
                 <table-head
-                        :prefix-cls="prefixCls"
-                        :style="tableStyle"
-                        :columns="cloneColumns"
-                        :obj-data="objData"
-                        :data="rebuildData"></table-head>
+                    :prefix-cls="prefixCls"
+                    :style="tableStyle"
+                    :columns="cloneColumns"
+                    :obj-data="objData"
+                    :data="rebuildData"></table-head>
             </div>
             <div :class="[prefixCls + '-body']" :style="bodyStyle" v-el:body @scroll="handleBodyScroll">
                 <table-body
-                        v-ref:tbody
-                        :prefix-cls="prefixCls"
-                        :style="tableStyle"
-                        :columns="cloneColumns"
-                        :data="rebuildData"
-                        :obj-data="objData"></table-body>
+                    v-ref:tbody
+                    :prefix-cls="prefixCls"
+                    :style="tableStyle"
+                    :columns="cloneColumns"
+                    :data="rebuildData"
+                    :obj-data="objData"></table-body>
             </div>
             <div :class="[prefixCls + '-fixed']">
                 <div :class="[prefixCls + '-fixed-header']" v-if="showHeader">
                     <table-head
-                            fixed
-                            :prefix-cls="prefixCls"
-                            :style="fixedTableStyle"
-                            :columns="leftFixedColumns"
-                            :obj-data="objData"
-                            :data="rebuildData"></table-head>
+                        fixed
+                        :prefix-cls="prefixCls"
+                        :style="fixedTableStyle"
+                        :columns="leftFixedColumns"
+                        :obj-data="objData"
+                        :data="rebuildData"></table-head>
                 </div>
                 <div :class="[prefixCls + '-fixed-body']" :style="fixedBodyStyle" v-el:fixed-body>
                     <table-body
-                            fixed
-                            :prefix-cls="prefixCls"
-                            :style="fixedTableStyle"
-                            :columns="leftFixedColumns"
-                            :data="rebuildData"
-                            :obj-data="objData"></table-body>
+                        fixed
+                        :prefix-cls="prefixCls"
+                        :style="fixedTableStyle"
+                        :columns="leftFixedColumns"
+                        :data="rebuildData"
+                        :obj-data="objData"></table-body>
                 </div>
             </div>
             <div :class="[prefixCls + '-fixed-right']">
                 <div :class="[prefixCls + '-fixed-header']" v-if="showHeader">
                     <table-head
-                            fixed
-                            :prefix-cls="prefixCls"
-                            :style="fixedRightTableStyle"
-                            :columns="rightFixedColumns"
-                            :obj-data="objData"
-                            :data="rebuildData"></table-head>
+                        fixed
+                        :prefix-cls="prefixCls"
+                        :style="fixedRightTableStyle"
+                        :columns="rightFixedColumns"
+                        :obj-data="objData"
+                        :data="rebuildData"></table-head>
                 </div>
                 <div :class="[prefixCls + '-fixed-body']" :style="fixedBodyStyle" v-el:fixed-right-body>
                     <table-body
-                            fixed
-                            :prefix-cls="prefixCls"
-                            :style="fixedRightTableStyle"
-                            :columns="rightFixedColumns"
-                            :data="rebuildData"
-                            :obj-data="objData"></table-body>
+                        fixed
+                        :prefix-cls="prefixCls"
+                        :style="fixedRightTableStyle"
+                        :columns="rightFixedColumns"
+                        :data="rebuildData"
+                        :obj-data="objData"></table-body>
                 </div>
             </div>
             <div :class="[prefixCls + '-footer']" v-if="showSlotFooter" v-el:footer><slot name="footer"></slot></div>
diff --git a/src/styles/components/table.less b/src/styles/components/table.less
index 05e3973..30378a6 100644
--- a/src/styles/components/table.less
+++ b/src/styles/components/table.less
@@ -8,7 +8,8 @@
         border-bottom: 0;
         border-right: 0;
     }
-    width: 100%;
+    width: inherit;
+    height: 100%;
     max-width: 100%;
     overflow: hidden;
     color: @text-color;
@@ -205,7 +206,8 @@
         position: absolute;
         top: 0;
         left: 0;
-        box-shadow: @shadow-right;
+        //box-shadow: @shadow-right;
+        box-shadow: 2px 0 6px -2px rgba(0, 0, 0, 0.2);
 
         &::before {
             content: '';
@@ -222,12 +224,13 @@
         top: 0;
         left: auto;
         right: 0;
-        box-shadow: @shadow-left;
+        //box-shadow: @shadow-left;
+        box-shadow: -2px 0 6px -2px rgba(0, 0, 0, 0.2);
     }
     &-fixed-header{
         overflow: hidden;
         //position: relative;
-        z-index: 3;
+        //z-index: 3;
     }
     &-fixed-body{
         overflow: hidden;
@@ -235,6 +238,17 @@
         z-index: 3;
     }
 
+    &-fixed-shadow {
+        width: 1px;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        right: 0;
+        box-shadow: @shadow-right;
+        overflow: hidden;
+        z-index: 1;
+    }
+
     &-sort{
         .sortable();
     }
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 1eb403b..981bb45 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -8,9 +8,10 @@
         <!--<i-table size="large" border stripe :columns="columns" :data="data"></i-table>-->
         <br>
         <i-table
-                width="850"
+                width="450"
+                :height="height"
                 stripe
-                border
+                :border="true"
                 highlight-row
                 :show-header="true"
                 :columns="columns"
@@ -239,6 +240,14 @@
 //                });
 //                this.data.splice(0, 1);
 //                this.columns.splice(2,1)
+//                this.data.push({
+//                    name: '梁灏2',
+//                    age: 25,
+//                    address: '北京市朝阳区',
+//                    edit: false,
+//                    tag: 'home',
+//                    action: 1
+//                })
             }, 3000);
         }
     }
--
libgit2 0.21.4