fix(Table): style confusion caused by vertical scrollbar, close aliba…

…ba-fusion#473
youluna · Mar 22, 2019 · 530da7f · 530da7f
1 parent 70c1bc4
commit 530da7f
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/table/fixed.jsx b/src/table/fixed.jsx
@@ -70,14 +70,26 @@ export default function fixed(BaseComponent) {
         }
 
         adjustFixedHeaderSize() {
-            const { hasHeader, fixedHeader, maxBodyHeight } = this.props;
-            if (hasHeader && fixedHeader && !this.props.lockType) {
-                if (this.bodyNode.scrollHeight <= maxBodyHeight) {
-                    dom.setStyle(this.headerNode, 'paddingRight', 0);
-                } else {
+            const { hasHeader, fixedHeader, maxBodyHeight, rtl } = this.props;
+            const paddingDir = rtl ? 'paddingLeft' : 'paddingRight';
+
+            if (hasHeader && fixedHeader) {
+                // adjust header of basic_table
+                if (!this.props.lockType) {
+                    if (this.bodyNode.scrollHeight <= maxBodyHeight) {
+                        dom.setStyle(this.headerNode, 'paddingRight', 0);
+                    } else {
+                        dom.setStyle(
+                            this.headerNode,
+                            paddingDir,
+                            dom.scrollbar().width
+                        );
+                    }
+                    // adjust body of lock_right_table
+                } else if (this.props.lockType === 'right') {
                     dom.setStyle(
-                        this.headerNode,
-                        'paddingRight',
+                        this.bodyNode,
+                        paddingDir,
                         dom.scrollbar().width
                     );
                 }