shineout 1.8.5 → 1.8.7-beta.1

package/css/Table/SeperateTable.js

@@ -225,6 +225,22 @@ function (_PureComponent) {
 
   };
 
+  _proto.setTop = function setTop(scrollHeight, fullHeight, top) {
+    var _this2 = this;
+
+    var offsetLeft = this.state.offsetLeft;
+    this.tbody.style.marginTop = scrollHeight * top + "px";
+    this.lastScrollTop = fullHeight * top;
+    (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + this.lastScrollTop + "px");
+    setTimeout(function () {
+      _this2.setState({
+        scrollTop: top
+      });
+
+      _this2.lastScrollArgs[1] = top;
+    });
+  };
+
   _proto.checkScrollToIndex = function checkScrollToIndex(index, outerHeight) {
     var _this$props3 = this.props,
         data = _this$props3.data,
@@ -245,7 +261,7 @@ function (_PureComponent) {
   };
 
   _proto.ajustBottom = function ajustBottom(dataChange) {
-    var _this2 = this;
+    var _this3 = this;
 
     var reachBottom = this.lastScrollArgs[1] === 1;
     var drag = this.lastScrollArgs[8];
@@ -254,7 +270,7 @@ function (_PureComponent) {
       if (this.ajustBottomScroll) return;
       this.ajustBottomScroll = true;
       setTimeout(function () {
-        _this2.handleScroll.apply(_this2, _this2.lastScrollArgs);
+        _this3.handleScroll.apply(_this3, _this3.lastScrollArgs);
       });
     }
   };
@@ -314,11 +330,9 @@ function (_PureComponent) {
   };
 
   _proto.resetHeight = function resetHeight() {
-    var _this3 = this;
+    var _this4 = this;
 
-    var _this$state2 = this.state,
-        scrollTop = _this$state2.scrollTop,
-        offsetLeft = _this$state2.offsetLeft;
+    var scrollTop = this.state.scrollTop;
     var _this$props4 = this.props,
         treeColumnsName = _this$props4.treeColumnsName,
         changedByExpand = _this$props4.changedByExpand;
@@ -349,32 +363,16 @@ function (_PureComponent) {
           if (fullHeight <= scrollHeight) {
             index = 0;
           } else {
-            this.tbody.style.marginTop = scrollHeight + "px";
-            (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-            this.lastScrollTop = fullHeight;
+            this.setTop(scrollHeight, fullHeight, 1);
             return;
           }
         }
       }
 
       if (index === 0) {
-        this.lastScrollTop = 0;
-        setTimeout(function () {
-          _this3.setState({
-            scrollTop: 0
-          });
-        });
-        this.tbody.style.marginTop = '0px';
-        (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", '0px');
+        this.setTop(scrollHeight, fullHeight, 0);
       } else if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
-        this.tbody.style.marginTop = scrollHeight + "px";
-        (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-        this.lastScrollTop = fullHeight;
-        setTimeout(function () {
-          _this3.setState({
-            scrollTop: 1
-          });
-        });
+        this.setTop(scrollHeight, fullHeight, 1);
       } else {
         var keepTop = this.lastScrollTop - this.lastScrollArgs[1] * scrollHeight; // keepTop = scrollTopLength - scrollTopLength/fullHeight * scrollHeight
         // keepTop = (1 - scrollHeight / fullHeight) * scrollTopLength
@@ -382,18 +380,14 @@ function (_PureComponent) {
         var scrollTopLength = keepTop / (1 - scrollHeight / fullHeight);
         this.lastScrollTop = scrollTopLength;
         var st = this.lastScrollTop / fullHeight;
-        this.tbody.style.marginTop = st * scrollHeight + "px";
-        (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + this.lastScrollTop + "px");
-        setTimeout(function () {
-          _this3.setState({
-            scrollTop: st
-          });
-        });
+        this.setTop(scrollHeight, fullHeight, st);
       }
     } else if (this.lastScrollTop - height < 1) {
       setTimeout(function () {
-        _this3.setState({
-          scrollTop: _this3.lastScrollTop / fullHeight
+        _this4.lastScrollArgs[1] = _this4.lastScrollTop / fullHeight;
+
+        _this4.setState({
+          scrollTop: _this4.lastScrollTop / fullHeight
         });
       });
     }
@@ -637,14 +631,14 @@ function (_PureComponent) {
         innerScrollAttr = _this$props7.innerScrollAttr,
         bordered = _this$props7.bordered,
         others = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
-    var _this$state3 = this.state,
-        colgroup = _this$state3.colgroup,
-        scrollTop = _this$state3.scrollTop,
-        scrollLeft = _this$state3.scrollLeft,
-        offsetLeft = _this$state3.offsetLeft,
-        offsetRight = _this$state3.offsetRight,
-        currentIndex = _this$state3.currentIndex,
-        resize = _this$state3.resize;
+    var _this$state2 = this.state,
+        colgroup = _this$state2.colgroup,
+        scrollTop = _this$state2.scrollTop,
+        scrollLeft = _this$state2.scrollLeft,
+        offsetLeft = _this$state2.offsetLeft,
+        offsetRight = _this$state2.offsetRight,
+        currentIndex = _this$state2.currentIndex,
+        resize = _this$state2.resize;
     var contentWidth = this.getContentWidth();
     var minWidthSup = columns.find(function (d) {
       return d.minWidth;
@@ -753,9 +747,9 @@ function (_PureComponent) {
     var _this$props9 = this.props,
         fixed = _this$props9.fixed,
         hideHeader = _this$props9.hideHeader;
-    var _this$state4 = this.state,
-        scrollLeft = _this$state4.scrollLeft,
-        floatFixed = _this$state4.floatFixed;
+    var _this$state3 = this.state,
+        scrollLeft = _this$state3.scrollLeft,
+        floatFixed = _this$state3.floatFixed;
     var floatClass = [];
 
     if (floatFixed) {

package/css/Table/TreeExpand.js

@@ -169,7 +169,7 @@ var _default = function _default(WrappedComponent) {
       }).length === 0;
       var treeIndent = this.getTreeIndent();
       return _react.default.createElement(WrappedComponent, (0, _extends2.default)({}, this.props, {
-        changedByExpand: this.changedByExpand,
+        changedByExpand: this.changedByExpand || this.props.changedByExpand,
         data: data,
         onTreeExpand: this.handleTreeExpand,
         treeExpandKeys: expandKeys,
@@ -187,7 +187,8 @@ var _default = function _default(WrappedComponent) {
     treeColumnsName: _propTypes.default.string,
     defaultTreeExpandKeys: _propTypes.default.array,
     treeExpandKeys: _propTypes.default.array,
-    onTreeExpand: _propTypes.default.func
+    onTreeExpand: _propTypes.default.func,
+    changedByExpand: _propTypes.default.bool
   });
   TreeExpand.defaultProps = {
     defaultTreeExpandKeys: []

package/css/Table/index.d.ts

@@ -542,6 +542,15 @@ export interface TableProps<Value, TRD> extends StandardProps, ListItemStandardP
    */
   columnResizable?: boolean
 
+  /**
+   * Enable in specific scenarios (tree data expansion is controlled) Used to change the default behavior of scroll reset
+   *
+   * 在特定场景（树形数据展开受控)下开启 用来改变滚动条重置的默认行为
+   *
+   * default: false
+   */
+ changedByExpand?: boolean
+
 }
 
 declare class Table<Value = any, TRD = TableRowData> extends React.Component<TableProps<Value, TRD>, {}> {

package/css/Table/index.js

@@ -33,7 +33,7 @@ var _TreeExpand = _interopRequireDefault(require("./TreeExpand"));
 
 var TableWithPagination = (0, _pagable.default)(_Table.default);
 var TableWithTree = (0, _TreeExpand.default)(_Table.default);
-var TableWithPT = (0, _func.compose)(_TreeExpand.default, _pagable.default)(_Table.default);
+var TableWithPT = (0, _func.compose)(_pagable.default, _TreeExpand.default)(_Table.default);
 
 var _default =
 /*#__PURE__*/

package/css/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.5' }
+export default { utils, version: '1.8.7-beta.1' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

@@ -222,6 +222,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.8.5'
+  version: '1.8.7-beta.1'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -41493,6 +41493,23 @@ function (_PureComponent) {
       // }
 
     }
+  }, {
+    key: "setTop",
+    value: function setTop(scrollHeight, fullHeight, top) {
+      var _this2 = this;
+
+      var offsetLeft = this.state.offsetLeft;
+      this.tbody.style.marginTop = "".concat(scrollHeight * top, "px");
+      this.lastScrollTop = fullHeight * top;
+      Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(this.lastScrollTop, "px"));
+      setTimeout(function () {
+        _this2.setState({
+          scrollTop: top
+        });
+
+        _this2.lastScrollArgs[1] = top;
+      });
+    }
   }, {
     key: "checkScrollToIndex",
     value: function checkScrollToIndex(index, outerHeight) {
@@ -41516,7 +41533,7 @@ function (_PureComponent) {
   }, {
     key: "ajustBottom",
     value: function ajustBottom(dataChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       var reachBottom = this.lastScrollArgs[1] === 1;
       var drag = this.lastScrollArgs[8];
@@ -41525,7 +41542,7 @@ function (_PureComponent) {
         if (this.ajustBottomScroll) return;
         this.ajustBottomScroll = true;
         setTimeout(function () {
-          _this2.handleScroll.apply(_this2, Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_this2.lastScrollArgs));
+          _this3.handleScroll.apply(_this3, Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_this3.lastScrollArgs));
         });
       }
     }
@@ -41590,11 +41607,9 @@ function (_PureComponent) {
   }, {
     key: "resetHeight",
     value: function resetHeight() {
-      var _this3 = this;
+      var _this4 = this;
 
-      var _this$state2 = this.state,
-          scrollTop = _this$state2.scrollTop,
-          offsetLeft = _this$state2.offsetLeft;
+      var scrollTop = this.state.scrollTop;
       var _this$props4 = this.props,
           treeColumnsName = _this$props4.treeColumnsName,
           changedByExpand = _this$props4.changedByExpand;
@@ -41625,32 +41640,16 @@ function (_PureComponent) {
             if (fullHeight <= scrollHeight) {
               index = 0;
             } else {
-              this.tbody.style.marginTop = "".concat(scrollHeight, "px");
-              Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(fullHeight, "px"));
-              this.lastScrollTop = fullHeight;
+              this.setTop(scrollHeight, fullHeight, 1);
               return;
             }
           }
         }
 
         if (index === 0) {
-          this.lastScrollTop = 0;
-          setTimeout(function () {
-            _this3.setState({
-              scrollTop: 0
-            });
-          });
-          this.tbody.style.marginTop = '0px';
-          Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), '0px');
+          this.setTop(scrollHeight, fullHeight, 0);
         } else if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
-          this.tbody.style.marginTop = "".concat(scrollHeight, "px");
-          Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(fullHeight, "px"));
-          this.lastScrollTop = fullHeight;
-          setTimeout(function () {
-            _this3.setState({
-              scrollTop: 1
-            });
-          });
+          this.setTop(scrollHeight, fullHeight, 1);
         } else {
           var keepTop = this.lastScrollTop - this.lastScrollArgs[1] * scrollHeight; // keepTop = scrollTopLength - scrollTopLength/fullHeight * scrollHeight
           // keepTop = (1 - scrollHeight / fullHeight) * scrollTopLength
@@ -41658,18 +41657,14 @@ function (_PureComponent) {
           var scrollTopLength = keepTop / (1 - scrollHeight / fullHeight);
           this.lastScrollTop = scrollTopLength;
           var st = this.lastScrollTop / fullHeight;
-          this.tbody.style.marginTop = "".concat(st * scrollHeight, "px");
-          Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(this.lastScrollTop, "px"));
-          setTimeout(function () {
-            _this3.setState({
-              scrollTop: st
-            });
-          });
+          this.setTop(scrollHeight, fullHeight, st);
         }
       } else if (this.lastScrollTop - height < 1) {
         setTimeout(function () {
-          _this3.setState({
-            scrollTop: _this3.lastScrollTop / fullHeight
+          _this4.lastScrollArgs[1] = _this4.lastScrollTop / fullHeight;
+
+          _this4.setState({
+            scrollTop: _this4.lastScrollTop / fullHeight
           });
         });
       }
@@ -41917,14 +41912,14 @@ function (_PureComponent) {
           bordered = _this$props7.bordered,
           others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_1__["default"])(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
 
-      var _this$state3 = this.state,
-          colgroup = _this$state3.colgroup,
-          scrollTop = _this$state3.scrollTop,
-          scrollLeft = _this$state3.scrollLeft,
-          offsetLeft = _this$state3.offsetLeft,
-          offsetRight = _this$state3.offsetRight,
-          currentIndex = _this$state3.currentIndex,
-          resize = _this$state3.resize;
+      var _this$state2 = this.state,
+          colgroup = _this$state2.colgroup,
+          scrollTop = _this$state2.scrollTop,
+          scrollLeft = _this$state2.scrollLeft,
+          offsetLeft = _this$state2.offsetLeft,
+          offsetRight = _this$state2.offsetRight,
+          currentIndex = _this$state2.currentIndex,
+          resize = _this$state2.resize;
       var contentWidth = this.getContentWidth();
       var minWidthSup = columns.find(function (d) {
         return d.minWidth;
@@ -41937,7 +41932,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 499,
+              lineNumber: 495,
               columnNumber: 14
             }
           })
@@ -41966,7 +41961,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 512,
+            lineNumber: 508,
             columnNumber: 7
           }
         },
@@ -41980,7 +41975,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 522,
+            lineNumber: 518,
             columnNumber: 9
           }
         },
@@ -41992,7 +41987,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 523,
+            lineNumber: 519,
             columnNumber: 11
           }
         }),
@@ -42006,7 +42001,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 524,
+            lineNumber: 520,
             columnNumber: 11
           }
         },
@@ -42018,7 +42013,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 529,
+            lineNumber: 525,
             columnNumber: 13
           }
         }),
@@ -42040,7 +42035,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 530,
+            lineNumber: 526,
             columnNumber: 13
           }
         })))))
@@ -42065,7 +42060,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 557,
+          lineNumber: 553,
           columnNumber: 7
         }
       },
@@ -42079,7 +42074,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 558,
+          lineNumber: 554,
           columnNumber: 9
         }
       },
@@ -42091,7 +42086,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 559,
+          lineNumber: 555,
           columnNumber: 11
         }
       }),
@@ -42103,7 +42098,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 560,
+          lineNumber: 556,
           columnNumber: 11
         }
       }))));
@@ -42119,7 +42114,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 568,
+              lineNumber: 564,
               columnNumber: 9
             }
           }), header)
@@ -42134,9 +42129,9 @@ function (_PureComponent) {
       var _this$props9 = this.props,
           fixed = _this$props9.fixed,
           hideHeader = _this$props9.hideHeader;
-      var _this$state4 = this.state,
-          scrollLeft = _this$state4.scrollLeft,
-          floatFixed = _this$state4.floatFixed;
+      var _this$state3 = this.state,
+          scrollLeft = _this$state3.scrollLeft,
+          floatFixed = _this$state3.floatFixed;
       var floatClass = [];
 
       if (floatFixed) {
@@ -42161,7 +42156,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 598,
+          lineNumber: 594,
           columnNumber: 7
         }
       }, this.renderBody(floatClass))];
@@ -45062,7 +45057,7 @@ var TREE_TABLE_DEFAULT_INDENT = 15;
         return (
           /*#__PURE__*/
           react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(WrappedComponent, Object.assign({}, this.props, {
-            changedByExpand: this.changedByExpand,
+            changedByExpand: this.changedByExpand || this.props.changedByExpand,
             data: data,
             onTreeExpand: this.handleTreeExpand,
             treeExpandKeys: expandKeys,
@@ -45088,7 +45083,8 @@ var TREE_TABLE_DEFAULT_INDENT = 15;
     treeColumnsName: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.string,
     defaultTreeExpandKeys: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
     treeExpandKeys: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
-    onTreeExpand: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func
+    onTreeExpand: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func,
+    changedByExpand: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.bool
   });
   TreeExpand.defaultProps = {
     defaultTreeExpandKeys: []
@@ -45408,7 +45404,7 @@ function _createSuper2(Derived) {
 
 var TableWithPagination = Object(_hoc_pagable__WEBPACK_IMPORTED_MODULE_11__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
 var TableWithTree = Object(_TreeExpand__WEBPACK_IMPORTED_MODULE_14__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
-var TableWithPT = Object(_utils_func__WEBPACK_IMPORTED_MODULE_13__["compose"])(_TreeExpand__WEBPACK_IMPORTED_MODULE_14__["default"], _hoc_pagable__WEBPACK_IMPORTED_MODULE_11__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
+var TableWithPT = Object(_utils_func__WEBPACK_IMPORTED_MODULE_13__["compose"])(_hoc_pagable__WEBPACK_IMPORTED_MODULE_11__["default"], _TreeExpand__WEBPACK_IMPORTED_MODULE_14__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
 
 var _default =
 /*#__PURE__*/
@@ -60317,7 +60313,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.8.5'
+  version: '1.8.7-beta.1'
 });