shineout 1.8.2 → 1.8.6

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/AnimationList/AbsoluteList.js

@@ -89,8 +89,8 @@ export default function (List) {
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       var _this2 = this;
 
-      if (shallowEqual(prevProps.value, this.props.value)) return;
       if (!this.props.focus) this.ajustdoc = false;
+      if (shallowEqual(prevProps.value, this.props.value)) return;
       setTimeout(function () {
         _this2.forceUpdate();
       });

package/es/Button/Button.js

@@ -63,7 +63,7 @@ function (_PureComponent) {
       disabled: disabled
     }), this.props.className);
 
-    if (href) {
+    if (href && !disabled) {
       return React.createElement("a", _extends({
         href: href
       }, others, {

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/Form/Field.js

@@ -53,13 +53,18 @@ function (_Component) {
       });
     }
 
+    var cloneProps = {
+      value: value,
+      error: error,
+      onChange: this.handleChange
+    };
+
+    if (disabled !== undefined) {
+      cloneProps.disabled = disabled;
+    }
+
     if (isValidElement(children)) {
-      return cloneElement(children, {
-        value: value,
-        error: error,
-        onChange: this.handleChange,
-        disabled: disabled
-      });
+      return cloneElement(children, cloneProps);
     }
 
     console.error(new Error('Form.Field expect a single ReactElement or a function.'));

package/es/Menu/Item.js

@@ -35,7 +35,9 @@ function (_PureComponent) {
 
     var key = _this.getKey(props);
 
-    var _props$bindItem = props.bindItem(_this.id, _this.update.bind(_assertThisInitialized(_assertThisInitialized(_this))), _this.updateOpen.bind(_assertThisInitialized(_assertThisInitialized(_this))), _this.updateInPath.bind(_assertThisInitialized(_assertThisInitialized(_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];
@@ -57,6 +59,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/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/Scroll/Scroll.js

@@ -43,6 +43,7 @@ function (_PureComponent) {
     _this.handleTouchStart = _this.handleTouchStart.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.handleTouchMove = _this.handleTouchMove.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.setStartPoint = _this.setStartPoint.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleInnerScroll = _this.handleInnerScroll.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     return _this;
   }
 
@@ -61,6 +62,7 @@ function (_PureComponent) {
     this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
       passive: false
     });
+    this.inner.addEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -77,6 +79,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() {
@@ -256,22 +259,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 = isRTL();
     var className = classnames(scrollClass('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);

package/es/Select/Input.js

@@ -29,7 +29,9 @@ function (_Component) {
     _this.handleBlur = _this.handleBlur.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.geHandleMax = _this.geHandleMax.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.handlePaste = _this.handlePaste.bind(_assertThisInitialized(_assertThisInitialized(_this)));
-    _this.focusInput = _this.focusInput.bind(_assertThisInitialized(_assertThisInitialized(_this))); // for mutiple select
+    _this.focusInput = _this.focusInput.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleCompositionStart = _this.handleCompositionStart.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleCompositionEnd = _this.handleCompositionEnd.bind(_assertThisInitialized(_assertThisInitialized(_this))); // for mutiple select
 
     _this.props.setInputReset(_this.reset.bind(_assertThisInitialized(_assertThisInitialized(_this)))); // set focus func to Select
 
@@ -81,7 +83,7 @@ function (_Component) {
   _proto.geHandleMax = function geHandleMax(e) {
     var maxLength = this.props.maxLength;
 
-    if (!maxLength) {
+    if (!maxLength || this.composition) {
       return true;
     }
 
@@ -202,6 +204,15 @@ function (_Component) {
     this.props.onInputBlur(text);
   };
 
+  _proto.handleCompositionStart = function handleCompositionStart() {
+    this.composition = true;
+  };
+
+  _proto.handleCompositionEnd = function handleCompositionEnd(e) {
+    this.composition = false;
+    this.handleInput(e);
+  };
+
   _proto.render = function render() {
     var _this$props = this.props,
         text = _this$props.text,
@@ -216,7 +227,9 @@ function (_Component) {
       contentEditable: focus || this.state.editable,
       onFocus: handleFocus,
       onBlur: this.handleBlur,
-      title: !focus && isString(value) ? value : null
+      title: !focus && isString(value) ? value : null,
+      onCompositionStart: this.handleCompositionStart,
+      onCompositionEnd: this.handleCompositionEnd
     };
 
     if (isValidElement(value)) {

package/es/Table/SeperateTable.js

@@ -605,7 +605,8 @@ function (_PureComponent) {
         rowHeight = _this$props7.rowHeight,
         columnResizable = _this$props7.columnResizable,
         innerScrollAttr = _this$props7.innerScrollAttr,
-        others = _objectWithoutPropertiesLoose(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
+        bordered = _this$props7.bordered,
+        others = _objectWithoutPropertiesLoose(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
 
     var _this$state3 = this.state,
         colgroup = _this$state3.colgroup,
@@ -652,7 +653,7 @@ function (_PureComponent) {
         height: prevHeight
       }
     }), React.createElement("table", {
-      className: tableClass(!colgroup && minWidthSup && 'init'),
+      className: tableClass(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
       style: {
         width: width
       },
@@ -694,7 +695,8 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      ref: this.bindThead
+      ref: this.bindThead,
+      className: tableClass('table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,

package/es/Table/SimpleTable.js

@@ -145,14 +145,16 @@ function (_PureComponent) {
         data = _this$props2.data,
         onResize = _this$props2.onResize,
         columnResizable = _this$props2.columnResizable,
-        sticky = _this$props2.sticky;
+        sticky = _this$props2.sticky,
+        bordered = _this$props2.bordered;
     var _this$state = this.state,
         colgroup = _this$state.colgroup,
         scrollAble = _this$state.scrollAble;
     var inner = React.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: tableClass(bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -190,7 +192,8 @@ function (_PureComponent) {
         width = _this$props3.width,
         fixed = _this$props3.fixed,
         columnResizable = _this$props3.columnResizable,
-        others = _objectWithoutPropertiesLoose(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
+        bordered = _this$props3.bordered,
+        others = _objectWithoutPropertiesLoose(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
 
     var _this$state2 = this.state,
         colgroup = _this$state2.colgroup,
@@ -207,7 +210,7 @@ function (_PureComponent) {
       style: {
         width: width
       },
-      className: tableClass(!colgroup && minWidthSup && 'init')
+      className: tableClass(!colgroup && minWidthSup && 'init', bordered && 'table-bordered')
     }, React.createElement(Colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -227,11 +230,13 @@ function (_PureComponent) {
         columns = _this$props4.columns,
         width = _this$props4.width,
         children = _this$props4.children,
-        hideHeader = _this$props4.hideHeader;
+        hideHeader = _this$props4.hideHeader,
+        bordered = _this$props4.bordered;
     if (!columns || columns.length === 0) return React.createElement("table", {
       style: {
         width: width
-      }
+      },
+      className: tableClass(bordered && 'table-bordered')
     }, children);
     return [hideHeader ? null : this.renderHeader(), this.renderBody(), children];
   };
@@ -250,7 +255,8 @@ SimpleTable.propTypes = {
   dataChangeResize: PropTypes.bool,
   columnResizable: PropTypes.bool,
   sticky: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]),
-  hideHeader: PropTypes.bool
+  hideHeader: PropTypes.bool,
+  bordered: PropTypes.bool
 };
 SimpleTable.defaultProps = {
   data: undefined,

package/es/Table/Table.js

@@ -135,7 +135,9 @@ function (_Component) {
       className: className,
       ref: this.bindTable,
       style: newStyle
-    }, events), React.createElement(RenderTable, props), loading && React.createElement("div", {
+    }, events), React.createElement(RenderTable, _extends({}, props, {
+      bordered: bordered
+    })), loading && React.createElement("div", {
       className: tableClass('loading')
     }, typeof loading === 'boolean' ? React.createElement(Spin, {
       size: 40

package/es/Table/resizable.js

@@ -64,7 +64,7 @@ export default (function (Table) {
       var onColumnResize = this.props.onColumnResize;
       var changed = immer(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/es/Table/styles/table.less

@@ -283,7 +283,7 @@
       }
     }
 
-    table {
+    .@{table-prefix}-table-bordered {
       > thead,
       > tbody,
       > tfoot {

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.2' }
+export default { utils, version: '1.8.6' }
 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.2'
+  version: '1.8.6'
 };
 export { utils };
 export { setLocale } from './locale';

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/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);