fix(Table): stickyLock right style disorder, close #2806

Author: youluna

src/table/fixed.jsx

@@ -8,7 +8,7 @@ import BodyComponent from './fixed/body';
 import WrapperComponent from './fixed/wrapper';
 import { statics } from './util';
 
-export default function fixed(BaseComponent) {
+export default function fixed(BaseComponent, stickyLock) {
     /** Table */
     class FixedTable extends React.Component {
         static FixedHeader = HeaderComponent;
@@ -26,10 +26,7 @@ export default function fixed(BaseComponent) {
             /**
              * 最大内容区域的高度,在`fixedHeader`为`true`的时候,超过这个高度会出现滚动条
              */
-            maxBodyHeight: PropTypes.oneOfType([
-                PropTypes.number,
-                PropTypes.string,
-            ]),
+            maxBodyHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
             ...BaseComponent.propTypes,
         };
 
@@ -48,10 +45,7 @@ export default function fixed(BaseComponent) {
             getNode: PropTypes.func,
             onFixedScrollSync: PropTypes.func,
             getTableInstanceForFixed: PropTypes.func,
-            maxBodyHeight: PropTypes.oneOfType([
-                PropTypes.number,
-                PropTypes.string,
-            ]),
+            maxBodyHeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
         };
 
         state = {};
@@ -78,9 +72,7 @@ export default function fixed(BaseComponent) {
         }
 
         getNode = (type, node, lockType) => {
-            lockType = lockType
-                ? lockType.charAt(0).toUpperCase() + lockType.substr(1)
-                : '';
+            lockType = lockType ? lockType.charAt(0).toUpperCase() + lockType.substr(1) : '';
             this[`${type}${lockType}Node`] = node;
         };
 
@@ -143,10 +135,13 @@ export default function fixed(BaseComponent) {
                 const hasVerScroll = body.scrollHeight > body.clientHeight,
                     hasHozScroll = body.scrollWidth > body.clientWidth;
                 const style = {
-                    [paddingName]: scrollBarSize,
                     [marginName]: scrollBarSize,
                 };
 
+                if (!stickyLock) {
+                    style[paddingName] = scrollBarSize;
+                }
+
                 if (!hasVerScroll) {
                     style[paddingName] = 0;
                     style[marginName] = 0;

src/table/index.jsx

@@ -23,13 +23,16 @@ const Table = ORDER_LIST.reduce((ret, current) => {
 
 lock._typeMark = 'lock';
 expanded._typeMark = 'expanded';
+fixed._typeMark = 'fixed';
 
 const StickyLockTable = ORDER_LIST.reduce((ret, current) => {
     const newLock = !ieVersion;
     if (current._typeMark === 'lock') {
         ret = newLock ? stickyLock(ret) : lock(ret);
     } else if (current._typeMark === 'expanded') {
         ret = newLock ? expanded(ret, true) : expanded(ret);
+    } else if (current._typeMark === 'fixed') {
+        ret = newLock ? fixed(ret, true) : fixed(ret);
     } else {
         ret = current(ret);
     }