shineout 1.8.0 → 1.8.4

package/es/AnimationList/AbsoluteList.js

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

package/es/Button/Button.js

@@ -63,7 +63,7 @@ function (_PureComponent) {
       disabled: disabled
     }), this.props.className);
 
-    if (href) {
+    if (href && !disabled) {
       return React.createElement("a", _extends({
         href: href
       }, others, {

package/es/Cascader/Result.js

@@ -324,11 +324,12 @@ function (_PureComponent) {
         compressed = _this$props8.compressed,
         multiple = _this$props8.multiple;
     var result = value.length === 0 ? this.renderPlaceholder() : this.renderResult();
+    var clearEl = this.renderClear();
     return React.createElement("div", {
       ref: this.bindResult,
-      className: cascaderClass('result', multiple && compressed && 'compressed'),
+      className: cascaderClass('result', multiple && compressed && 'compressed', clearEl && 'result-clearable'),
       style: style
-    }, result, this.renderIndicator(), this.renderClear());
+    }, result, this.renderIndicator(), clearEl);
   };
 
   return Result;

package/es/Cascader/styles/cascader.less

@@ -5,6 +5,7 @@
 @list-prefix: ~'@{so-prefix}-list';
 @checkinput-prefix: ~'@{so-prefix}-checkinput';
 @input-prefix: ~'@{so-prefix}-input';
+@select-prefix: ~'@{so-prefix}-select';
 
 .@{cascader-prefix} {
   position: relative;
@@ -127,13 +128,22 @@
       background-color: inherit;
       color: inherit;
     }
+    .@{select-prefix}-multi {
+      visibility: visible;
+      cursor: not-allowed;
+    }
   }
 
   &:not(&-disabled) {
-    .@{cascader-prefix}-focus .@{cascader-prefix}-close,
+    &.@{cascader-prefix}-focus .@{cascader-prefix}-close,
     .@{cascader-prefix}-result:hover .@{cascader-prefix}-close {
       display: block;
     }
+
+    &.@{cascader-prefix}-focus .@{cascader-prefix}-result-clearable .@{select-prefix}-multi,
+    .@{cascader-prefix}-result-clearable:hover .@{select-prefix}-multi {
+      visibility: hidden;
+    }
   }
 
   &-multiple {

package/es/Checkbox/Group.js

@@ -89,12 +89,14 @@ function (_PureComponent) {
         data = _this$props2.data,
         datum = _this$props2.datum,
         keygen = _this$props2.keygen,
-        children = _this$props2.children;
+        children = _this$props2.children,
+        style = _this$props2.style;
     var className = classnames(checkinputClass('group', ['no-block', 'block'][Number(block)]), this.props.className);
 
     if (data === undefined) {
       return React.createElement("div", {
-        className: className
+        className: className,
+        style: style
       }, React.createElement(Provider, {
         value: {
           onRawChange: this.handleRawChange,
@@ -104,7 +106,8 @@ function (_PureComponent) {
     }
 
     return React.createElement("div", {
-      className: className
+      className: className,
+      style: style
     }, data.map(function (d, i) {
       return React.createElement(Checkbox, {
         checked: datum.check(d),

package/es/Checkbox/index.d.ts

@@ -47,7 +47,7 @@ export interface CheckboxProps<T> extends StandardProps, FormItemStandardProps<T
 
 // attention: checkbox group value is array
 
-export interface CheckboxGroupProps<Data, T> extends ListItemStandardProps<Data, T>, Omit<FormItemStandardProps<T[]>, 'placeholder'> {
+export interface CheckboxGroupProps<Data, T> extends ListItemStandardProps<Data, T>, Omit<FormItemStandardProps<T[]>, 'placeholder'>, StandardProps {
 
   /**
    * The data item

package/es/DatePicker/Month.js

@@ -58,12 +58,17 @@ function (_PureComponent) {
         type = _this$props3.type,
         current = _this$props3.current,
         index = _this$props3.index,
-        rangeDate = _this$props3.rangeDate;
+        rangeDate = _this$props3.rangeDate,
+        max = _this$props3.max;
     var date = utils.toDate(MONTHBASE);
     date.setMonth(i);
     date.setFullYear(current.getFullYear());
     var isDisabled = min && utils.compareMonth(min, date, 1) >= 0;
 
+    if (!isDisabled) {
+      isDisabled = max && utils.compareMonth(date, max, 1) >= 0;
+    }
+
     if (!isDisabled && type === 'month' && typeof disabled === 'function') {
       isDisabled = disabled(date);
     }
@@ -117,6 +122,7 @@ Month.propTypes = {
   current: PropTypes.object.isRequired,
   disabled: PropTypes.func,
   // max: PropTypes.object,
+  max: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   min: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
   onChange: PropTypes.func.isRequired,
   onModeChange: PropTypes.func.isRequired,

package/es/Datum/Tree.js

@@ -296,7 +296,8 @@ function () {
       var id = _this5.getKey(d, path[path.length - 1], i);
 
       if (_this5.dataMap.get(id)) {
-        console.warn("There is already a key \"" + id + "\" exists. The key must be unique.");
+        console.error("There is already a key \"" + id + "\" exists. The key must be unique.");
+        return;
       }
 
       _this5.dataMap.set(id, d);

package/es/Menu/Item.js

@@ -35,7 +35,9 @@ function (_PureComponent) {
 
     var key = _this.getKey(props);
 
-    var _props$bindItem = props.bindItem(_this.id, _this.update.bind(_assertThisInitialized(_assertThisInitialized(_this))), _this.updateOpen.bind(_assertThisInitialized(_assertThisInitialized(_this))), _this.updateInPath.bind(_assertThisInitialized(_assertThisInitialized(_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];
@@ -57,6 +59,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/es/Menu/Root.js

@@ -14,6 +14,7 @@ import List from './List';
 import { Provider } from './context';
 import { isArray } from '../utils/is';
 import { isRTL } from '../config';
+import { Component } from '../component';
 var modeDirection = {
   'vertical-auto': 'y',
   vertical: 'y',
@@ -55,13 +56,13 @@ function keyToMap(keys, value) {
 
 var Root =
 /*#__PURE__*/
-function (_React$Component) {
-  _inheritsLoose(Root, _React$Component);
+function (_Component) {
+  _inheritsLoose(Root, _Component);
 
   function Root(props) {
     var _this;
 
-    _this = _React$Component.call(this, props) || this;
+    _this = _Component.call(this, props) || this;
     _this.state = {
       activeKey: null,
       scrollTop: 0,
@@ -92,6 +93,8 @@ function (_React$Component) {
   var _proto = Root.prototype;
 
   _proto.componentDidMount = function componentDidMount() {
+    _Component.prototype.componentDidMount.call(this);
+
     this.updateState();
   };
 
@@ -101,6 +104,8 @@ function (_React$Component) {
 
   _proto.componentWillUnmount = function componentWillUnmount() {
     this.container.removeEventListener('wheel', this.handleWheel);
+
+    _Component.prototype.componentWillUnmount.call(this);
   };
 
   _proto.getOpenKeys = function getOpenKeys() {
@@ -396,7 +401,7 @@ function (_React$Component) {
   };
 
   return Root;
-}(React.Component);
+}(Component);
 
 Root.propTypes = _objectSpread({}, getProps(PropTypes, 'style', 'keygen'), {
   active: PropTypes.func,

package/es/Modal/events.js

@@ -101,10 +101,13 @@ export function open(props, isPortal) {
   div.style.display = 'block';
   var parsed = parseInt(zIndex, 10);
   if (!Number.isNaN(parsed)) div.style.zIndex = parsed;
-  var scrollWidth = window.innerWidth - docSize.width;
   var doc = document.body.parentNode;
-  doc.style.overflow = 'hidden';
-  doc.style.paddingRight = scrollWidth + "px";
+
+  if (!doc.style.paddingRight) {
+    var scrollWidth = window.innerWidth - docSize.width;
+    doc.style.overflow = 'hidden';
+    doc.style.paddingRight = scrollWidth + "px";
+  }
 
   var handleClose = function handleClose() {
     if (onClose) onClose();

package/es/Rule/index.d.ts

@@ -51,7 +51,7 @@ export interface RuleParams {
   } | validFunc | any) ;
 }
 
-export type RuleParamsType<Value, P = any, FormData = any> = Array<RuleParams | ((value?: Value, formData?: FormData, callback?: ((cbArgs: true | Error) => void), props?: P) => void)>
+export type RuleParamsType<Value, P = any, FormData = any> = Array<RuleParams  | ((value?: Value, formData?: FormData, callback?: ((cbArgs: true | Error) => void), props?: P) => void) | object>
 
 export interface RuleResult {
   required (message?: string): Required;
@@ -82,8 +82,31 @@ export interface RuleResult {
 
 }
 
- declare function Rule<T extends RuleParams, U>(...options: T[]) : {
-  [P in keyof T]: (args?: U ) => {args: U, func: validFunc, message?: string}
+export interface paramFunc<U> {
+  (args?: U ): {args: U, func: validFunc, message?: string}
+}
+
+declare function Rule<U>() : RuleResult
+
+declare function Rule<A extends RuleParams, U>(a: A) : {
+  [P in keyof A]: paramFunc<U>
+} & RuleResult
+
+declare function Rule<A extends RuleParams, B extends RuleParams, U>(a: A, b: B) : {
+  [P in keyof (A & B)]: paramFunc<U>
+} & RuleResult
+
+declare function Rule<A extends RuleParams, B extends RuleParams, C extends RuleParams, U>(a: A, b: B, c: C) : {
+  [P in keyof (A & B & C)]: paramFunc<U>
+} & RuleResult
+
+declare function Rule<A extends RuleParams, B extends RuleParams, C extends RuleParams, D extends RuleParams, U>(a: A, b: B, c: C, d: D) : {
+  [P in keyof (A & B & C & D)]: paramFunc<U>
+} & RuleResult
+
+ declare function Rule<
+   U>(...args: RuleParams[]) : {
+  [key: string]: paramFunc<U>
  } & RuleResult
 
 

package/es/Scroll/Scroll.js

@@ -43,6 +43,7 @@ function (_PureComponent) {
     _this.handleTouchStart = _this.handleTouchStart.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.handleTouchMove = _this.handleTouchMove.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.setStartPoint = _this.setStartPoint.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleInnerScroll = _this.handleInnerScroll.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     return _this;
   }
 
@@ -61,6 +62,7 @@ function (_PureComponent) {
     this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
       passive: false
     });
+    this.inner.addEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -77,6 +79,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() {
@@ -256,22 +259,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 = isRTL();
     var className = classnames(scrollClass('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);

package/es/Select/Result.js

@@ -338,18 +338,19 @@ function (_PureComponent) {
     var showPlaceholder = this.isEmptyResult();
     var result = showPlaceholder ? this.renderPlaceholder() : this.renderResult();
     var rtl = isRTL();
+    var clearEl = this.renderClear();
 
     if (rtl) {
       return React.createElement("div", {
         ref: this.bindResult,
-        className: selectClass('result', compressed && 'compressed', showPlaceholder && 'empty')
-      }, this.renderClear(), this.renderIndicator(), result);
+        className: selectClass('result', compressed && 'compressed', showPlaceholder && 'empty', clearEl && 'result-clearable')
+      }, clearEl, this.renderIndicator(), result);
     }
 
     return React.createElement("div", {
       ref: this.bindResult,
-      className: selectClass('result', compressed && 'compressed', showPlaceholder && 'empty')
-    }, result, this.renderIndicator(), this.renderClear());
+      className: selectClass('result', compressed && 'compressed', showPlaceholder && 'empty', clearEl && 'result-clearable')
+    }, result, this.renderIndicator(), clearEl);
   };
 
   return Result;

package/es/Select/styles/select.less

@@ -176,9 +176,6 @@
     margin-top: -5px;
 
     &.@{select-prefix}-close {
-      box-sizing: content-box;
-      border-left: 1px solid #fff;
-      border-right: 1px solid #fff;
       display: none;
       .close(12px, @select-clear-bg-color);
     }
@@ -221,6 +218,10 @@
   &-result:hover &-close {
     display: block;
   }
+  &-focus &-result-clearable &-multi,
+  &-result-clearable:hover &-multi{
+    visibility: hidden;
+  }
   &-focus .@{select-prefix}-caret {
     transform: rotate(180deg);
   }
@@ -509,6 +510,10 @@
           display: none;
         }
       }
+      .@{select-prefix}-multi {
+        visibility: visible;
+        cursor: not-allowed;
+      }
     }
   }
 

package/es/Table/SeperateTable.js

@@ -314,13 +314,17 @@ function (_PureComponent) {
 
 
       if (treeColumnsName && changedByExpand) {
+        // Blank space may appear after clicking the top or bottom collapse button
         if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
-          this.tbody.style.marginTop = scrollHeight + "px";
-          setTranslate(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-          this.lastScrollTop = fullHeight;
+          if (fullHeight <= scrollHeight) {
+            index = 0;
+          } else {
+            this.tbody.style.marginTop = scrollHeight + "px";
+            setTranslate(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
+            this.lastScrollTop = fullHeight;
+            return;
+          }
         }
-
-        return;
       }
 
       if (index === 0) {
@@ -601,7 +605,8 @@ function (_PureComponent) {
         rowHeight = _this$props7.rowHeight,
         columnResizable = _this$props7.columnResizable,
         innerScrollAttr = _this$props7.innerScrollAttr,
-        others = _objectWithoutPropertiesLoose(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
+        bordered = _this$props7.bordered,
+        others = _objectWithoutPropertiesLoose(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
 
     var _this$state3 = this.state,
         colgroup = _this$state3.colgroup,
@@ -648,7 +653,7 @@ function (_PureComponent) {
         height: prevHeight
       }
     }), React.createElement("table", {
-      className: tableClass(!colgroup && minWidthSup && 'init'),
+      className: tableClass(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
       style: {
         width: width
       },
@@ -690,7 +695,8 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      ref: this.bindThead
+      ref: this.bindThead,
+      className: tableClass('table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,

package/es/Table/SimpleTable.js

@@ -145,14 +145,16 @@ 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;
     var inner = React.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: tableClass(bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -190,7 +192,8 @@ function (_PureComponent) {
         width = _this$props3.width,
         fixed = _this$props3.fixed,
         columnResizable = _this$props3.columnResizable,
-        others = _objectWithoutPropertiesLoose(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
+        bordered = _this$props3.bordered,
+        others = _objectWithoutPropertiesLoose(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
 
     var _this$state2 = this.state,
         colgroup = _this$state2.colgroup,
@@ -207,7 +210,7 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      className: tableClass(!colgroup && minWidthSup && 'init')
+      className: tableClass(!colgroup && minWidthSup && 'init', bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -227,11 +230,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.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: tableClass(bordered && 'table-bordered')
     }, children);
     return [hideHeader ? null : this.renderHeader(), this.renderBody(), children];
   };
@@ -250,7 +255,8 @@ SimpleTable.propTypes = {
   dataChangeResize: PropTypes.bool,
   columnResizable: PropTypes.bool,
   sticky: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]),
-  hideHeader: PropTypes.bool
+  hideHeader: PropTypes.bool,
+  bordered: PropTypes.bool
 };
 SimpleTable.defaultProps = {
   data: undefined,

package/es/Table/Table.js

@@ -135,7 +135,9 @@ function (_Component) {
       className: className,
       ref: this.bindTable,
       style: newStyle
-    }, events), React.createElement(RenderTable, props), loading && React.createElement("div", {
+    }, events), React.createElement(RenderTable, _extends({}, props, {
+      bordered: bordered
+    })), loading && React.createElement("div", {
       className: tableClass('loading')
     }, typeof loading === 'boolean' ? React.createElement(Spin, {
       size: 40

package/es/Table/resizable.js

@@ -64,7 +64,7 @@ export default (function (Table) {
       var onColumnResize = this.props.onColumnResize;
       var changed = immer(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/es/Table/styles/table.less

@@ -283,7 +283,7 @@
       }
     }
 
-    table {
+    .@{table-prefix}-table-bordered {
       > thead,
       > tbody,
       > tfoot {