shineout 1.8.0 → 1.8.4

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/Tooltip/styles/tooltip.less

@@ -2,6 +2,8 @@
 @import '../../styles/themes/@{so-theme}.less';
 @tooltip-prefix: ~'@{so-prefix}-tooltip';
 
+@arrowOffset: (-@tooltip-arrow-width + 1px);
+
 .@{tooltip-prefix} {
   @keyframe-opacity: ~'@{tooltip-prefix}-kf-opacity';
   @keyframe-top: ~'@{tooltip-prefix}-kf-top';
@@ -98,7 +100,7 @@
     transform: translate(-50%, -100%);
 
     .@{tooltip-prefix}-arrow {
-      top: 100%;
+      bottom: @arrowOffset;
       left: 50%;
       border-top: @tooltip-arrow-width solid @tooltip-bg;
       border-right: @tooltip-arrow-width solid transparent;
@@ -117,7 +119,7 @@
 
     .@{tooltip-prefix}-arrow {
       top: 50%;
-      right: 100%;
+      left: @arrowOffset;
       border-top: @tooltip-arrow-width solid transparent;
       border-right: @tooltip-arrow-width solid @tooltip-bg;
       border-bottom: @tooltip-arrow-width solid transparent;
@@ -135,7 +137,7 @@
 
     .@{tooltip-prefix}-arrow {
       top: 50%;
-      left: 100%;
+      right: @arrowOffset;
       border-top: @tooltip-arrow-width solid transparent;
       border-bottom: @tooltip-arrow-width solid transparent;
       border-left: @tooltip-arrow-width solid @tooltip-bg;
@@ -152,12 +154,12 @@
     transform: translateX(-50%);
 
     .@{tooltip-prefix}-arrow {
-      top: 0;
+      top: @arrowOffset;
       left: 50%;
       border-right: @tooltip-arrow-width solid transparent;
       border-bottom: @tooltip-arrow-width solid @tooltip-bg;
       border-left: @tooltip-arrow-width solid transparent;
-      transform: translate(-50%, -100%);
+      transform: translate(-50%, 0);
     }
   }
 

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.4' }
 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.4'
 };
 export { utils };
 export { setLocale } from './locale';

package/es/styles/themes/base.less

@@ -539,7 +539,7 @@
 @tooltip-opacity:             .9;
 
 // Tooltip arrow width
-@tooltip-arrow-width:         5px;
+@tooltip-arrow-width:         6px;
 // Tooltip arrow color
 @tooltip-arrow-color:         @tooltip-bg;
 

package/es/styles/themes/shineout.less

@@ -1,7 +1,7 @@
 @import './bootstrap.less';
 @import './cssvar.less';
 
-@font-family-sans-serif: -apple-system, system-ui, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-sans-serif:  -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Helvetica, PingFang SC, Hiragino KaKu Gothic Pro, Microsoft YaHei, Arial, sans-serif;
 
 @colors-primary-value: #197AFA;
 @colors-primary: var(--primary-color, @colors-primary-value);

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

package/lib/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/lib/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/lib/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;
+      }
     }
   }