shineout 1.8.2 → 1.8.7-beta.1

package/css/AnimationList/AbsoluteList.js

@@ -115,8 +115,8 @@ function _default(List) {
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       var _this2 = this;
 
-      if ((0, _shallowEqual.default)(prevProps.value, this.props.value)) return;
       if (!this.props.focus) this.ajustdoc = false;
+      if ((0, _shallowEqual.default)(prevProps.value, this.props.value)) return;
       setTimeout(function () {
         _this2.forceUpdate();
       });

package/css/Button/Button.js

@@ -83,7 +83,7 @@ function (_PureComponent) {
       disabled: disabled
     }), this.props.className);
 
-    if (href) {
+    if (href && !disabled) {
       return _react.default.createElement("a", (0, _extends2.default)({
         href: href
       }, others, {

package/css/Form/Field.js

@@ -64,13 +64,18 @@ function (_Component) {
       });
     }
 
+    var cloneProps = {
+      value: value,
+      error: error,
+      onChange: this.handleChange
+    };
+
+    if (disabled !== undefined) {
+      cloneProps.disabled = disabled;
+    }
+
     if ((0, _react.isValidElement)(children)) {
-      return (0, _react.cloneElement)(children, {
-        value: value,
-        error: error,
-        onChange: this.handleChange,
-        disabled: disabled
-      });
+      return (0, _react.cloneElement)(children, cloneProps);
     }
 
     console.error(new Error('Form.Field expect a single ReactElement or a function.'));

package/css/Menu/Item.js

@@ -57,7 +57,9 @@ function (_PureComponent) {
 
     var key = _this.getKey(props);
 
-    var _props$bindItem = props.bindItem(_this.id, _this.update.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))), _this.updateOpen.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))), _this.updateInPath.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)))),
+    var noop = function noop() {};
+
+    var _props$bindItem = props.bindItem(_this.id, noop, noop, noop),
         activeUpdate = _props$bindItem[0],
         openUpdate = _props$bindItem[1],
         inPathUpdate = _props$bindItem[2];
@@ -79,6 +81,12 @@ function (_PureComponent) {
 
   var _proto = Item.prototype;
 
+  _proto.componentDidMount = function componentDidMount() {
+    _PureComponent.prototype.componentDidMount.call(this);
+
+    this.props.bindItem(this.id, this.update.bind(this), this.updateOpen.bind(this), this.updateInPath.bind(this));
+  };
+
   _proto.componentWillUnmount = function componentWillUnmount() {
     _PureComponent.prototype.componentWillUnmount.call(this);
 

package/css/Scroll/Scroll.js

@@ -67,6 +67,7 @@ function (_PureComponent) {
     _this.handleTouchStart = _this.handleTouchStart.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleTouchMove = _this.handleTouchMove.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.setStartPoint = _this.setStartPoint.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleInnerScroll = _this.handleInnerScroll.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
 
@@ -85,6 +86,7 @@ function (_PureComponent) {
     this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
       passive: false
     });
+    this.inner.addEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -101,6 +103,7 @@ function (_PureComponent) {
     this.wheelElement.removeEventListener('wheel', this.handleWheel);
     this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
     this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
+    this.inner.removeEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.getWheelRect = function getWheelRect() {
@@ -280,22 +283,39 @@ function (_PureComponent) {
 
     this.setStartPoint(position);
     this.boundleScroll();
-  };
+  } // inner scroll
+  ;
 
-  _proto.render = function render() {
+  _proto.handleInnerScroll = function handleInnerScroll(e) {
+    var target = e.target;
     var _this$props6 = this.props,
-        children = _this$props6.children,
-        scrollWidth = _this$props6.scrollWidth,
-        scrollHeight = _this$props6.scrollHeight,
         left = _this$props6.left,
-        top = _this$props6.top,
-        scrollX = _this$props6.scrollX,
-        scrollY = _this$props6.scrollY,
-        style = _this$props6.style;
+        scrollWidth = _this$props6.scrollWidth;
 
     var _this$getWheelRect2 = this.getWheelRect(),
-        width = _this$getWheelRect2.width,
-        height = _this$getWheelRect2.height;
+        width = _this$getWheelRect2.width;
+
+    if (target.scrollLeft) {
+      this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+      target.scrollLeft = 0;
+      target.scrollTop = 0;
+    }
+  };
+
+  _proto.render = function render() {
+    var _this$props7 = this.props,
+        children = _this$props7.children,
+        scrollWidth = _this$props7.scrollWidth,
+        scrollHeight = _this$props7.scrollHeight,
+        left = _this$props7.left,
+        top = _this$props7.top,
+        scrollX = _this$props7.scrollX,
+        scrollY = _this$props7.scrollY,
+        style = _this$props7.style;
+
+    var _this$getWheelRect3 = this.getWheelRect(),
+        width = _this$getWheelRect3.width,
+        height = _this$getWheelRect3.height;
 
     var rtl = (0, _config.isRTL)();
     var className = (0, _classnames.default)((0, _styles.scrollClass)('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);

package/css/Select/Input.js

@@ -46,7 +46,9 @@ function (_Component) {
     _this.handleBlur = _this.handleBlur.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.geHandleMax = _this.geHandleMax.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handlePaste = _this.handlePaste.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-    _this.focusInput = _this.focusInput.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))); // for mutiple select
+    _this.focusInput = _this.focusInput.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleCompositionStart = _this.handleCompositionStart.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleCompositionEnd = _this.handleCompositionEnd.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))); // for mutiple select
 
     _this.props.setInputReset(_this.reset.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)))); // set focus func to Select
 
@@ -98,7 +100,7 @@ function (_Component) {
   _proto.geHandleMax = function geHandleMax(e) {
     var maxLength = this.props.maxLength;
 
-    if (!maxLength) {
+    if (!maxLength || this.composition) {
       return true;
     }
 
@@ -219,6 +221,15 @@ function (_Component) {
     this.props.onInputBlur(text);
   };
 
+  _proto.handleCompositionStart = function handleCompositionStart() {
+    this.composition = true;
+  };
+
+  _proto.handleCompositionEnd = function handleCompositionEnd(e) {
+    this.composition = false;
+    this.handleInput(e);
+  };
+
   _proto.render = function render() {
     var _this$props = this.props,
         text = _this$props.text,
@@ -233,7 +244,9 @@ function (_Component) {
       contentEditable: focus || this.state.editable,
       onFocus: handleFocus,
       onBlur: this.handleBlur,
-      title: !focus && (0, _is.isString)(value) ? value : null
+      title: !focus && (0, _is.isString)(value) ? value : null,
+      onCompositionStart: this.handleCompositionStart,
+      onCompositionEnd: this.handleCompositionEnd
     };
 
     if ((0, _react.isValidElement)(value)) {

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
         });
       });
     }
@@ -635,15 +629,16 @@ function (_PureComponent) {
         rowHeight = _this$props7.rowHeight,
         columnResizable = _this$props7.columnResizable,
         innerScrollAttr = _this$props7.innerScrollAttr,
-        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
-    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;
+        bordered = _this$props7.bordered,
+        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
+    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;
@@ -681,7 +676,7 @@ function (_PureComponent) {
         height: prevHeight
       }
     }), _react.default.createElement("table", {
-      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init'),
+      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
       style: {
         width: width
       },
@@ -724,7 +719,8 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      ref: this.bindThead
+      ref: this.bindThead,
+      className: (0, _styles.tableClass)('table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
       colgroup: colgroup,
       columns: columns,
@@ -751,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/SimpleTable.js

@@ -166,7 +166,8 @@ function (_PureComponent) {
         data = _this$props2.data,
         onResize = _this$props2.onResize,
         columnResizable = _this$props2.columnResizable,
-        sticky = _this$props2.sticky;
+        sticky = _this$props2.sticky,
+        bordered = _this$props2.bordered;
     var _this$state = this.state,
         colgroup = _this$state.colgroup,
         scrollAble = _this$state.scrollAble;
@@ -174,7 +175,8 @@ function (_PureComponent) {
     var inner = _react.default.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: (0, _styles.tableClass)(bordered && 'table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
       colgroup: colgroup,
       columns: columns,
@@ -214,7 +216,8 @@ function (_PureComponent) {
         width = _this$props3.width,
         fixed = _this$props3.fixed,
         columnResizable = _this$props3.columnResizable,
-        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
+        bordered = _this$props3.bordered,
+        others = (0, _objectWithoutPropertiesLoose2.default)(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
     var _this$state2 = this.state,
         colgroup = _this$state2.colgroup,
         resize = _this$state2.resize;
@@ -230,7 +233,7 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init')
+      className: (0, _styles.tableClass)(!colgroup && minWidthSup && 'init', bordered && 'table-bordered')
     }, _react.default.createElement(_Colgroup.default, {
       colgroup: colgroup,
       columns: columns,
@@ -250,11 +253,13 @@ function (_PureComponent) {
         columns = _this$props4.columns,
         width = _this$props4.width,
         children = _this$props4.children,
-        hideHeader = _this$props4.hideHeader;
+        hideHeader = _this$props4.hideHeader,
+        bordered = _this$props4.bordered;
     if (!columns || columns.length === 0) return _react.default.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: (0, _styles.tableClass)(bordered && 'table-bordered')
     }, children);
     return [hideHeader ? null : this.renderHeader(), this.renderBody(), children];
   };
@@ -273,7 +278,8 @@ SimpleTable.propTypes = {
   dataChangeResize: _propTypes.default.bool,
   columnResizable: _propTypes.default.bool,
   sticky: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.bool]),
-  hideHeader: _propTypes.default.bool
+  hideHeader: _propTypes.default.bool,
+  bordered: _propTypes.default.bool
 };
 SimpleTable.defaultProps = {
   data: undefined,

package/css/Table/Table.js

@@ -163,7 +163,9 @@ function (_Component) {
       className: className,
       ref: this.bindTable,
       style: newStyle
-    }, events), _react.default.createElement(RenderTable, props), loading && _react.default.createElement("div", {
+    }, events), _react.default.createElement(RenderTable, (0, _extends2.default)({}, props, {
+      bordered: bordered
+    })), loading && _react.default.createElement("div", {
       className: (0, _styles.tableClass)('loading')
     }, typeof loading === 'boolean' ? _react.default.createElement(_Spin.default, {
       size: 40

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/Table/resizable.js

@@ -79,7 +79,7 @@ var _default = function _default(Table) {
       var onColumnResize = this.props.onColumnResize;
       var changed = (0, _immer.default)(this.state, function (draft) {
         var column = draft.columns[index];
-        draft.delta += parseFloat(width - (column.width || 0));
+        draft.delta += parseFloat(width - (column.width || colgroup[index] || 0));
         colgroup[index] = width;
         draft.columns.forEach(function (col, i) {
           var w = colgroup[i];

package/css/Table/styles/table.css

@@ -237,19 +237,19 @@ table > thead > tr > th.so-table-condensed {
 .so-table-bordered .so-table-head table {
   border-bottom-width: 1px;
 }
-.so-table-bordered table > thead > tr > th,
-.so-table-bordered table > tbody > tr > th,
-.so-table-bordered table > tfoot > tr > th,
-.so-table-bordered table > thead > tr > td,
-.so-table-bordered table > tbody > tr > td,
-.so-table-bordered table > tfoot > tr > td {
+.so-table-bordered .so-table-table-bordered > thead > tr > th,
+.so-table-bordered .so-table-table-bordered > tbody > tr > th,
+.so-table-bordered .so-table-table-bordered > tfoot > tr > th,
+.so-table-bordered .so-table-table-bordered > thead > tr > td,
+.so-table-bordered .so-table-table-bordered > tbody > tr > td,
+.so-table-bordered .so-table-table-bordered > tfoot > tr > td {
   border-right: 1px solid var(--table-border-color, #ddd);
   border-bottom-width: 1px;
 }
-.so-table-bordered table > tbody > tr > td.so-table-ignore-bottom-border {
+.so-table-bordered .so-table-table-bordered > tbody > tr > td.so-table-ignore-bottom-border {
   border-bottom: none;
 }
-.so-table-bordered table > thead + tbody > tr:first-child > td {
+.so-table-bordered .so-table-table-bordered > thead + tbody > tr:first-child > td {
   border-top-width: 1px;
 }
 .so-table-bordered .so-table-body table {

package/css/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.2' }
+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.2'
+  version: '1.8.7-beta.1'
 };
 exports.default = _default;