shineout 1.11.3-beta.4 → 1.11.3

package/css/Scroll/Scroll.js

@@ -19,6 +19,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _scrollBehavior = require("../utils/dom/scrollBehavior");
+
 var _component = require("../component");
 
 var _proptypes = require("../utils/proptypes");
@@ -88,6 +90,7 @@ function (_PureComponent) {
     });
     this.inner.addEventListener('scroll', this.handleInnerScroll);
     this.wheelElement.addEventListener('scroll', this.handleInnerScroll);
+    this.rmOverScrollListener = (0, _scrollBehavior.banOverScrollX)(this.wheelElement);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -106,6 +109,7 @@ function (_PureComponent) {
     this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
     this.inner.removeEventListener('scroll', this.handleInnerScroll);
     this.wheelElement.removeEventListener('scroll', this.handleInnerScroll);
+    if (this.rmOverScrollListener) this.rmOverScrollListener();
   };
 
   _proto.getWheelRect = function getWheelRect() {

package/css/Select/Select.js

@@ -621,7 +621,8 @@ function (_PureComponent) {
         keygen = _this$props12.keygen,
         convertBr = _this$props12.convertBr,
         data = _this$props12.data,
-        onFilter = _this$props12.onFilter;
+        onFilter = _this$props12.onFilter,
+        treeData = _this$props12.treeData;
     var disabled = this.getDisabledStatus();
     var className = (0, _styles.selectClass)('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && (0, _classname.getDirectionClass)('disabled'), !trim && 'pre');
     return _react.default.createElement("div", {
@@ -663,7 +664,7 @@ function (_PureComponent) {
       resultClassName: resultClassName,
       innerTitle: innerTitle,
       keygen: keygen,
-      data: data,
+      data: treeData || data,
       convertBr: convertBr
     }), this.renderOptions());
   };

package/css/Table/SeperateTable.js

@@ -53,6 +53,8 @@ var _Td = require("./Td");
 
 var _Sticky = _interopRequireDefault(require("../Sticky"));
 
+var _scrollBehavior = require("../utils/dom/scrollBehavior");
+
 var SeperateTable =
 /*#__PURE__*/
 function (_PureComponent) {
@@ -119,6 +121,12 @@ function (_PureComponent) {
     this.ajustBottom(dataChange);
   };
 
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    _PureComponent.prototype.componentWillUnmount.call(this);
+
+    if (this.rmOverScrollListener) this.rmOverScrollListener();
+  };
+
   _proto.getIndex = function getIndex(scrollTop) {
     if (scrollTop === void 0) {
       scrollTop = this.state.scrollTop;
@@ -429,6 +437,15 @@ function (_PureComponent) {
 
   _proto.bindElement = function bindElement(key, el) {
     this[key] = el;
+
+    if (key === 'headWrapper') {
+      if (el) {
+        this.rmOverScrollListener = (0, _scrollBehavior.banOverScrollX)(el);
+      } else if (this.rmOverScrollListener) {
+        this.rmOverScrollListener();
+        this.rmOverScrollListener = null;
+      }
+    }
   };
 
   _proto.scrollToTop = function scrollToTop() {

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.11.3-beta.4'
+  version: '1.11.3'
 }
 
 export default __default

package/css/index.js

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

package/css/utils/dom/scrollBehavior.js

@@ -0,0 +1,33 @@
+"use strict";
+
+exports.__esModule = true;
+exports.banOverScrollX = void 0;
+var htmlDom;
+var lastStyle = null;
+
+var getHtml = function getHtml() {
+  if (!htmlDom) htmlDom = document.body.parentElement;
+  return htmlDom;
+};
+
+var setScrollBehavior = function setScrollBehavior() {
+  if (lastStyle !== null) return;
+  lastStyle = getHtml().style.overscrollBehaviorX;
+  htmlDom.style.overscrollBehaviorX = 'none';
+};
+
+var resetScrollBehavior = function resetScrollBehavior() {
+  htmlDom.style.overscrollBehaviorX = lastStyle;
+  lastStyle = null;
+};
+
+var banOverScrollX = function banOverScrollX(el) {
+  el.addEventListener('mouseenter', setScrollBehavior);
+  el.addEventListener('mouseleave', resetScrollBehavior);
+  return function () {
+    el.removeEventListener('mouseenter', setScrollBehavior);
+    el.removeEventListener('mouseleave', resetScrollBehavior);
+  };
+};
+
+exports.banOverScrollX = banOverScrollX;