shineout 1.11.3-beta.3 → 1.11.3

package/css/Form/Item.js

@@ -170,10 +170,14 @@ function (_Component) {
   };
 
   _proto2.renderHelp = function renderHelp(errors) {
-    if (errors.length > 0) {
+    var realErrors = errors.filter(function (e) {
+      return e.message;
+    });
+
+    if (realErrors.length > 0) {
       return _react.default.createElement("div", {
         className: (0, _styles.formClass)('error')
-      }, errors.map(function (e, i) {
+      }, realErrors.map(function (e, i) {
         return _react.default.createElement("div", {
           key: i
         }, e.message);

package/css/Form/inputable.js

@@ -88,7 +88,6 @@ var _default = (0, _func.curry)(function (Origin) {
       _this.handleError = _this.handleError.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       _this.validate = _this.validate.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       _this.validateHook = _this.validateHook.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-      _this.forceValidate = _this.forceValidate.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       _this.lastValue = formDatum && name ? formDatum.get(name) || {} : {};
       return _this;
     }
@@ -340,10 +339,6 @@ var _default = (0, _func.curry)(function (Origin) {
       if (fieldSetValidate) fieldSetValidate(true);
     };
 
-    _proto.forceValidate = function forceValidate() {
-      this.validate(this.props.value);
-    };
-
     _proto.handleUpdate = function handleUpdate(value, sn, type) {
       var _this5 = this;
 
@@ -407,8 +402,7 @@ var _default = (0, _func.curry)(function (Origin) {
         value: this.getValue(),
         onChange: this.handleChange,
         onDatumBind: this.handleDatumBind,
-        validateHook: this.validateHook,
-        forceValidate: this.forceValidate
+        validateHook: this.validateHook
       }));
     };
 

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/Upload/Upload.js

@@ -116,7 +116,6 @@ function (_PureComponent) {
     _this.removeValue = _this.removeValue.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.recoverValue = _this.recoverValue.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.validatorHandle = _this.validatorHandle.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-    _this.updateValidate = _this.updateValidate.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.useValidator = _this.useValidator.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleFileDrop = _this.handleFileDrop.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleReplace = _this.handleReplace.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
@@ -168,8 +167,6 @@ function (_PureComponent) {
   };
 
   _proto.removeFile = function removeFile(id) {
-    var _this2 = this;
-
     var _this$props = this.props,
         beforeCancel = _this$props.beforeCancel,
         onErrorRemove = _this$props.onErrorRemove;
@@ -184,14 +181,12 @@ function (_PureComponent) {
         if (file.status === _request.ERROR && onErrorRemove) {
           onErrorRemove(file.xhr, file.blob, file);
         }
-
-        _this2.updateValidate();
       });
     }
   };
 
   _proto.removeValue = function removeValue(index) {
-    var _this3 = this;
+    var _this2 = this;
 
     var _this$props2 = this.props,
         recoverAble = _this$props2.recoverAble,
@@ -201,19 +196,19 @@ function (_PureComponent) {
     var current = this.props.value[index];
     var startRemove = typeof beforeRemove === 'function' ? beforeRemove(current) : Promise.resolve();
     startRemove.then(function () {
-      _this3.setState((0, _immer.default)(function (draft) {
-        draft.recycle.push(_this3.props.value[index]);
+      _this2.setState((0, _immer.default)(function (draft) {
+        draft.recycle.push(_this2.props.value[index]);
 
         if (typeof recoverAble === 'number' && draft.recycle.length > recoverAble) {
           draft.recycle.shift();
         }
       }));
 
-      var value = (0, _immer.default)(_this3.props.value, function (draft) {
+      var value = (0, _immer.default)(_this2.props.value, function (draft) {
         draft.splice(index, 1);
       });
 
-      _this3.props.onChange(value);
+      _this2.props.onChange(value);
     }).catch(function () {});
   };
 
@@ -322,7 +317,7 @@ function (_PureComponent) {
     var _addFile = (0, _asyncToGenerator2.default)(
     /*#__PURE__*/
     _regenerator.default.mark(function _callee2(e) {
-      var _this4 = this;
+      var _this3 = this;
 
       var _this$props4, beforeUpload, value, limit, filesFilter, files, finishedCode, fileList, addLength, list, _loop, i, _ret;
 
@@ -368,7 +363,7 @@ function (_PureComponent) {
                         files[id] = file; // eslint-disable-next-line no-await-in-loop
 
                         _context2.next = 6;
-                        return _this4.useValidator(blob);
+                        return _this3.useValidator(blob);
 
                       case 6:
                         error = _context2.sent;
@@ -378,7 +373,7 @@ function (_PureComponent) {
                           break;
                         }
 
-                        if (_this4.validatorHandle(error, file.blob)) {
+                        if (_this3.validatorHandle(error, file.blob)) {
                           _context2.next = 11;
                           break;
                         }
@@ -391,10 +386,10 @@ function (_PureComponent) {
                         file.status = _request.ERROR;
 
                         if (beforeUpload) {
-                          beforeUpload(blob, _this4.validatorHandle) // eslint-disable-next-line no-loop-func
+                          beforeUpload(blob, _this3.validatorHandle) // eslint-disable-next-line no-loop-func
                           .then(function (args) {
                             if (finishedCode) {
-                              _this4.setState((0, _immer.default)(function (draft) {
+                              _this3.setState((0, _immer.default)(function (draft) {
                                 draft.files[id] = Object.assign({}, draft.files[id], args);
                               }));
                             } else {
@@ -409,12 +404,12 @@ function (_PureComponent) {
 
                       case 15:
                         if (beforeUpload) {
-                          beforeUpload(blob, _this4.validatorHandle) // eslint-disable-next-line no-loop-func
+                          beforeUpload(blob, _this3.validatorHandle) // eslint-disable-next-line no-loop-func
                           .then(function (args) {
-                            if (args.status !== _request.ERROR) files[id].xhr = _this4.uploadFile(id, blob, args.data);
+                            if (args.status !== _request.ERROR) files[id].xhr = _this3.uploadFile(id, blob, args.data);
 
                             if (finishedCode) {
-                              _this4.setState((0, _immer.default)(function (draft) {
+                              _this3.setState((0, _immer.default)(function (draft) {
                                 draft.files[id] = Object.assign({}, draft.files[id], args);
                               }));
                             } else {
@@ -423,7 +418,7 @@ function (_PureComponent) {
                           }) // eslint-disable-next-line no-loop-func
                           .catch(function () {
                             if (finishedCode) {
-                              _this4.setState((0, _immer.default)(function (draft) {
+                              _this3.setState((0, _immer.default)(function (draft) {
                                 delete draft.files[id];
                               }));
                             } else {
@@ -431,7 +426,7 @@ function (_PureComponent) {
                             }
                           });
                         } else {
-                          files[id].xhr = _this4.uploadFile(id, blob);
+                          files[id].xhr = _this3.uploadFile(id, blob);
                         }
 
                       case 16:
@@ -470,8 +465,6 @@ function (_PureComponent) {
               finishedCode = true;
               this.setState({
                 files: files
-              }, function () {
-                _this4.updateValidate();
               });
 
             case 21:
@@ -490,7 +483,7 @@ function (_PureComponent) {
   }();
 
   _proto.uploadFile = function uploadFile(id, file, data) {
-    var _this5 = this;
+    var _this4 = this;
 
     var _this$props5 = this.props,
         onSuccess = _this$props5.onSuccess,
@@ -524,14 +517,14 @@ function (_PureComponent) {
           throttle = false;
         }, 16);
 
-        if (_this5.state.files[id]) {
-          _this5.setState((0, _immer.default)(function (draft) {
+        if (_this4.state.files[id]) {
+          _this4.setState((0, _immer.default)(function (draft) {
             draft.files[id].process = percent;
             if (msg) draft.files[id].message = msg;
           }), // expose the file progress to Upload.Button
           function () {
             if (typeof _onProgress === 'function') {
-              _onProgress(_this5.state.files[id]);
+              _onProgress(_this4.state.files[id]);
             }
           });
         }
@@ -539,7 +532,7 @@ function (_PureComponent) {
       onSuccess: onSuccess,
       onLoad: function onLoad(xhr) {
         if (!/^2|1223/.test(xhr.status)) {
-          _this5.handleError(id, xhr, file);
+          _this4.handleError(id, xhr, file);
 
           return;
         }
@@ -553,26 +546,26 @@ function (_PureComponent) {
         }
 
         if (value instanceof Error) {
-          _this5.setState((0, _immer.default)(function (draft) {
+          _this4.setState((0, _immer.default)(function (draft) {
             draft.files[id].status = _request.ERROR;
             draft.files[id].name = file.name;
             draft.files[id].message = value.message;
           }));
         } else {
-          _this5.setState((0, _immer.default)(function (draft) {
+          _this4.setState((0, _immer.default)(function (draft) {
             delete draft.files[id];
           })); // add value
 
 
-          var values = (0, _immer.default)(_this5.props.value, function (draft) {
+          var values = (0, _immer.default)(_this4.props.value, function (draft) {
             draft.push(value);
           });
 
-          _this5.props.onChange(values);
+          _this4.props.onChange(values);
         }
       },
       onError: function onError(xhr) {
-        return _this5.handleError(id, xhr, file);
+        return _this4.handleError(id, xhr, file);
       }
     };
 
@@ -591,11 +584,11 @@ function (_PureComponent) {
   };
 
   _proto.handleReplace = function handleReplace(files, index) {
-    var _this6 = this;
+    var _this5 = this;
 
     this.removeValue(index);
     setTimeout(function () {
-      _this6.addFile({
+      _this5.addFile({
         files: files,
         fromDragger: true
       });
@@ -603,8 +596,6 @@ function (_PureComponent) {
   };
 
   _proto.handleError = function handleError(id, xhr, file) {
-    var _this7 = this;
-
     var _this$props6 = this.props,
         onError = _this$props6.onError,
         onHttpError = _this$props6.onHttpError;
@@ -615,14 +606,7 @@ function (_PureComponent) {
       if (!draft.files[id]) return;
       draft.files[id].status = _request.ERROR;
       draft.files[id].message = message;
-    }), function () {
-      _this7.updateValidate();
-    });
-  };
-
-  _proto.updateValidate = function updateValidate() {
-    var forceValidate = this.props.forceValidate;
-    forceValidate();
+    }));
   };
 
   _proto.renderHandle = function renderHandle() {
@@ -665,7 +649,7 @@ function (_PureComponent) {
   };
 
   _proto.render = function render() {
-    var _this8 = this;
+    var _this6 = this;
 
     var _this$props8 = this.props,
         limit = _this$props8.limit,
@@ -716,7 +700,7 @@ function (_PureComponent) {
         accept: accept,
         dropData: i,
         disabled: disabled,
-        onDrop: _this8.handleReplace
+        onDrop: _this6.handleReplace
       }, _react.default.createElement(ResultComponent, {
         renderContent: renderContent,
         value: v,
@@ -724,7 +708,7 @@ function (_PureComponent) {
         index: i,
         style: imageStyle,
         renderResult: renderResult,
-        onRemove: _this8.getCanDelete(v, i) ? _this8.removeValue : undefined,
+        onRemove: _this6.getCanDelete(v, i) ? _this6.removeValue : undefined,
         removeConfirm: removeConfirm,
         onPreview: onPreview
       }));
@@ -733,7 +717,7 @@ function (_PureComponent) {
         key: id,
         id: id,
         style: imageStyle,
-        onRemove: _this8.removeFile
+        onRemove: _this6.removeFile
       }));
     }), imageStyle && !leftHandler && this.renderHandle(), recoverAble && recycle.map(function (v, i) {
       return _react.default.createElement(ResultComponent, {
@@ -745,7 +729,7 @@ function (_PureComponent) {
         renderResult: renderResult,
         recoverAble: !!recoverAble,
         showRecover: recoverAble && limit > value.length,
-        onRecover: _this8.recoverValue,
+        onRecover: _this6.recoverValue,
         style: imageStyle
       });
     })));
@@ -779,7 +763,6 @@ Upload.propTypes = {
   request: _propTypes.default.func,
   validateHook: _propTypes.default.func,
   validator: _propTypes.default.object,
-  forceValidate: _propTypes.default.func,
   value: _propTypes.default.array,
   customResult: _propTypes.default.oneOfType([_propTypes.default.element, _propTypes.default.func]),
   style: _propTypes.default.object,

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.11.2'
+  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.2'
+  version: '1.11.3'
 };
 exports.default = _default;

package/css/utils/cleanProps.js

@@ -7,7 +7,7 @@ exports.default = cleanProps;
 
 var _immer = _interopRequireDefault(require("immer"));
 
-var names = ['delay', 'onDatumBind', 'rules', 'formDatum', 'forceChange', 'trim', 'beforeChange', 'validateHook', 'innerFormNamePath', 'fieldSetValidate', 'combineRules', 'popoverProps', 'inputFocus', 'placeTitle', 'cancelChange', 'integerLimit', 'autoSelect', 'autoFix', 'numType', 'forceValidate'];
+var names = ['delay', 'onDatumBind', 'rules', 'formDatum', 'forceChange', 'trim', 'beforeChange', 'validateHook', 'innerFormNamePath', 'fieldSetValidate', 'combineRules', 'popoverProps', 'inputFocus', 'placeTitle', 'cancelChange', 'integerLimit', 'autoSelect', 'autoFix', 'numType'];
 /**
  * delete some props if needed, will not modify the pass argument
  * @param props

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;