shineout 1.8.5 → 1.8.7

package/es/Alert/index.d.ts

@@ -5,59 +5,59 @@ export interface AlertProps extends StandardProps {
 
   /**
    * Content, text or react component
-   * 
+   *
    * 内容，文字或react组件
-   * 
+   *
    * default: -
    */
   children?: React.ReactNode;
 
   /**
    * When the type is true, the status icon is displayed according to the type property. If you need to display a custom icon, pass in ReactElement.
-   * 
+   *
    * 为true时，根据type属性显示状态图标。如果需要显示自定义图标，传入ReactElement。
-   * 
+   *
    * default: -
    */
   icon?: React.ReactElement | boolean;
 
   /**
    * The size for icon
-   * 
+   *
    * icon 的尺寸
-   * 
+   *
    * default: 14
    */
   iconSize?: number;
 
   /**
    * When onClose is empty, no close is displayed. If you need to close and do not need to handle callbacks, set it true.
-   * 
+   *
    * 当 onClose 为空时，不显示关闭。如果需要关闭又不需要处理回调，设置为true即可
-   * 
+   *
    * default: -
    */
   onClose?: (() => void) | boolean;
 
   /**
    * types
-   * 
+   *
    * 类型
-   * 
+   *
    * default: *warning*
-   * 
+   *
    */
-  type?: 'success' | 'info' | 'warning' | 'danger' | 'error';
+  type?: 'success' | 'info' | 'warning' | 'danger' | 'error' | 'confirmwarning';
 
   /**
    * show close button
-   * 
+   *
    * 是否隐藏关闭按钮
-   * 
+   *
    * default: false
    */
   hideClose?: boolean,
 }
 
 declare class Alert extends React.Component<AlertProps> {}
-export default Alert
+export default Alert

package/es/Alert/styles/alert.less

@@ -120,7 +120,8 @@
   }
 
   &-danger,
-  &-error {
+  &-error,
+  &-confirmwarning{
     .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text; @alert-danger-box-shadow);
 
     .@{alert-prefix}-icon path {

package/es/Cascader/Result.js

@@ -70,7 +70,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = addResizeObserver(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = addResizeObserver(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/es/DataList/List.js

@@ -109,7 +109,8 @@ function (_Component) {
         keygen = _this$props2.keygen,
         fixed = _this$props2.fixed,
         rowsInView = _this$props2.rowsInView,
-        lineHeight = _this$props2.lineHeight;
+        lineHeight = _this$props2.lineHeight,
+        value = _this$props2.value;
     if (isEmpty) return React.createElement("div", {
       className: listClass('item', 'empty')
     }, empty || getLocale('noData'));
@@ -119,7 +120,8 @@ function (_Component) {
       data: data,
       keygen: keygen,
       renderItem: this.renderItem,
-      itemsInView: rowsInView
+      itemsInView: rowsInView,
+      force: value
     });
   };
 
@@ -186,7 +188,8 @@ Index.propTypes = {
   fixed: PropTypes.bool,
   rowsInView: PropTypes.number,
   height: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  lineHeight: PropTypes.number
+  lineHeight: PropTypes.number,
+  value: PropTypes.array
 };
 Index.defaultProps = {
   size: 'default',

package/es/EditableArea/EditableArea.js

@@ -93,7 +93,6 @@ function (_React$PureComponent) {
   _proto.renderTextarea = function renderTextarea() {
     var showTextarea = this.state.showTextarea;
     var _this$props = this.props,
-        delay = _this$props.delay,
         placeholder = _this$props.placeholder,
         maxHeight = _this$props.maxHeight,
         value = _this$props.value;
@@ -105,7 +104,7 @@ function (_React$PureComponent) {
       autosize: true,
       value: value,
       rows: 1,
-      delay: delay,
+      delay: 0,
       onChange: this.onChange,
       onBlur: this.onBlur,
       onFocus: this.handleFocus,

package/es/Modal/Panel.js

@@ -202,10 +202,9 @@ function (_PureComponent) {
         position = _this$props7.position,
         bodyStyle = _this$props7.bodyStyle,
         _this$props7$from = _this$props7.from,
-        from = _this$props7$from === void 0 ? null : _this$props7$from,
-        type = _this$props7.type;
+        from = _this$props7$from === void 0 ? null : _this$props7$from;
     var style = {
-      padding: noPadding === true || from === 'method' && type === 'normal' ? 0 : padding
+      padding: noPadding === true ? 0 : padding
     };
     if (position) style.overflow = 'auto';
     if (bodyStyle) style = Object.assign(style, bodyStyle);

package/es/Modal/styles/modal.less

@@ -302,6 +302,18 @@
         }
       }
     }
+    > .@{card-prefix}.@{modal-prefix}-normal {
+      .@{modal-prefix}-body {
+          padding-left: @modal-icon-body-padding-right;
+        }
+      &.@{modal-prefix}-rtl {
+        .@{modal-prefix}-body {
+          padding-right: @modal-icon-body-padding-right;
+        }
+      }
+    }
+
+
 
 
     > .@{card-prefix}.@{modal-prefix}-rtl {

package/es/Popover/Confirm.js

@@ -119,7 +119,7 @@ Confirm.propTypes = _objectSpread({}, getProps(PropTypes, 'type'), {
   icon: PropTypes.oneOfType([PropTypes.bool, PropTypes.node])
 });
 Confirm.defaultProps = {
-  type: 'warning',
+  type: 'confirmwarning',
   icon: true,
   okType: 'danger'
 };

package/es/Popover/Content.js

@@ -0,0 +1,12 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Panel from './Panel';
+
+function Content(props) {
+  // eslint-disable-next-line
+  return React.createElement(Panel, _extends({}, props, {
+    useTextStyle: true
+  }));
+}
+
+export default Content;

package/es/Popover/Panel.js

@@ -270,7 +270,8 @@ function (_Component) {
         children = _this$props4.children,
         type = _this$props4.type,
         visible = _this$props4.visible,
-        showArrow = _this$props4.showArrow;
+        showArrow = _this$props4.showArrow,
+        useTextStyle = _this$props4.useTextStyle;
     var show = typeof visible === 'boolean' ? visible : this.state.show;
 
     if (!this.isRendered && !show || !this.parentElement || !children) {
@@ -304,7 +305,7 @@ function (_Component) {
 
     this.element.className = classnames(popoverClass('_', position, type), this.props.className, this.id);
     var childrened = isFunc(children) ? children(this.handleHide) : children;
-    if (typeof childrened === 'string') childrened = React.createElement("span", {
+    if (typeof childrened === 'string' || useTextStyle) childrened = React.createElement("span", {
       className: popoverClass('text')
     }, childrened);
     return ReactDOM.createPortal([showArrow && React.createElement("div", {
@@ -348,7 +349,8 @@ Panel.propTypes = {
   showArrow: PropTypes.bool,
   bindChain: PropTypes.func,
   zIndex: PropTypes.number,
-  clickToCancelDelay: PropTypes.bool
+  clickToCancelDelay: PropTypes.bool,
+  useTextStyle: PropTypes.bool
 };
 Panel.defaultProps = {
   background: '',

package/es/Popover/index.d.ts

@@ -131,7 +131,7 @@ export interface PopoverProps extends StandardProps {
    *
    * default: none
    */
-  type?: 'success' | 'info' | 'warning' | 'danger';
+  type?: 'success' | 'info' | 'warning' | 'danger' | 'confirmwarning';
 
   /**
    * Old API, out of date
@@ -232,8 +232,15 @@ declare class PopoverConfirm extends React.Component<PopoverConfirmProps, {}> {
   render(): JSX.Element;
 }
 
-declare class Popover extends React.Component<PopoverProps, {}> {
+declare class PopoverContent extends React.Component<PopoverProps, {}> {
+  render(): JSX.Element;
+}
+
+export type ContentProps = Omit<PopoverProps, 'content'>;
+
+declare class Popover extends React.Component<ContentProps, {}> {
   static Confirm: typeof PopoverConfirm;
+  static Content: typeof PopoverContent;
 
   render(): JSX.Element;
 }

package/es/Popover/index.js

@@ -3,6 +3,7 @@ import Container from '../Tooltip/Container';
 import * as events from './events';
 import Panel from './Panel';
 import Confirm from './Confirm';
+import Content from './Content';
 var Component = Container(events);
 
 function Popover(props) {
@@ -14,4 +15,5 @@ function Popover(props) {
 Popover.displayName = 'ShineoutPopover';
 Popover.Confirm = Confirm;
 Popover.Confirm.displayName = 'ShineoutPopoverConfirm';
+Popover.Content = Content;
 export default Popover;

package/es/Popover/styles/popover.less

@@ -2,7 +2,6 @@
 @import '../../styles/themes/@{so-theme}.less';
 
 @popover-prefix: ~'@{so-prefix}-popover';
-@alert-prefix: ~'@{so-prefix}-alert';
 @popover-arrow-size: 12px;
 
 .@{popover-prefix} {
@@ -276,9 +275,6 @@
       margin-bottom: 8px;
       font-size: @font-size-base;
     }
-    .@{popover-prefix}-mention .@{alert-prefix}-warning .@{alert-prefix}-icon path {
-      fill: @colors-danger;
-    }
   }
 
   &-text {

package/es/Select/Result.js

@@ -90,7 +90,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = addResizeObserver(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = addResizeObserver(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/es/Table/SimpleTable.js

@@ -79,6 +79,7 @@ function (_PureComponent) {
   };
 
   _proto.resetColGroup = function resetColGroup() {
+    this.lastColGroup = this.state.colgroup || this.lastColGroup;
     this.setState({
       colgroup: undefined,
       resize: true
@@ -156,7 +157,7 @@ function (_PureComponent) {
       },
       className: tableClass(bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
-      colgroup: colgroup,
+      colgroup: colgroup || this.lastColGroup,
       columns: columns,
       resizable: columnResizable
     }), React.createElement(Thead, _extends({}, this.props, {

package/es/TreeSelect/Result.js

@@ -67,7 +67,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = addResizeObserver(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = addResizeObserver(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/es/TreeSelect/TreeSelect.js

@@ -269,7 +269,9 @@ function (_PureComponent) {
         data = _this$props7.data,
         absolute = _this$props7.absolute,
         height = _this$props7.height,
-        zIndex = _this$props7.zIndex;
+        zIndex = _this$props7.zIndex,
+        compressed = _this$props7.compressed,
+        value = _this$props7.value;
     var props = {};
     ['mode', 'data', 'datum', 'defaultExpanded', 'defaultExpandAll', 'disabled', 'expanded', 'keygen', 'loader', 'onExpand', 'renderItem', 'line', 'parentClickExpand', 'childrenKey', 'expandIcons'].forEach(function (k) {
       props[k] = _this3.props[k];
@@ -306,7 +308,8 @@ function (_PureComponent) {
         overflowY: 'auto'
       },
       fixed: "min",
-      zIndex: zIndex
+      zIndex: zIndex,
+      value: multiple && !compressed ? value : undefined
     }, React.createElement("div", {
       className: treeSelectClass('tree-wrapper')
     }, content));

package/es/icons/index.js

@@ -52,5 +52,6 @@ export default {
   Recovery: icon(recovery),
   Warning: icon(warning),
   Check: icon(check),
-  Preview: icon(preview)
+  Preview: icon(preview),
+  Confirmwarning: icon(warning)
 };

package/es/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.5' }
+export default { utils, version: '1.8.7' }
 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.5'
+  version: '1.8.7'
 };
 export { utils };
 export { setLocale } from './locale';

package/es/utils/dom/element.js

@@ -188,15 +188,15 @@ export var addResizeObserver = function addResizeObserver(el, handler, options)
             width = _entry$0$contentRect.width,
             height = _entry$0$contentRect.height;
 
-        if (direction === 'x') {
+        if (width && direction === 'x') {
           if (lastWidth !== width) {
             handler(entry);
           }
         } else if (direction === 'y') {
-          if (lastHeight !== height) {
+          if (height && lastHeight !== height) {
             handler(entry);
           }
-        } else {
+        } else if (width && height) {
           handler(entry, {
             x: lastWidth !== width,
             y: lastHeight !== height

package/es/utils/proptypes.js

@@ -9,7 +9,7 @@ export function getProps(PropTypes) {
     grid: PropTypes.oneOfType([PropTypes.number, PropTypes.object]),
     placeholder: PropTypes.oneOfType([PropTypes.string, PropTypes.element, PropTypes.func]),
     size: PropTypes.oneOf(['small', 'default', 'large']),
-    type: PropTypes.oneOf(['primary', 'default', 'secondary', 'success', 'info', 'warning', 'error', 'danger', 'link'])
+    type: PropTypes.oneOf(['primary', 'default', 'secondary', 'success', 'info', 'warning', 'error', 'danger', 'link', 'confirmwarning'])
   };
 
   for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {

package/es/utils/validate/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/objectSpread";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import Datum from '../../Datum';
 import { wrapFormError } from '../../utils/errors';
@@ -44,7 +45,10 @@ function getRule(rules, props) {
 
   if (other.min !== undefined || other.max !== undefined) {
     if (type === 'number' || type === 'integer') {
-      return range(props);
+      return range(_objectSpread({}, props, {
+        min: other.min,
+        max: other.max
+      }));
     }
 
     return rangeLength(props);

package/lib/Alert/index.d.ts

@@ -5,59 +5,59 @@ export interface AlertProps extends StandardProps {
 
   /**
    * Content, text or react component
-   * 
+   *
    * 内容，文字或react组件
-   * 
+   *
    * default: -
    */
   children?: React.ReactNode;
 
   /**
    * When the type is true, the status icon is displayed according to the type property. If you need to display a custom icon, pass in ReactElement.
-   * 
+   *
    * 为true时，根据type属性显示状态图标。如果需要显示自定义图标，传入ReactElement。
-   * 
+   *
    * default: -
    */
   icon?: React.ReactElement | boolean;
 
   /**
    * The size for icon
-   * 
+   *
    * icon 的尺寸
-   * 
+   *
    * default: 14
    */
   iconSize?: number;
 
   /**
    * When onClose is empty, no close is displayed. If you need to close and do not need to handle callbacks, set it true.
-   * 
+   *
    * 当 onClose 为空时，不显示关闭。如果需要关闭又不需要处理回调，设置为true即可
-   * 
+   *
    * default: -
    */
   onClose?: (() => void) | boolean;
 
   /**
    * types
-   * 
+   *
    * 类型
-   * 
+   *
    * default: *warning*
-   * 
+   *
    */
-  type?: 'success' | 'info' | 'warning' | 'danger' | 'error';
+  type?: 'success' | 'info' | 'warning' | 'danger' | 'error' | 'confirmwarning';
 
   /**
    * show close button
-   * 
+   *
    * 是否隐藏关闭按钮
-   * 
+   *
    * default: false
    */
   hideClose?: boolean,
 }
 
 declare class Alert extends React.Component<AlertProps> {}
-export default Alert
+export default Alert

package/lib/Alert/styles/alert.less

@@ -120,7 +120,8 @@
   }
 
   &-danger,
-  &-error {
+  &-error,
+  &-confirmwarning{
     .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text; @alert-danger-box-shadow);
 
     .@{alert-prefix}-icon path {

package/lib/Cascader/Result.js

@@ -96,7 +96,9 @@ function (_PureComponent) {
     var compressed = this.props.compressed;
 
     if (compressed) {
-      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore);
+      this.cancelResizeObserver = (0, _element.addResizeObserver)(this.resultEl, this.resetMore, {
+        direction: 'x'
+      });
     }
   };
 

package/lib/DataList/List.js

@@ -133,7 +133,8 @@ function (_Component) {
         keygen = _this$props2.keygen,
         fixed = _this$props2.fixed,
         rowsInView = _this$props2.rowsInView,
-        lineHeight = _this$props2.lineHeight;
+        lineHeight = _this$props2.lineHeight,
+        value = _this$props2.value;
     if (isEmpty) return _react.default.createElement("div", {
       className: (0, _styles.listClass)('item', 'empty')
     }, empty || (0, _locale.getLocale)('noData'));
@@ -143,7 +144,8 @@ function (_Component) {
       data: data,
       keygen: keygen,
       renderItem: this.renderItem,
-      itemsInView: rowsInView
+      itemsInView: rowsInView,
+      force: value
     });
   };
 
@@ -210,7 +212,8 @@ Index.propTypes = {
   fixed: _propTypes.default.bool,
   rowsInView: _propTypes.default.number,
   height: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
-  lineHeight: _propTypes.default.number
+  lineHeight: _propTypes.default.number,
+  value: _propTypes.default.array
 };
 Index.defaultProps = {
   size: 'default',

package/lib/EditableArea/EditableArea.js

@@ -110,7 +110,6 @@ function (_React$PureComponent) {
   _proto.renderTextarea = function renderTextarea() {
     var showTextarea = this.state.showTextarea;
     var _this$props = this.props,
-        delay = _this$props.delay,
         placeholder = _this$props.placeholder,
         maxHeight = _this$props.maxHeight,
         value = _this$props.value;
@@ -122,7 +121,7 @@ function (_React$PureComponent) {
       autosize: true,
       value: value,
       rows: 1,
-      delay: delay,
+      delay: 0,
       onChange: this.onChange,
       onBlur: this.onBlur,
       onFocus: this.handleFocus,

package/lib/Modal/Panel.js

@@ -222,10 +222,9 @@ function (_PureComponent) {
         position = _this$props7.position,
         bodyStyle = _this$props7.bodyStyle,
         _this$props7$from = _this$props7.from,
-        from = _this$props7$from === void 0 ? null : _this$props7$from,
-        type = _this$props7.type;
+        from = _this$props7$from === void 0 ? null : _this$props7$from;
     var style = {
-      padding: noPadding === true || from === 'method' && type === 'normal' ? 0 : padding
+      padding: noPadding === true ? 0 : padding
     };
     if (position) style.overflow = 'auto';
     if (bodyStyle) style = Object.assign(style, bodyStyle);

package/lib/Modal/styles/modal.less

@@ -302,6 +302,18 @@
         }
       }
     }
+    > .@{card-prefix}.@{modal-prefix}-normal {
+      .@{modal-prefix}-body {
+          padding-left: @modal-icon-body-padding-right;
+        }
+      &.@{modal-prefix}-rtl {
+        .@{modal-prefix}-body {
+          padding-right: @modal-icon-body-padding-right;
+        }
+      }
+    }
+
+
 
 
     > .@{card-prefix}.@{modal-prefix}-rtl {

package/lib/Popover/Confirm.js

@@ -138,7 +138,7 @@ Confirm.propTypes = (0, _objectSpread2.default)({}, (0, _proptypes.getProps)(_pr
   icon: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.node])
 });
 Confirm.defaultProps = {
-  type: 'warning',
+  type: 'confirmwarning',
   icon: true,
   okType: 'danger'
 };

package/lib/Popover/Content.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _Panel = _interopRequireDefault(require("./Panel"));
+
+function Content(props) {
+  // eslint-disable-next-line
+  return _react.default.createElement(_Panel.default, (0, _extends2.default)({}, props, {
+    useTextStyle: true
+  }));
+}
+
+var _default = Content;
+exports.default = _default;