From 1ba90b9534140ac253234503e56ef454a7d49fcc Mon Sep 17 00:00:00 2001
From: Black  Wayne <451578533@qq.com>
Date: Fri, 22 Sep 2017 14:30:44 +0800
Subject: [PATCH] Table: add chalk theme (#7059)

* Table: add chalk theme

* Table: add group header & other

* Table: del package.lock

* Table: del single test trace

* Table: fix border problem

* Table: fix boder problem

* Table: clean css

* Table: footer border right - -|
---
 examples/docs/en-US/table.md                  |   9 -
 examples/docs/zh-CN/table.md                  |   7 -
 packages/table/src/table-footer.js            |   8 +-
 packages/table/src/table-header.js            |  19 +-
 packages/table/src/table.vue                  |  25 +-
 packages/theme-chalk/src/common/var.scss      |   5 +-
 .../theme-chalk/src/fonts/element-icons.ttf   | Bin 9588 -> 9736 bytes
 .../theme-chalk/src/fonts/element-icons.woff  | Bin 5660 -> 5748 bytes
 packages/theme-chalk/src/icon.scss            |   8 +-
 packages/theme-chalk/src/mixins/mixins.scss   |   8 +-
 packages/theme-chalk/src/table-column.scss    |  10 +-
 packages/theme-chalk/src/table.scss           | 409 ++++++++++--------
 12 files changed, 280 insertions(+), 228 deletions(-)

diff --git a/examples/docs/en-US/table.md b/examples/docs/en-US/table.md
index e26a3f554..e6699e113 100644
--- a/examples/docs/en-US/table.md
+++ b/examples/docs/en-US/table.md
@@ -561,7 +561,6 @@ When there are too many rows, you can use a fixed header.
   <el-table
     :data="tableData3"
     height="250"
-    border
     style="width: 100%">
     <el-table-column
       prop="date"
@@ -629,7 +628,6 @@ When there are too many columns, you can fix some of them.
 <template>
   <el-table
     :data="tableData"
-    border
     style="width: 100%">
     <el-table-column
       fixed
@@ -732,7 +730,6 @@ When you have huge chunks of data to put in a table, you can fix the header and
 <template>
   <el-table
     :data="tableData3"
-    border
     style="width: 100%"
     height="250">
     <el-table-column
@@ -839,7 +836,6 @@ When the the data is dynamically changed, you might want the table to have a max
 <template>
   <el-table
     :data="tableData4"
-    border
     style="width: 100%"
     max-height="250">
     <el-table-column
@@ -964,7 +960,6 @@ When the data structure is complex, you can use group header to show the data hi
 <template>
   <el-table
     :data="tableData3"
-    border
     style="width: 100%">
     <el-table-column
       prop="date"
@@ -1150,7 +1145,6 @@ You can also select multiple rows.
   <el-table
     ref="multipleTable"
     :data="tableData3"
-    border
     style="width: 100%"
     @selection-change="handleSelectionChange">
     <el-table-column
@@ -1244,7 +1238,6 @@ Sort the data to find or compare data quickly.
 <template>
   <el-table
     :data="tableData"
-    border
     :default-sort = "{prop: 'date', order: 'descending'}"
     style="width: 100%">
     <el-table-column
@@ -1308,7 +1301,6 @@ Filter the table to find desired data.
 <template>
   <el-table
     :data="tableData"
-    border
     style="width: 100%">
     <el-table-column
       prop="date"
@@ -1390,7 +1382,6 @@ Customize table column so it can be integrated with other components.
 <template>
   <el-table
     :data="tableData"
-    border
     style="width: 100%">
     <el-table-column
       label="Date"
diff --git a/examples/docs/zh-CN/table.md b/examples/docs/zh-CN/table.md
index 8ad9d6c55..1c8f67662 100644
--- a/examples/docs/zh-CN/table.md
+++ b/examples/docs/zh-CN/table.md
@@ -769,7 +769,6 @@
 <template>
   <el-table
     :data="tableData3"
-    border
     style="width: 100%"
     height="250">
     <el-table-column
@@ -876,7 +875,6 @@
 <template>
   <el-table
     :data="tableData4"
-    border
     style="width: 100%"
     max-height="250">
     <el-table-column
@@ -1001,7 +999,6 @@
 <template>
   <el-table
     :data="tableData3"
-    border
     style="width: 100%">
     <el-table-column
       prop="date"
@@ -1187,7 +1184,6 @@
   <el-table
     ref="multipleTable"
     :data="tableData3"
-    border
     tooltip-effect="dark"
     style="width: 100%"
     @selection-change="handleSelectionChange">
@@ -1282,7 +1278,6 @@
 <template>
   <el-table
     :data="tableData"
-    border
     style="width: 100%"
     :default-sort = "{prop: 'date', order: 'descending'}"
     >
@@ -1348,7 +1343,6 @@
 <template>
   <el-table
     :data="tableData"
-    border
     style="width: 100%">
     <el-table-column
       prop="date"
@@ -1430,7 +1424,6 @@
 <template>
   <el-table
     :data="tableData"
-    border
     style="width: 100%">
     <el-table-column
       label="日期"
diff --git a/packages/table/src/table-footer.js b/packages/table/src/table-footer.js
index 39bb8eda4..3c17a02b8 100644
--- a/packages/table/src/table-footer.js
+++ b/packages/table/src/table-footer.js
@@ -53,7 +53,7 @@ export default {
               : ''
           }
         </colgroup>
-        <tbody>
+        <tbody class={ [{ 'has-gutter': this.hasGutter }] }>
           <tr>
           {
             this._l(this.columns, (column, cellIndex) =>
@@ -70,7 +70,7 @@ export default {
             )
           }
           {
-            !this.fixed && this.layout.gutterWidth
+            this.hasGutter
               ? <td class="gutter" style={{ width: this.layout.scrollY ? this.layout.gutterWidth + 'px' : '0' }}></td>
               : ''
           }
@@ -121,6 +121,10 @@ export default {
 
     columns() {
       return this.store.states.columns;
+    },
+
+    hasGutter() {
+      return !this.fixed && this.layout.gutterWidth;
     }
   },
 
diff --git a/packages/table/src/table-header.js b/packages/table/src/table-header.js
index 4d524166c..7d2afe38b 100644
--- a/packages/table/src/table-header.js
+++ b/packages/table/src/table-header.js
@@ -68,6 +68,9 @@ export default {
   render(h) {
     const originColumns = this.store.states.originColumns;
     const columnRows = convertToRows(originColumns, this.columns);
+    // 是否拥有多级表头
+    const isGroup = columnRows.length > 1;
+    if (isGroup) this.$parent.isGroup = true;
 
     return (
       <table
@@ -89,7 +92,7 @@ export default {
               : ''
           }
         </colgroup>
-        <thead>
+        <thead class={ [{ 'is-group': isGroup, 'has-gutter': this.hasGutter }] }>
           {
             this._l(columnRows, (columns, rowIndex) =>
               <tr>
@@ -112,8 +115,12 @@ export default {
                     {
                       column.sortable
                         ? <span class="caret-wrapper" on-click={ ($event) => this.handleSortClick($event, column) }>
-                            <i class="sort-caret ascending" on-click={ ($event) => this.handleSortClick($event, column, 'ascending') }></i>
-                            <i class="sort-caret descending" on-click={ ($event) => this.handleSortClick($event, column, 'descending') }></i>
+                            <span class="sort-caret ascending" on-click={ ($event) => this.handleSortClick($event, column, 'ascending') }>
+                              <i class="el-icon-sort-up"></i>
+                            </span>
+                            <span class="sort-caret descending" on-click={ ($event) => this.handleSortClick($event, column, 'descending') }>
+                              <i class="el-icon-sort-down"></i>
+                            </span>
                           </span>
                         : ''
                     }
@@ -127,7 +134,7 @@ export default {
                 )
               }
               {
-                !this.fixed && this.layout.gutterWidth
+                this.hasGutter
                   ? <th class="gutter" style={{ width: this.layout.scrollY ? this.layout.gutterWidth + 'px' : '0' }}></th>
                   : ''
               }
@@ -183,6 +190,10 @@ export default {
 
     columns() {
       return this.store.states.columns;
+    },
+
+    hasGutter() {
+      return !this.fixed && this.layout.gutterWidth;
     }
   },
 
diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue
index d375be839..e35e41cc9 100644
--- a/packages/table/src/table.vue
+++ b/packages/table/src/table.vue
@@ -3,8 +3,9 @@
     :class="{
       'el-table--fit': fit,
       'el-table--striped': stripe,
-      'el-table--border': border,
+      'el-table--border': border || isGroup,
       'el-table--hidden': isHidden,
+      'el-table--group': isGroup,
       'el-table--fluid-height': maxHeight,
       'el-table--enable-row-hover': !store.states.isComplex,
       'el-table--enable-row-transition': (store.states.data || []).length !== 0 && (store.states.data || []).length < 100
@@ -23,6 +24,7 @@
     <div
       class="el-table__body-wrapper"
       ref="bodyWrapper"
+      :class="[`is-scroll-${scrollPosition}`]"
       :style="[bodyHeight]">
       <table-body
         :context="context"
@@ -63,7 +65,9 @@
           :layout="layout"
           :style="{ width: layout.fixedWidth ? layout.fixedWidth + 'px' : '' }"></table-header>
       </div>
-      <div class="el-table__fixed-body-wrapper" ref="fixedBodyWrapper"
+      <div
+        class="el-table__fixed-body-wrapper"
+        ref="fixedBodyWrapper"
         :style="[
           { top: layout.headerHeight + 'px' },
           fixedBodyHeight
@@ -94,7 +98,7 @@
       v-if="rightFixedColumns.length > 0"
       :style="[
         { width: layout.rightFixedWidth ? layout.rightFixedWidth + 'px' : '' },
-        { right: layout.scrollY ? (border ? layout.gutterWidth : (layout.gutterWidth || 1)) + 'px' : '' },
+        { right: layout.scrollY ? (border ? layout.gutterWidth : (layout.gutterWidth || 0)) + 'px' : '' },
         fixedHeight
       ]">
       <div class="el-table__fixed-header-wrapper" ref="rightFixedHeaderWrapper" v-if="showHeader">
@@ -249,11 +253,21 @@
       bindEvents() {
         const { headerWrapper, footerWrapper } = this.$refs;
         const refs = this.$refs;
+        let self = this;
         this.bodyWrapper.addEventListener('scroll', function() {
           if (headerWrapper) headerWrapper.scrollLeft = this.scrollLeft;
           if (footerWrapper) footerWrapper.scrollLeft = this.scrollLeft;
           if (refs.fixedBodyWrapper) refs.fixedBodyWrapper.scrollTop = this.scrollTop;
           if (refs.rightFixedBodyWrapper) refs.rightFixedBodyWrapper.scrollTop = this.scrollTop;
+          const maxScrollLeftPosition = this.scrollWidth - this.offsetWidth - 1;
+          const scrollLeft = this.scrollLeft;
+          if (scrollLeft >= maxScrollLeftPosition) {
+            self.scrollPosition = 'right';
+          } else if (scrollLeft === 0) {
+            self.scrollPosition = 'left';
+          } else {
+            self.scrollPosition = 'middle';
+          }
         });
 
         const scrollBodyWrapper = event => {
@@ -459,7 +473,10 @@
         layout,
         isHidden: false,
         renderExpanded: null,
-        resizeProxyVisible: false
+        resizeProxyVisible: false,
+        // 是否拥有多级表头
+        isGroup: false,
+        scrollPosition: 'left'
       };
     }
   };
diff --git a/packages/theme-chalk/src/common/var.scss b/packages/theme-chalk/src/common/var.scss
index 0432f1f58..60535bca1 100644
--- a/packages/theme-chalk/src/common/var.scss
+++ b/packages/theme-chalk/src/common/var.scss
@@ -467,13 +467,14 @@ $--dialog-padding-primary: 15px;
 
 /* Table
 -------------------------- */
-$--table-border-color: $--border-color-lighter;
+$--table-border:  1px solid $--border-color-lighter;
 $--table-text-color: $--color-text-regular;
 $--table-header-color: $--color-text-secondary;
 $--table-row-hover-background: $--background-color-base;
-$--table-current-row-background: $--background-color-base;
+$--table-current-row-background: $--color-primary-light-9;
 $--table-header-background: $--color-text-secondary;
 $--table-footer-background: $--color-text-placeholder;
+$--table-fixed-box-shadow: 0 0 10px rgba(0, 0, 0, .12);
 
 /* Pagination
 -------------------------- */
diff --git a/packages/theme-chalk/src/fonts/element-icons.ttf b/packages/theme-chalk/src/fonts/element-icons.ttf
index c0d50a05421966e7868f9a4836b842518b1627df..27556b343da7c7d7fd88b0b84b8511692631b29c 100644
GIT binary patch
delta 1515
zcmY+EU1%It6vzK(W@l$+cQ(y#^U=?IZ8lAsG;O}MN?ThfA!zYML6Md<n~#Si8<Mo$
zg1Bk%tMR2ceGoxYi}uAn6a#`FG58SBtPmyjAt}Ya+$UQ>s}ymwo-=n}yzrafJ!kHm
zIX81RkB8oS{#r8s0zhv7czJj-J^k?VFP{U(4ItDxHgRe6<5LT70rpeCp33o&bf)s=
zm0@1{E7L#D33oBP!t-yK=JCn7+{R$(C$6`_abY4moL*eN^$`$W=XiWFotvgpSm67+
zIBu9qPmcUEnBQ6k8VC8M>FMn3+)ID29R-rNIerBMnDeE1yk=LG9+#e21<Cwx^aL5s
zUUD`coZIp2Ux<c+1$Q4TJ}nb5KRas`%*z})FoN6M1G@)r!f&Lr)aK9Aaq99{s4mP~
z=Ue`7blbmXIC;B@_s{UK7?bH>cnz(V+gahPl<Qzef_w<qId;mg%c)M)RVr~Nr=X4m
zGY<F}S&<25UEG+7Zmw$~44d;V*NVb7&2IMqQfNUd+Ln%)dnrFI5A*0|a%K4ail+j)
z*b+-myj@jBdRJxSS;c!0WG{;MCdeKY{|N-{1IpHLM^KI?&&@%(8g3JcH!aBKRaC>R
zLwOpAV;YDnG!XC5KwPPTIIe*>p@DcO@^S$f#otAMxLN~ojRxXc4a9uz1c-NQAl{>a
zc&`THeHw`OYp_4hlR6E=^%{s9G!QpxAa2q?oYX+vtbsVC!2x!QhQB+M#0;MRs8%M=
z7d{M7Z5oIVY9MacK+I=VkTa_eX&~;@Kzu}l!)!S_3^*5z3-}B_;}LmukWSMS-JvHh
z8bihvW7(`UGv;-(5IP;24}B8av?{Ee^_8_APJ}OnZ-wvMAK2T@ht55>)g5*Jjhv0#
ziEKvqMNdRC(eJ#7chq~w`_jAT{Sk9~$A09WalT#}c1LUTa%w?e7{AMxA-lRNY$rRZ
zFW%cf&{Id%@qzyCda9|Sn?J;3^|3f#yu?*^w_D?o^}QF16UAf34ejE?tFBw)av}M(
z@i5;u{*=0@WK&CD+zvM#rk390)OU=Yq3)X6cm?In(FSkl`w=eax<7KQhM-hMB4+Gb
z2#UFdXe^P46<>`dbWy8dtjZ6^H3nR=)`}~|Zzt$3Z5Zc@TSjVZ`y}zdxN-y5nqHf7
z$##i`j1$Il6Wi_E9iJMh;?@`~o7*R`wA%2lK|TJN<m)!|P%kLwFDGmL`^kb8n#|6O
m_)E>p?e1)LX6{fXdvVGRX6L6P>6w}A#USPA>G^4SGyVgKM>Amn

delta 1306
zcmY+DO=uit9LAsj%<k;W&Zeo^nh#r(rrCU0lZ~Na+k;Z1hgOjy6@rMUYm;;%n`B91
zyNbAJEm9R!7z^U5l^#3@BJohHga{%%_z}b&{5bR=g9j}r6^e(9&$FA0v;5|HfB*S-
z-*?`3FFbbp(RT+Lqkz2vVCv+2x%PyceGPEl2U6Kn)t6=qM?cyGGCt6=QJE=ExBoe{
zoA=%%r3wpylg_gJ1u0bKSL$EyOTOp(ex!d@T|8NS`|8C7z`H`9o-fyH_AuV$^=|s!
zh4TE&zsDNCth0TcotA5h%PXH;zT6HBa8S-s7~rlZt9Uy7Tyi_PlO9*)f5$|#!s^(!
zZEro>{@_0dQ_UN0+<4<|HI#gIIX&*4rTTE1mpKOJ1YSkdZ_ij5t=eHLMjO_<BT4jz
z7D*EQW*<LAPZO7LV7g|XZx7`&R`se;CcgyhDO{j?Ok-#DxR@mLdW>eOV~;<j12^*A
zBf%hsa36*-vUbAVZH>oyQO5(Mz74yG*%X>VELXQ2QY_c3IILK%VRE>!T+?7@v0PKg
zFy(~b0<oMRV9H5D^N3X-2$^z%98*rv#*`E6V9E)&c(I&dCsR&v7gJ8q!ITr^nR0?%
z%sl(&3E=9*DiCxs<yz4$rksG=D3%lSFy-1>_b}xI+^(^lU=LHSEqpIiPSDGg6ZAFM
zP=R1Cv#$mEnR0@COgX^-Q%+D|$_WOUa>DgREGJxP#B#zlN4yP2*cJ_*u%8XxNN_(>
zPPF}EIl&lHPEcgZ3C5Xn(%eG~oW_UP#FmZPF`KpXcFC?gS?7dv#rf6kc3*JU-CL=l
z)TPwVsXLSD$#f<CgSXS$?^V6c3^Io@fA~-Oe+Q-DT(FUy%3ck#;beF^{2*M<?a58&
z-pk#L4rOi?w82y6oYmS5c9srWsc2p%FrIgHS)X-w+3(Spez(0I{gvy93jVc+T2GwQ
z6E@^!%<Hw%!N7Q)9JX;A8g{z#Bkfy9I-KDHd3(n$<`0Z?Y#nwT&vRamK5gq+`^m3%
ztv%9z-m!`3yMgD6uzI$<w6u6;Y<ls`!gjMdGrJPDs!MaHDl2}g{bDUTUic>PXR6h?
O+Vb3T)Hk@Uf6srBkqNN?

diff --git a/packages/theme-chalk/src/fonts/element-icons.woff b/packages/theme-chalk/src/fonts/element-icons.woff
index e88f57944d4e5538f88d9abcd0b1bd108c92a988..32ed17652896352474ca4b5d894e3f9a64e3399b 100644
GIT binary patch
delta 5323
zcmV;+6g2CcEc7fCcTYw}00961000(r01E&B001TkkrY3FO=E3gZ~y=SfB*miKL7v(
zF71KVrDtq;W&i*JzyJUb=Kug25S>GcglJ`9WB>pXr~m)}F#rGnHV~qMV`yk)VE_OU
z+yDRoAOHXWBnh7ez-VoBcmMzr`~Uy|Jpcdz%+yH#(QI#HVE_OVJOBUyXaE2JXrIug
znr&ftZ~y={6QlqD03QGV03ZQF0E%v5ZDjxe6T|=j0Z0G<0%7_{+rDsbb94Xz6$}6X
z0cZdK0$Ek|%Q}+?0XYKEWRpVyCx00-H~ep4h+%GI=miQhg5&_?rwiQxc$~%4SyIA4
z7)9X|8AJvLWEKGj1`!ZglMgO|g}5M}TuN^P|C`H;E1;<_C+SK^s?q^UKq0I`5wc%0
zG=5?>%jXMJ^Z6p*aa@VtMf8w1X?Hy4d!%i?r;+7neCB(*IJ3Y$t}IdJGJoc;;=gLt
zX>iRAx7^X>o)&F7bm`G&zym`b88K$U6VJTx%A6@P7QC_KJ)UXJh7Y!JlQL%;+4*k$
zf7G?P_&Oc!!{H<zF=6pGNSWykrW3vWbfRlh(X<*;$+SvR*-$SHwPL7OhFUePo>Vi`
zy6LG?!%(jc^~O+d4fW1Yn}3FSZ>TLpZ5wLGP`ifOGt|DJ4h;3dP=|*4Xs9DY9UJPz
zP@fF-*-&2$_0>?P7VDohGc-3hG`BF+H$z<->bs$?OkaFj8|ubTw-(<RX=iNz0PuNv
z%>a0uomdT!9L05>*S#~dvpc)9v%531d$a$0yK{Scx4PTE;qJJ-lYbNt;ztq|SOH2-
zVPx3{5?BzU$mZviGDtEYB|0fkB5@olRY^smVp6d~ia$A2*@YzRP#`&g6A}qh<v?PG
zKsjLTD6eO3#obA=DR0fb{(t?t`}OzUYmVo*v;R(?r3o&^4RE8}Z*l854umQc!XyoO
zt63ve(DJ-y#KY7oT7P-5Sg6rSFbYCkueY0JLl6Z8!jOSRzTUQK#DZ3{LnffErvZ{?
z-}-1N6{UXwfrOQLz`2q<0a~`0QaZ!V>Y=H4Js0zDm!r{SH2Sb#;CVkGJ|zrW4PD};
zfZ+T&uk>lpW-BBMa?<L%`i4->jNZJvd3(BKNC3055HoY(zkirg`&9hy>C<D;q!<bL
z6Mdm#e;l^I9ZbaJbon%gKftx#Pl4{_G%S?cHncM!h!V;!6f9T<WeWs9ABH(~C`TgB
zAHkPY$PcN`HUd0>FU1BFcrHq;M$Fmf+!kvLMB#gs2*M}4$vp2iaw>;GM-h?MZJ2_#
zO+H56&Q_N<+<)pk=JJMppMv+<4>*qgfIP+pIj*ELxyx2Q3<exZU!8$F+L>#*{F;pY
zR0>S^g1s7GwcV5HJ{qFeaxz<Q6UXU>8U_oXY`Q%OS#3LyLn(cA8t$+&Yr6b3nKs;U
z-q>~%*CU8(25cbjo2GNfn*}ysaO^^Pp<OpX7sPxG$A2!Cm)wJ#9$zf)fAh=eO{j|;
zk0(-Y;$R6m=y4G@vPk;N8Ru*1iEA=2O*UoLjHkLA!u>Hd1rM--bA)V4jjzdIWtj0J
z>`Z(do#j;2ZH}pQJVWXof=XSK@XYbVn|LzyEVu+`8717U&pfnl-9yj3<|Vg6#(Bse
z^PdpKhJP3r{}Ad(>wZ6-{iF{|@YEg>#gl%waX*au{dFAW$uR56U~(49V6(+2VCZ4M
z=|!QyB(TaIs2j01XO}rk;6$AxfunL-4<0=l1TBNfxk6e#@&@F2-g)bdH=MV49`f+y
z(V(7|u{EOwjvWi=>G}R$30vP-(0l2gwAe1!2!GzzdWOWqq!?>AaZ3sc3WP+6XHh^T
zdVLB7M#7rU+n{$vv4wkb;2@HgARIg>2&{bY04s~)!6h3-4vLz;;rGwY`7zPN19M24
zqIlqdh>7N(^Yoy%XPkrrp{nC?#Zmht6s7|f>O`{!BH^4J`Xz&)!7gWqHaMokF4*N(
zIDb1}ms|0+mpVHx)^lF(&ia6IT$$tYjSko~u!=1tVGy+<k_;G)R<Tg_lto8)B<&M3
zdnny|o1g5v?Y6ztkAJ#n=A9ek!N9{}Onf9D$8Hq%&TQF-P5UU_cblK?+cL9P_-j3K
zG7vZ!(eW(KI(QZy9#uImc0oicU9k37z<-qU8z7kPqVPk`o<$jHPsR%)Tj_$e^dfji
ze8eHY0Tf<b$a%effF3|OgPehS&4lQo<U#~`+PvI^p+?{3-3M1C>oB~icuOJysnHbx
zD@MuRBofX$b(XI){*>t?J&8JLpjKvaC-SW#(+y3H>qfo<Ewx!jr741%SJ|Ju<bT}$
zXgysnrD-`;E~grgc7IHcILCma;XCg{*gW%psWJj_iu%(fxbw{IWU~7rOrB-hh(E!d
zZ`PeJ%T@5MF6XYnS(#QAUA1frOfB=Swu*cU5kxmMU}c;=1Ay4+qJ5#<qAZVs3QO|j
z_aU3y-DkmZGU|hTl6)hX2VcYIe18r4?INHov+dQ;orTr#RYg|-kbD#WpCsfT?=$-W
z`px?wWqCO(1!Ov(&E}`i9D&tsyrUd4IW0#bvh!Dr!e=j>_ppf`#x;l74ojfUFHprr
z#}NPXg|elx`>8gt1^&VLW3qOFbSBmkO!F|1al)Aa_-Ou5XPy1sk0#avV1K9ooLEE7
zd?!;G$ie|Y0@!;Y9`59PI4ft<5?Hoq*l6*}h3l?^2E23XxgDp!Qmc*L`*+Uq>*1X@
zpWE@~S4Qt0t+_hU!%`RB7o(}#bCHU%X1O3RMX9%2=iz6jTD`Pd%}f;P1^kwvB`sAa
ztN1zZ8Tq{7{4$ZtCD6W}oqxy26vwGLXLyE#O=sY~pmyMX)c~hlXaH1QSD*gS=lk$!
zq@d>wn4PyEZWkl3gV%<X_2oF<xp^X7o~v^!QU6@sV{nM4(83F*F0EMH0|il+R>0;D
zMwSCCANgQ(8eqDyxI_lL%;=)(UI}hO@?qU;!P`kni@S8+WbGr<gnvwrynlgq_q<Qw
znyQ@Q-C`!3w}q~3^S9Yn(G26B(%CLoxsE1b4s~HJNw2G%nO!+ax$(;&>dfs#4U5t$
zv<9Mv^NeA@%0z6S1<uFa_kH6&{76J|exhkm(B}Oc+*E)cF~2C5&p_M-rDl6A{d{3)
zsBq?+Na05?ykZy_nSaL}9K*pcTwE*SIL|z}Mv1>j{_grpfR%NZ!m}4G1bVq&L3`NO
z+p`*XDawGeEWDc(&mDo5;(BV(vYM=<i7K|@A~h8}jl?338J(N@3?ZMHB5!!<gJ5I}
zCVX3oMxz_EMk03wRI+3)Gw7^_PHkBSptG#j0a_*NJKcZktbZq%k`YXuuR|Ol2F_0*
zLePwCB`HF3WCI+}RseZ88z5b~6yVa@Fr&ju{0esR?5uGe^)^Cg2T<(1%C3zFfA7rY
zDwP~;g-QpRZDj>#&MUm+CKu@7>elz@^K=y=Ne*WibwLDOD0H4|L+H245xbo;^r&d)
zh`$zDd(~BIkAHh);%?{dt=qQU4fX9eo2!n+$_)*oy~eAq+I~}b=5A=*y=~hj=a+XK
zjW?{Ahh2Y({=;u`w{!R6d^L0pYIKU(y^$Kx%5Gd%C}Smv%`j<%0ezP+VYT82g2iYC
zD>4*4J>4i|NK0=|0W%|533j|gMmx;c=nz(Gk1!w`1AjPokjP{V=oxB8Bbm{HU*!2<
z$Xt<8%d)JGuN*gma#_tTPeC}y^P;~{Pe;@g_4%;BlBs+B!;o5@jg&({ePVt<W`!9F
z@;<+muV*5viH-+2zR&(HA$M)qa2KQSebwZtRKBE>R@9OlD}_OjLb7Hg;&Mn5AY6(E
zORAEY9DgfGlsDD<mH7(|2x^Ih7W4+h<WeM(nY^Uj8{oW8wq1YyHsaA<Z1*zS2(-W@
z7u*r(C!vWOQ3}(dhx!eKeWO&PtxqffHdwq7*D){h9oneVt!BkAD(z0YVh}(j3hHKB
z$&L*s5`$w|C2i_Km_geFiNQ-c3u~Q6DY(Bafqz6Y70&)?u+pAtyS%az@AvyoNRc3)
zsM^ywN(e@z*J!{W;Im_uWU?|geMu$Z3q}I3MtOe#>*+}ePX&FuU!1+mcRAjN3GNo=
zGhtA#weiT?%zYE|hO0Wv-PG$XSD8>%L=5s>4Z*yDD#7~J4J<I{xa<w?fafT?`UPwt
zbAOsyXhFwRKM4_EQ%YsOtx)v$#Q3|F%hip30V0Bbqk4JeU5xbvpvqHOQ)>7i1b+2s
z|AzjZM{PUQ^r_LOmT6P(C58eU`!4I-7#K>tHx;iv6;*xBkZm8;?Qscl%^y2eS#KT+
ziJ<z3?rW4zL<K^G=!sIprxTwFV(5^$zJGEm<|h(J+cmARJv-1jm1sr|4Ni+1&FLq`
z$4}@vs)^Hsha%0ysm?%lyX?lcy*)#FUvk5wU%PONtkZ4%)5sr?<xe5VIe*l}GMP(q
zgLryqt<Z>}DMQPpdNGS<5@I!&^t?f>fx)MMVbemx&wPW!r+vQDhdm0KX;w`5R)5?y
z<Fj6;oFF*==Ej?J|G9ohok1|;@34;FVMBUyE%J#LN8M_H#q=mdG3I)ps_TuO=MyEF
zD^y6%`$S7)?KA&c7%dh@3&16d#U#YAce3X*-%o#X&R?10R&iTU0(5q(;7!J!rL@Mc
zt%#uu9d}=}(6NWSg`T}2@*3-fU4NM$+EOtbWZOCcb_XV0)WqG@;67QZ;xPuQlKiAB
z4N0;~o^&hRrVZUE0s%tmBoJ`Mp_b#tlLAk!m8IoV!`&YaPc3KtURf4sng49I0?S^J
zWO&z^Wh`NqHC;5HCcoF+tt4bQp^%r?FnzxT=j`sbuU%u4ui@O1{N+Tkn1A@PEG^WZ
z6gR?6GS9B%+CHtw{KyH=T)Wt6xDG5>ZDN&kq7X53pKUO&)&e2dGiVW!e04vVgC^{c
zr&96xEb5U4+fQwdZr|lRv1@krURb&7RAeBlINzOdem=8l(+otA!pC!L&|IpLI+yAG
z%jpMU<vlxhvXR@>&8L)XMSlUphNx_y^RpSQ_qMVY*PwF^ya9RUZ88I<;qmpt9})0w
zdSQ?%3V3MN{F9H47Odz~&WyTYOS_+5i-ZL*&X3d4b*yGxG@U9!<b~*X>;;9j%;F!W
z&HjFqg=s8xj^Jo=7~(fL_pma2{RXW+l~hm0<0sW*s^9bZXqWt)y?+ZzZv4LV&58a`
z_q%d7=sXn+t_x=6x8W^0E3XX($?ssj4C}noe_*w|7W;Yj=rQ_JdKdEtCBoj5kZ<on
z%a-P6a9_^Y4D@y96<DSyTa*FCdChqRlP$=2ne&P)vpR(MAy%i5zs2TPl|f}D5`iJ-
zwMb+J3owk$Rb@s|oPSqgSiwxy+xtHu598kZxj4J!^RdpNP)BWCamD6Ut47AxkBzM#
zr}wYg%*sx~vTe(`a-eNnE}y+*Bi-up;d}V75FX&8$~a@em|%LR#}1yv+6w$|aBOUF
zp*{z>D%WIh*z6t63yrAjfZDNk4bY60?Uw7oh*U6`%cG0527lhH=ON?$`L$yMS^p;B
zgRua*k^P?==+6n8NKlBgqLQ|(aSNk_-g}$?`PXr1_qzHtPMLxUA>a!JE|Y>$j9GlO
ztn;GmBdkJ(Jy5)~h~L6D!XSI6T!`d!{xxp?EzWz1>yTxD0qS|e`V~ugWKX!93h&+<
zPP4pHG9k2QZ-01p$x9$P9uDu_9Zr?8r(&hUd-sIEEGc^)Q7mq;JlbM;nCEYa(2m;Y
z&HlOlFONKa8OWs{>|Qz@&ENb|=l*f$^ygt@*W$C%*{jmR8A@Kr%-rS}OK?I#Lk}9^
zmAM+Y>erpO1h&twLmutYTh0f@%E94WI;B0F>=&ZBB7Y@RjF;=-U^+0npx^5_?nPs0
zdblq>Nv@1hVw#daoT`1{aCODOt5)>lGdN6sh8C5>un<jUvBn;D+IEA*F}8P|;EAJZ
zC>v6d$k9DgQqujvza)oL05wFu<)z*K+9OH2lsp&r(Fe%?GQOpvheY#_&n?e*Fr=cJ
zb8_sV0Dtn6q?eIJ&gB%2hDhQYE-&eLFcgi3x;KWR9#8%_`98-p48TjzAL}0JzOV&O
zz-x#cZ<5j%ofYu>x%v5HUf+@gq6BaynI_A(I8|rp&q%5J<`?04hi$?C1M>zMX#jYf
zV_;-pU;yGuj$04o`E9;3aI-Lgz}1KIEn)QkFMt1wS<f&x0=XOvOdwGJZjlYm0001Z
zoMT{QU|??e-@p*VF7p4&{~xSp7=R)uz!(6q$p>n9oMT~NU|@d9z`())#f<;IAhTH$
zkmMLp)cphE|5)X~7$k>Bo)Jph{r?We=<@!!%*Dj)A`lD!OYaih0000000000b^xRR
z(tiN%0So~u0Y(9C0k8r10!jjc0=@$f17rh~1Iz?Q1b_sd1lk1-1$YIv1<(c(26hIf
z2Hppf2mT0{2;2!M31$iW3SJ7Z3fc=C3qT8G3&IQv3_1*k46+Q|4Dt;Kc${NkWME)0
zW~gIeV*mjrAm#!>28RD&J_7(6g8|L}c(ZjAN&$aSYf}_45ZuP><(>j3qWA(ud`I-)
z|4=cRy-Ts1Y~|tc^V!=RdRCcF-7}q;?xff&@);NZKUdhpBQTU0fMbXe#+YD=86IOF
z2ROtWPjG~%IL0$P#|d8GC0^k*-ry8xc#C&9$9r7h13uytKI03%;u{3M;}Spc6AN77
zy1;+kSbFc)qNXZNGW2G-ic=*$Me)nU=$dgRy(Yt6Gs-x+wp1%pw^L=js!9AyY8U7a
z@h*h2FAY*#JE^By{53FpApLl*MZbV)8EK%Yrbt8WRBFgZM%u)Qv6b_UjK*2MnP%*g
zb=|}p3PCQZY>Z8THO>=njf%+=YwHvSfuv_wD;_Au?oJt2-J)TL(hFBrJOj(3X=r~f
zz3ntNnkt#<&Q)(@!G0TB^BiI^-%T#sS{ggwjhst|J9cwrwjG`s+w@E7UcmE^l<G3@
dtzZ<Kk3ze(<vmL6_TM(8VTP$KihHRDt<WcEA94Ty

delta 5233
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

diff --git a/packages/theme-chalk/src/icon.scss b/packages/theme-chalk/src/icon.scss
index 2c6242c57..22c7845c2 100644
--- a/packages/theme-chalk/src/icon.scss
+++ b/packages/theme-chalk/src/icon.scss
@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'element-icons';
-  src: url('fonts/element-icons.woff?t=1504667669908') format('woff'), /* chrome, firefox */
-       url('fonts/element-icons.ttf?t=1504667669908') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  src: url('fonts/element-icons.woff?t=1505459769526') format('woff'), /* chrome, firefox */
+       url('fonts/element-icons.ttf?t=1505459769526') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
   font-weight: normal;
-  font-style: normal;
+  font-style: normal
 }
 
 [class^="el-icon-"], [class*=" el-icon-"] {
@@ -70,6 +70,8 @@
 .el-icon-error:before { content: "\e62c"; }
 .el-icon-success:before { content: "\e62d"; }
 .el-icon-warning:before { content: "\e62e"; }
+.el-icon-sort-down:before { content: "\e630"; }
+.el-icon-sort-up:before { content: "\e631"; }
 
 .el-icon-loading {
   animation: rotating 1s linear infinite;
diff --git a/packages/theme-chalk/src/mixins/mixins.scss b/packages/theme-chalk/src/mixins/mixins.scss
index 84425f900..5f696b8c4 100644
--- a/packages/theme-chalk/src/mixins/mixins.scss
+++ b/packages/theme-chalk/src/mixins/mixins.scss
@@ -17,7 +17,7 @@
  -------------------------- */
 @mixin scroll-bar {
   $--scrollbar-thumb-background: #b4bccc;
-  $--scrollbar-track-background: #edeff5;
+  $--scrollbar-track-background: #fff;
 
   &::-webkit-scrollbar {
     z-index: 11;
@@ -30,6 +30,7 @@
 
     &-thumb {
       border-radius: 5px;
+      width: 6px;
       background: $--scrollbar-thumb-background;
     }
 
@@ -39,6 +40,11 @@
 
     &-track {
       background: $--scrollbar-track-background;
+
+      &-piece {
+        background: $--scrollbar-track-background;
+        width: 6px;
+      }
     }
   }
 }
diff --git a/packages/theme-chalk/src/table-column.scss b/packages/theme-chalk/src/table-column.scss
index b3f6888ec..36da1aa08 100644
--- a/packages/theme-chalk/src/table-column.scss
+++ b/packages/theme-chalk/src/table-column.scss
@@ -13,7 +13,7 @@
 }
 
 @include b(table-filter) {
-  border: solid 1px $--color-black;
+  border: solid 1px $--border-color-lighter;
   border-radius: 2px;
   background-color: $--color-white;
   box-shadow: $--dropdown-menu-box-shadow;
@@ -50,15 +50,15 @@
   }
 
   @include e(bottom) {
-    border-top: 1px solid $--color-black;
+    border-top: 1px solid $--border-color-lighter;
     padding: 8px;
 
     button {
       background: transparent;
       border: none;
-      color: $--color-black;
+      color: $--color-text-regular;
       cursor: pointer;
-      font-size: $--font-size-base;
+      font-size: $--font-size-small;
       padding: 0 3px;
 
       &:hover {
@@ -70,7 +70,7 @@
       }
 
       &.is-disabled {
-        color: $--color-black;
+        color: $--disabled-color-base;
         cursor: not-allowed;
       }
     }
diff --git a/packages/theme-chalk/src/table.scss b/packages/theme-chalk/src/table.scss
index 2b1760d06..83d2c261f 100644
--- a/packages/theme-chalk/src/table.scss
+++ b/packages/theme-chalk/src/table.scss
@@ -10,37 +10,10 @@
   width: 100%;
   max-width: 100%;
   background-color: $--color-white;
-  border: 1px solid $--table-border-color;
   font-size: 14px;
   color: $--table-text-color;
 
-  &::before {
-    content: '';
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 1px;
-    background-color: $--table-border-color;
-    z-index: 1;
-  }
-
-  &::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 1px;
-    height: 100%;
-    background-color: $--table-border-color;
-    z-index: 1;
-  }
-
-  .el-tooltip.cell {
-    white-space: nowrap;
-    min-width: 50px;
-  }
-
+  // 数据为空
   @include e(empty-block) {
     position: relative;
     min-height: 60px;
@@ -57,6 +30,7 @@
     color: color($--color-primary s(16%) l(44%));
   }
 
+  // 展开行
   @include e(expand-column) {
     .cell {
       padding: 0;
@@ -86,12 +60,15 @@
   }
 
   @include e(expanded-cell) {
-    padding: 20px 50px;
-    background-color: $--color-black;
-    box-shadow: inset 0 2px 0 #f4f4f4;
+    background-color: $--color-white;
+
+    // 纯属为了增加权重
+    &[class*=cell] {
+      padding: 20px 50px;
+    }
 
     &:hover {
-      background-color: $--color-black !important;
+      background-color: $--table-row-hover-background !important;
     }
   }
 
@@ -99,18 +76,24 @@
     border-right: 0;
     border-bottom: 0;
 
-    & th.gutter, td.gutter {
+    th.gutter, td.gutter {
       border-right-width: 1px;
     }
   }
 
-  & th {
-    white-space: nowrap;
-    overflow: hidden;
+  thead {
+    color: $--table-header-color;
+    font-weight: 500;
+
+    &.is-group {
+      th {
+        background: $--background-color-base;
+      }
+    }
   }
 
-  & th, td {
-    height: 40px;
+  th, td {
+    padding: 12px 0;
     min-width: 0;
     box-sizing: border-box;
     text-overflow: ellipsis;
@@ -128,19 +111,154 @@
     @include when(right) {
       text-align: right;
     }
+
+    &.gutter {
+      width: 15px;
+      border-right-width: 0;
+      border-bottom-width: 0;
+      padding: 0;
+    }
+
+    &.is-hidden {
+      > * {
+        visibility: hidden;
+      }
+    }
   }
 
-  & th.is-leaf, td {
-    border-bottom: 1px solid $--table-border-color;
+  tr {
+    background-color: $--color-white;
+
+    input[type="checkbox"] {
+      margin: 0;
+    }
   }
 
+  th.is-leaf, td {
+    border-bottom: $--table-border;
+  }
+
+  th {
+    white-space: nowrap;
+    overflow: hidden;
+    user-select: none;
+    text-align: left;
+
+    div {
+      display: inline-block;
+      padding-left: 10px;
+      padding-right: 10px;
+      line-height: 40px;
+      box-sizing: border-box;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    > .cell {
+      position: relative;
+      word-wrap: normal;
+      text-overflow: ellipsis;
+      display: inline-block;
+      vertical-align: middle;
+      width: 100%;
+      box-sizing: border-box;
+
+      &.highlight {
+        color: $--color-primary;
+      }
+    }
+
+    &.required > div::before {
+      display: inline-block;
+      content: "";
+      width: 8px;
+      height: 8px;
+      border-radius: 50%;
+      background: #ff4d51;
+      margin-right: 5px;
+      vertical-align: middle;
+    }
+  }
+
+  td {
+    div {
+      box-sizing: border-box;
+    }
+
+    &.gutter {
+      width: 0;
+    }
+  }
+
+  .cell {
+    box-sizing: border-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+    word-break: break-all;
+    line-height: 23px;
+    padding-left: 10px;
+    padding-right: 10px;
+
+    &.el-tooltip {
+      white-space: nowrap;
+      min-width: 50px;
+    }
+  }
+
+  // 拥有多级表头
+  @include m((group, border)) {
+    border: $--table-border;
+
+    @include share-rule(border-pseudo) {
+      content: '';
+      position: absolute;
+      background-color: $--border-color-lighter;
+      z-index: 1;
+    }
+
+    // 表格右部伪 border
+    &::after {
+      @include extend-rule(border-pseudo);
+      top: 0;
+      right: 0;
+      width: 1px;
+      height: 100%;
+    }
+  }
+
+  // 表格底部伪 border，总是有的
+  &::before {
+    @include extend-rule(border-pseudo);
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 1px;
+  }
+
+  // table--border
   @include m(border) {
-    & th, td {
-      border-right: 1px solid $--table-border-color;
+    border-right: none;
+    border-bottom: none;
+
+    th, td {
+      border-right: $--table-border;
+    }
+
+    .has-gutter {
+      th:nth-last-of-type(2), td:nth-last-of-type(2) {
+        border-right: none;
+      }
+    }
+
+    th.gutter:last-of-type {
+      border-bottom: $--table-border;
+      border-bottom-width: 1px;
     }
 
     & th {
-      border-bottom: 1px solid $--table-border-color;
+      border-bottom: $--table-border;
     }
   }
 
@@ -148,32 +266,12 @@
     visibility: hidden;
   }
 
-  & th {
-    background-color: $--table-header-background;
-    text-align: left;
-  }
-
-  & th > div {
-    display: inline-block;
-    padding-left: 18px;
-    padding-right: 18px;
-    line-height: 40px;
-    box-sizing: border-box;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-
-  & td > div {
-    box-sizing: border-box;
-  }
-
   @include e((fixed, fixed-right)) {
     position: absolute;
     top: 0;
     left: 0;
-    box-shadow: 1px 0 8px #d3d4d6;
     overflow-x: hidden;
+    box-shadow: $--table-fixed-box-shadow;
 
     &::before {
       content: '';
@@ -182,7 +280,7 @@
       bottom: 0;
       width: 100%;
       height: 1px;
-      background-color: $--table-border-color;
+      background-color: $--border-color-lighter;
       z-index: 4;
     }
   }
@@ -191,8 +289,8 @@
     position: absolute;
     top: -1px;
     right: 0;
-    background-color: $--table-header-background;
-    border-bottom: 1px solid $--table-border-color;
+    background-color: $--color-white;
+    border-bottom: $--table-border;
   }
 
   @include e(fixed-right) {
@@ -200,8 +298,6 @@
     left: auto;
     right: 0;
 
-    box-shadow: -1px 0 8px #d3d4d6;
-
     .el-table__fixed-header-wrapper,
     .el-table__fixed-body-wrapper,
     .el-table__fixed-footer-wrapper {
@@ -215,11 +311,6 @@
     left: 0;
     top: 0;
     z-index: 3;
-
-    & thead div {
-      background-color: $--table-header-background;
-      color: $--table-text-color;
-    }
   }
 
   @include e(fixed-footer-wrapper) {
@@ -229,8 +320,8 @@
     z-index: 3;
 
     & tbody td {
-      border-top: 1px solid $--table-border-color;
-      background-color: $--table-footer-background;
+      border-top: $--table-border;
+      background-color: $--table-row-hover-background;
       color: $--table-text-color;
     }
   }
@@ -250,7 +341,7 @@
   @include e(footer-wrapper) {
     margin-top: -1px;
     td {
-      border-top: 1px solid $--table-border-color;
+      border-top: $--table-border;
     }
   }
 
@@ -261,13 +352,8 @@
   @include e((header-wrapper, footer-wrapper)) {
     overflow: hidden;
 
-    & thead div {
-      background-color: $--table-header-background;
-      color: $--table-text-color;
-    }
-
     & tbody td {
-      background-color: $--table-footer-background;
+      background-color: $--table-row-hover-background;
       color: $--table-text-color;
     }
   }
@@ -275,115 +361,63 @@
   @include e(body-wrapper) {
     overflow: auto;
     position: relative;
-  }
 
-  & th.required > div::before {
-    display: inline-block;
-    content: "";
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-    background: #ff4d51;
-    margin-right: 5px;
-    vertical-align: middle;
-  }
+    @include when(scroll-left) {
+      ~ .el-table__fixed {
+        box-shadow: none;
+      }
+    }
 
-  & th > .cell {
-    position: relative;
-    word-wrap: normal;
-    text-overflow: ellipsis;
-    display: inline-block;
-    line-height: 30px;
-    vertical-align: middle;
-    width: 100%;
-    box-sizing: border-box;
+    @include when(scroll-right) {
+      ~ .el-table__fixed-right {
+        box-shadow: none;
+      }
+    }
 
-    &.highlight {
-      color: $--color-primary;
+    .el-table--border {
+      @include when(scroll-right) {
+        ~ .el-table__fixed-right {
+          border-left: $--table-border;
+        }
+      }
+
+      @include when(scroll-left) {
+        ~ .el-table__fixed {
+          border-right: $--table-border;
+        }
+      }
     }
   }
 
-  & .caret-wrapper {
+  .caret-wrapper {
     position: relative;
+    display: inline-flex;
+    align-items: center;
+    height: 13px;
+    width: 24px;
     cursor: pointer;
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 5px;
-    margin-top: -2px;
-    width: 16px;
-    height: 30px;
     overflow: initial;
   }
 
-  & .sort-caret {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    border: 0;
-    content: "";
-    position: absolute;
-    left: 3px;
-    z-index: 2;
-
-    &.ascending {
-      top: 9px;
-      border-top: none;
-      border-right: 5px solid transparent;
-      border-bottom: 5px solid $--color-black;
-      border-left: 5px solid transparent;
-    }
-
-    &.descending {
-      bottom: 9px;
-      border-top: 5px solid $--color-black;
-      border-right: 5px solid transparent;
-      border-bottom: none;
-      border-left: 5px solid transparent;
-    }
-  }
-
-  & .ascending .sort-caret.ascending {
-    border-bottom-color: $--color-black;
-  }
-
-  & .descending .sort-caret.descending {
-    border-top-color: $--color-black;
-  }
-
-  & th.gutter, td.gutter {
-    width: 15px;
-    border-right-width: 0;
-    border-bottom-width: 0;
-    padding: 0;
-  }
-
-  & td.gutter {
-    width: 0;
-  }
-
-  & td.is-hidden, th.is-hidden {
-    > * {
-      visibility: hidden;
-    }
-  }
-
-  & .cell {
-    box-sizing: border-box;
+  .sort-caret {
+    color: $--icon-color-base;
+    width: 14px;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    word-break: break-all;
-    line-height: 24px;
-    padding-left: 18px;
-    padding-right: 18px;
+    font-size: 13px;
   }
 
-  & tr input[type="checkbox"] {
-    margin: 0;
+  .ascending .sort-caret.ascending {
+    color: $--color-primary;
   }
 
-  & tr {
-    background-color: $--color-white;
+  .descending .sort-caret.descending {
+    color: $--color-primary;
+  }
+
+  .hidden-columns {
+    visibility: hidden;
+    position: absolute;
+    z-index: -1;
   }
 
   @include m(striped) {
@@ -391,11 +425,10 @@
       & tr.el-table__row--striped {
         td {
           background: #FAFAFA;
-          background-clip: padding-box;
         }
 
         &.current-row td {
-          background: color($--color-primary tint(92%));
+          background-color: $--table-current-row-background;
         }
       }
     }
@@ -406,14 +439,14 @@
       &, &.el-table__row--striped {
         &, &.current-row {
           > td {
-            background-color: $--color-black;
+            background-color: $--table-current-row-background;
           }
         }
       }
     }
 
     tr.current-row > td {
-      background: color($--color-primary tint(92%));
+      background-color: $--table-current-row-background;
     }
   }
 
@@ -423,24 +456,19 @@
     top: 0;
     bottom: 0;
     width: 0;
-    border-left: 1px solid $--table-border-color;
+    border-left: $--table-border;
     z-index: 10;
   }
 
-  & .hidden-columns {
-    visibility: hidden;
-    position: absolute;
-    z-index: -1;
-  }
-
   @include e(column-filter-trigger) {
     display: inline-block;
     line-height: 34px;
-    margin-left: 5px;
     cursor: pointer;
 
     & i {
-      color: $--color-black;
+      color: $--color-info;
+      font-size: 12px;
+      transform: scale(.75);
     }
   }
 
@@ -452,8 +480,7 @@
 
   @include m(enable-row-hover) {
     .el-table__body tr:hover > td {
-      background-color: $--color-black;
-      background-clip: padding-box;
+      background-color: $--table-row-hover-background;
     }
   }