shineout 1.8.0-rc.6 → 1.8.2

package/css/AnimationList/AbsoluteList.js

@@ -133,9 +133,7 @@ function _default(List) {
     };
 
     _proto.getPosition = function getPosition(rect) {
-      var _this$props = this.props,
-          fixed = _this$props.fixed,
-          absolute = _this$props.absolute;
+      var fixed = this.props.fixed;
       var position = this.props.position;
       var rtl = (0, _config.isRTL)();
       var style = {
@@ -156,34 +154,13 @@ function _default(List) {
         position = (0, _strings.getRTLPosition)(position);
       }
 
-      var containerScroll;
-      var containerRect;
       var container = this.container;
-
-      if (typeof absolute === 'function' && container) {
-        containerRect = container.getBoundingClientRect();
-        containerScroll = {
-          left: container.scrollLeft,
-          top: container.scrollTop
-        };
-
-        if (rtl) {
-          containerScroll.width = container.scrollWidth;
-        }
-      } else {
-        containerRect = {
-          left: 0,
-          top: 0,
-          right: 0,
-          bottom: 0
-        };
-        containerScroll = _document.docScroll;
-
-        if (rtl) {
-          containerRect.width = document.documentElement.clientWidth || document.body.clientWidth;
-        }
-      }
-
+      var rootContainer = container === root || !container ? document.body : container;
+      var containerRect = rootContainer.getBoundingClientRect();
+      var containerScroll = {
+        left: rootContainer.scrollLeft,
+        top: rootContainer.scrollTop
+      };
       this.containerRect = containerRect;
 
       if (listPosition.includes(position)) {
@@ -202,12 +179,12 @@ function _default(List) {
         if (h === 'left') {
           style.left = rect.left - containerRect.left + containerScroll.left;
         } else {
-          style.left = rect.right - containerRect.right + containerScroll.left;
+          style.left = rect.right - containerRect.left + containerScroll.left;
           style.transform = 'translateX(-100%)';
         }
 
         if (v === 'bottom') {
-          style.top = rect.bottom - containerRect.bottom + containerScroll.top + PICKER_V_MARGIN;
+          style.top = rect.bottom - containerRect.top + containerScroll.top + PICKER_V_MARGIN;
         } else {
           style.top = rect.top - containerRect.top + containerScroll.top - PICKER_V_MARGIN;
           style.transform = style.transform ? 'translate(-100%, -100%)' : 'translateY(-100%)';
@@ -223,10 +200,10 @@ function _default(List) {
     };
 
     _proto.getStyle = function getStyle() {
-      var _this$props2 = this.props,
-          parentElement = _this$props2.parentElement,
-          scrollElement = _this$props2.scrollElement,
-          focus = _this$props2.focus;
+      var _this$props = this.props,
+          parentElement = _this$props.parentElement,
+          scrollElement = _this$props.scrollElement,
+          focus = _this$props.focus;
       var lazyResult = {
         focus: focus,
         style: this.lastStyle
@@ -263,9 +240,9 @@ function _default(List) {
     };
 
     _proto.resetPosition = function resetPosition(clean) {
-      var _this$props3 = this.props,
-          focus = _this$props3.focus,
-          parentElement = _this$props3.parentElement;
+      var _this$props2 = this.props,
+          focus = _this$props2.focus,
+          parentElement = _this$props2.parentElement;
       if (!this.el || !focus || this.ajustdoc && !clean) return;
       var pos = this.el.getBoundingClientRect();
       var left = pos.left;
@@ -300,21 +277,21 @@ function _default(List) {
     };
 
     _proto.renderList = function renderList() {
-      var _this$props4 = this.props,
-          parentElement = _this$props4.parentElement,
-          absolute = _this$props4.absolute,
-          focus = _this$props4.focus,
-          rootClass = _this$props4.rootClass,
-          position = _this$props4.position,
-          scrollLeft = _this$props4.scrollLeft,
-          scrollTop = _this$props4.scrollTop,
-          scrollElement = _this$props4.scrollElement,
-          _this$props4$style = _this$props4.style,
-          style = _this$props4$style === void 0 ? {} : _this$props4$style,
-          zIndex = _this$props4.zIndex,
-          getResetPosition = _this$props4.getResetPosition,
-          ignore = _this$props4.autoAdapt,
-          props = (0, _objectWithoutPropertiesLoose2.default)(_this$props4, ["parentElement", "absolute", "focus", "rootClass", "position", "scrollLeft", "scrollTop", "scrollElement", "style", "zIndex", "getResetPosition", "autoAdapt"]);
+      var _this$props3 = this.props,
+          parentElement = _this$props3.parentElement,
+          absolute = _this$props3.absolute,
+          focus = _this$props3.focus,
+          rootClass = _this$props3.rootClass,
+          position = _this$props3.position,
+          scrollLeft = _this$props3.scrollLeft,
+          scrollTop = _this$props3.scrollTop,
+          scrollElement = _this$props3.scrollElement,
+          _this$props3$style = _this$props3.style,
+          style = _this$props3$style === void 0 ? {} : _this$props3$style,
+          zIndex = _this$props3.zIndex,
+          getResetPosition = _this$props3.getResetPosition,
+          ignore = _this$props3.autoAdapt,
+          props = (0, _objectWithoutPropertiesLoose2.default)(_this$props3, ["parentElement", "absolute", "focus", "rootClass", "position", "scrollLeft", "scrollTop", "scrollElement", "style", "zIndex", "getResetPosition", "autoAdapt"]);
       var parsed = parseInt(zIndex, 10);
       if (!Number.isNaN(parsed)) style.zIndex = parsed;
       var mergeStyle = Object.assign({}, style, this.state.overdoc ? getOverDocStyle() : undefined);
@@ -339,20 +316,20 @@ function _default(List) {
       }
 
       if (!this.container) return null;
-      var _this$props5 = this.props,
-          parentElement = _this$props5.parentElement,
-          rootClass = _this$props5.rootClass,
-          absolute = _this$props5.absolute,
-          position = _this$props5.position,
-          scrollLeft = _this$props5.scrollLeft,
-          scrollTop = _this$props5.scrollTop,
-          scrollElement = _this$props5.scrollElement,
-          autoClass = _this$props5.autoClass,
-          zIndex = _this$props5.zIndex,
-          getResetPosition = _this$props5.getResetPosition,
-          value = _this$props5.value,
-          ignore = _this$props5.autoAdapt,
-          props = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["parentElement", "rootClass", "absolute", "position", "scrollLeft", "scrollTop", "scrollElement", "autoClass", "zIndex", "getResetPosition", "value", "autoAdapt"]);
+      var _this$props4 = this.props,
+          parentElement = _this$props4.parentElement,
+          rootClass = _this$props4.rootClass,
+          absolute = _this$props4.absolute,
+          position = _this$props4.position,
+          scrollLeft = _this$props4.scrollLeft,
+          scrollTop = _this$props4.scrollTop,
+          scrollElement = _this$props4.scrollElement,
+          autoClass = _this$props4.autoClass,
+          zIndex = _this$props4.zIndex,
+          getResetPosition = _this$props4.getResetPosition,
+          value = _this$props4.value,
+          ignore = _this$props4.autoAdapt,
+          props = (0, _objectWithoutPropertiesLoose2.default)(_this$props4, ["parentElement", "rootClass", "absolute", "position", "scrollLeft", "scrollTop", "scrollElement", "autoClass", "zIndex", "getResetPosition", "value", "autoAdapt"]);
       var mergeClass = (0, _classnames.default)((0, _styles.listClass)('absolute-wrapper'), rootClass, autoClass);
 
       var _ref = props.focus ? this.getStyle() : {

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/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/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>, {}> {}