shineout 1.8.0-rc.7 → 1.8.3

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/Cascader/Result.js

@@ -349,11 +349,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.default.createElement("div", {
       ref: this.bindResult,
-      className: (0, _styles3.cascaderClass)('result', multiple && compressed && 'compressed'),
+      className: (0, _styles3.cascaderClass)('result', multiple && compressed && 'compressed', clearEl && 'result-clearable'),
       style: style
-    }, result, this.renderIndicator(), this.renderClear());
+    }, result, this.renderIndicator(), clearEl);
   };
 
   return Result;

package/css/Cascader/styles/cascader.css

@@ -127,10 +127,18 @@
   background-color: inherit;
   color: inherit;
 }
-.so-cascader:not(.so-cascader-disabled) .so-cascader-focus .so-cascader-close,
+.so-cascader-disabled .so-cascader-result .so-select-multi {
+  visibility: visible;
+  cursor: not-allowed;
+}
+.so-cascader:not(.so-cascader-disabled).so-cascader-focus .so-cascader-close,
 .so-cascader:not(.so-cascader-disabled) .so-cascader-result:hover .so-cascader-close {
   display: block;
 }
+.so-cascader:not(.so-cascader-disabled).so-cascader-focus .so-cascader-result-clearable .so-select-multi,
+.so-cascader:not(.so-cascader-disabled) .so-cascader-result-clearable:hover .so-select-multi {
+  visibility: hidden;
+}
 .so-cascader-multiple .so-cascader-close {
   right: 19px;
 }

package/css/Checkbox/Group.js

@@ -108,12 +108,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 = (0, _classnames.default)((0, _styles.checkinputClass)('group', ['no-block', 'block'][Number(block)]), this.props.className);
 
     if (data === undefined) {
       return _react.default.createElement("div", {
-        className: className
+        className: className,
+        style: style
       }, _react.default.createElement(_context.Provider, {
         value: {
           onRawChange: this.handleRawChange,
@@ -123,7 +125,8 @@ function (_PureComponent) {
     }
 
     return _react.default.createElement("div", {
-      className: className
+      className: className,
+      style: style
     }, data.map(function (d, i) {
       return _react.default.createElement(_Checkbox.default, {
         checked: datum.check(d),

package/css/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> {
+export interface CheckboxGroupProps<Data, T> extends ListItemStandardProps<Data, T>, Omit<FormItemStandardProps<T[]>, 'placeholder'>, StandardProps {
 
   /**
    * The data item

package/css/DatePicker/Month.js

@@ -76,7 +76,8 @@ 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.default.toDate(MONTHBASE);
 
@@ -84,6 +85,10 @@ function (_PureComponent) {
     date.setFullYear(current.getFullYear());
     var isDisabled = min && _utils.default.compareMonth(min, date, 1) >= 0;
 
+    if (!isDisabled) {
+      isDisabled = max && _utils.default.compareMonth(date, max, 1) >= 0;
+    }
+
     if (!isDisabled && type === 'month' && typeof disabled === 'function') {
       isDisabled = disabled(date);
     }
@@ -137,6 +142,7 @@ Month.propTypes = {
   current: _propTypes.default.object.isRequired,
   disabled: _propTypes.default.func,
   // max: PropTypes.object,
+  max: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   min: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   onChange: _propTypes.default.func.isRequired,
   onModeChange: _propTypes.default.func.isRequired,

package/css/Datum/Tree.js

@@ -303,7 +303,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/css/Menu/Root.js

@@ -37,6 +37,8 @@ var _is = require("../utils/is");
 
 var _config = require("../config");
 
+var _component = require("../component");
+
 var modeDirection = {
   'vertical-auto': 'y',
   vertical: 'y',
@@ -78,13 +80,13 @@ function keyToMap(keys, value) {
 
 var Root =
 /*#__PURE__*/
-function (_React$Component) {
-  (0, _inheritsLoose2.default)(Root, _React$Component);
+function (_Component) {
+  (0, _inheritsLoose2.default)(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,
@@ -115,6 +117,8 @@ function (_React$Component) {
   var _proto = Root.prototype;
 
   _proto.componentDidMount = function componentDidMount() {
+    _Component.prototype.componentDidMount.call(this);
+
     this.updateState();
   };
 
@@ -124,6 +128,8 @@ function (_React$Component) {
 
   _proto.componentWillUnmount = function componentWillUnmount() {
     this.container.removeEventListener('wheel', this.handleWheel);
+
+    _Component.prototype.componentWillUnmount.call(this);
   };
 
   _proto.getOpenKeys = function getOpenKeys() {
@@ -419,7 +425,7 @@ function (_React$Component) {
   };
 
   return Root;
-}(_react.default.Component);
+}(_component.Component);
 
 Root.propTypes = (0, _objectSpread2.default)({}, (0, _proptypes.getProps)(_propTypes.default, 'style', 'keygen'), {
   active: _propTypes.default.func,

package/css/Modal/events.js

@@ -129,10 +129,13 @@ 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 - _document.docSize.width;
   var doc = document.body.parentNode;
-  doc.style.overflow = 'hidden';
-  doc.style.paddingRight = scrollWidth + "px";
+
+  if (!doc.style.paddingRight) {
+    var scrollWidth = window.innerWidth - _document.docSize.width;
+    doc.style.overflow = 'hidden';
+    doc.style.paddingRight = scrollWidth + "px";
+  }
 
   var handleClose = function handleClose() {
     if (onClose) onClose();

package/css/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/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/Result.js

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

package/css/Select/styles/select.css

@@ -170,10 +170,6 @@
   margin-top: -5px;
 }
 .so-select-indicator.so-select-close {
-  -webkit-box-sizing: content-box;
-          box-sizing: content-box;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
   display: none;
   background: var(--select-clear-bg-color, #94a1ae);
   border-radius: 6px;
@@ -247,6 +243,10 @@
 .so-select-result:hover .so-select-close {
   display: block;
 }
+.so-select-focus .so-select-result-clearable .so-select-multi,
+.so-select-result-clearable:hover .so-select-multi {
+  visibility: hidden;
+}
 .so-select-focus .so-select-caret {
   -webkit-transform: rotate(180deg);
       -ms-transform: rotate(180deg);
@@ -512,6 +512,10 @@ span.so-select-option {
 .so-select-disabled .so-select-result .so-select-item .so-select-close {
   display: none;
 }
+.so-select-disabled .so-select-result .so-select-multi {
+  visibility: visible;
+  cursor: not-allowed;
+}
 .so-select-root {
   position: absolute;
   top: 0;

package/css/Spin/index.d.ts

@@ -1,5 +1,7 @@
 import * as React from 'react'
 import { ReactNode } from 'react'
+import { StandardProps } from '../@types/common'
+
 
 type SpinName = 'default' |
 'chasing-dots' |
@@ -19,7 +21,7 @@ declare class Spin extends React.Component<SpinProps, {}> {
   render(): JSX.Element;
 }
 
-export interface SpinProps {
+export interface SpinProps extends StandardProps{
 
   /**
    * color

package/css/Table/SeperateTable.js

@@ -344,13 +344,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";
-          (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
-          this.lastScrollTop = fullHeight;
+          if (fullHeight <= scrollHeight) {
+            index = 0;
+          } else {
+            this.tbody.style.marginTop = scrollHeight + "px";
+            (0, _translate.setTranslate)(this.tbody, "-" + offsetLeft + "px", "-" + fullHeight + "px");
+            this.lastScrollTop = fullHeight;
+            return;
+          }
         }
-
-        return;
       }
 
       if (index === 0) {

package/css/Table/index.d.ts

@@ -532,6 +532,16 @@ export interface TableProps<Value, TRD> extends StandardProps, ListItemStandardP
    * default: false
    */
   hideHeader?: boolean
+
+  /**
+   * make all columns scalable
+   *
+   * 使所有列可伸缩
+   *
+   * default: false
+   */
+  columnResizable?: boolean
+
 }
 
 declare class Table<Value = any, TRD = TableRowData> extends React.Component<TableProps<Value, TRD>, {}> {

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/Textarea/index.d.ts

@@ -2,24 +2,24 @@ import * as React from 'react'
 import { StandardProps, RegularAttributes, FormItemStandardProps } from '../@types/common'
 
 export interface TextareaProps<Value> extends
-StandardProps, 
+StandardProps,
 FormItemStandardProps<Value>
   {
 
   /**
    * show border bottom
-   * 
+   *
    * 仅仅展示下边框
-   * 
+   *
    * default: false
    */
   underline?: boolean;
 
   /**
    * Whether the height changes automatically with the content
-   * 
+   *
    * 高度是否随内容自动变化
-   * 
+   *
    * default: false
    */
   autosize?: boolean;
@@ -27,76 +27,87 @@ FormItemStandardProps<Value>
 
   /**
    * User input triggers onChange and to check interval, unit: ms.
-   * 
+   *
    * 用户输入触发 onChange 和校验间隔时间，单位 毫秒。
-   * 
+   *
    * default: 400
    */
   delay?: number;
 
   /**
    * Infomation
-   * 
+   *
    * 提示信息
-   * 
+   *
    * default: -
    */
   info?: ((value: string) => string) | number;
 
   /**
    * The callback function for enter key
-   * 
+   *
    * 回车键回调函数
-   * 
-   * default: 
+   *
+   * default:
    */
   onEnterPress?: (value: Value) => void;
 
   /**
    * The position where the message pops up
-   * 
+   *
    * 信息弹出位置
-   * 
-   * default: 
+   *
+   * default:
    */
   popover?: RegularAttributes.Position;
 
   /**
    * The minimum row height. Same as native textarea rows property.
-   * 
+   *
    * 最小行高，同原生 textarea rows 属性
-   * 
+   *
    * default: 4
    */
   rows?: number;
 
   /**
    * the maxHeight of the textarea, scroll bars appear after more than
-   * 
+   *
    * 输入框的最大高度, 超过之后会出现滚动条
-   * 
+   *
    * default: -
    */
   maxHeight?: number | string;
 
   /**
    * When trim is true, blank characters are automatically deleted when lose focus。
-   * 
+   *
    * trim 为 true 时，失去焦点时会自动删除空白字符。
-   * 
+   *
    * default: false
    */
   trim?: boolean;
 
   /**
    * support resize
-   * 
+   *
    * 是否可以伸缩高度
-   * 
+   *
    * default: false
    */
   resize?: boolean;
 
+  /**
+   * disabled
+   *
+   * 禁用
+   *
+   * default: false
+   */
+  disabled?: boolean;
+
+
+
 }
 
 declare class Textarea<Value = any> extends React.Component<TextareaProps<Value>, {}> {}