From 2dd2c793652b1d1b16ac76099ba82945496d83d4 Mon Sep 17 00:00:00 2001
From: FuryBean <furybean@users.noreply.github.com>
Date: Fri, 9 Dec 2016 16:08:49 +0800
Subject: [PATCH] Table: fix a style bug when fixed=right. (#1651)

---
 packages/table/src/table.vue         | 5 ++++-
 packages/theme-default/src/table.css | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue
index ac7b4229b..c39bb966b 100644
--- a/packages/table/src/table.vue
+++ b/packages/table/src/table.vue
@@ -67,7 +67,7 @@
       :style="{
         width: layout.rightFixedWidth ? layout.rightFixedWidth + 'px' : '',
         height: layout.viewportHeight ? layout.viewportHeight + 'px' : '',
-        right: layout.scrollY ? layout.gutterWidth + 'px' : ''
+        right: layout.scrollY ? (border ? layout.gutterWidth : (layout.gutterWidth || 1)) + 'px' : '' 
       }">
       <div class="el-table__fixed-header-wrapper" ref="rightFixedHeaderWrapper" v-if="showHeader">
         <table-header
@@ -93,6 +93,9 @@
         </table-body>
       </div>
     </div>
+    <div class="el-table__fixed-right-patch" 
+      v-if="rightFixedColumns.length > 0"
+      :style="{ width: layout.scrollY ? layout.gutterWidth + 'px' : '0', height: layout.headerHeight + 'px' }"></div>
     <div class="el-table__column-resize-proxy" ref="resizeProxy" v-show="resizeProxyVisible"></div>
   </div>
 </template>
diff --git a/packages/theme-default/src/table.css b/packages/theme-default/src/table.css
index d9d0ce707..df4bb18ff 100644
--- a/packages/theme-default/src/table.css
+++ b/packages/theme-default/src/table.css
@@ -154,6 +154,14 @@
       }
     }
 
+    @e fixed-right-patch {
+      position: absolute;
+      top: -1px;
+      right: 0;
+      background-color: var(--table-header-background);
+      border-bottom: 1px solid var(--table-border-color);
+    }
+
     @e fixed-right {
       top: 0;
       left: auto;