shineout 1.8.0 → 1.8.1

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

package/es/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.0' }
+export default { utils, version: '1.8.1' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/es/index.js

@@ -3,7 +3,7 @@ import './styles/normalize.less';
 import * as utils from './utils';
 export default {
   utils: utils,
-  version: '1.8.0'
+  version: '1.8.1'
 };
 export { utils };
 export { setLocale } from './locale';

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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