shineout 1.9.6 → 1.9.7

package/es/Cascader/Result.js

@@ -77,21 +77,7 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
-    var _this$props = this.props,
-        compressed = _this$props.compressed,
-        _this$props$value = _this$props.value,
-        value = _this$props$value === void 0 ? [] : _this$props$value,
-        onFilter = _this$props.onFilter;
-
-    if (compressed) {
-      if ((preProps.value || []).join('') !== (value || []).join('')) {
-        this.resetMore();
-      } else if (value.length && this.shouldResetMore) {
-        this.shouldResetMore = false;
-        this.state.more = getResetMore(onFilter, this.resultEl, this.resultEl.querySelectorAll("." + cascaderClass('item')));
-        this.forceUpdate();
-      }
-    }
+    this.updateMore(preProps);
   };
 
   _proto.componentWillUnmount = function componentWillUnmount() {
@@ -108,6 +94,27 @@ function (_PureComponent) {
     this.resultEl = el;
   };
 
+  _proto.updateMore = function updateMore(preProps) {
+    var _this$props = this.props,
+        compressed = _this$props.compressed,
+        _this$props$value = _this$props.value,
+        value = _this$props$value === void 0 ? [] : _this$props$value,
+        onFilter = _this$props.onFilter,
+        data = _this$props.data;
+
+    if (compressed) {
+      if ((preProps.value || []).join('') !== (value || []).join('')) {
+        this.resetMore();
+      } else if ((preProps.data || []).length !== (data || []).length) {
+        this.resetMore();
+      } else if (value.length && this.shouldResetMore) {
+        this.shouldResetMore = false;
+        this.state.more = getResetMore(onFilter, this.resultEl, this.resultEl.querySelectorAll("." + cascaderClass('item')));
+        this.forceUpdate();
+      }
+    }
+  };
+
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;
@@ -361,7 +368,8 @@ Result.propTypes = {
   selectId: PropTypes.string,
   showList: PropTypes.func,
   size: PropTypes.string,
-  showArrow: PropTypes.bool
+  showArrow: PropTypes.bool,
+  data: PropTypes.array
 };
 Result.defaultProps = {
   value: []

package/es/DatePicker/index.d.ts

@@ -263,7 +263,14 @@ export interface DatePickerProps<T =DatePickerValue > extends StandardProps,
    * default: -
    */
   innerTitle?: ReactNode;
-  name: string | string[]
+  /**
+   * The name of a Form that accesses data
+   *
+   * Form 存取数据的名称
+   *
+   * default: -
+   */
+  name?: string | string[]
 }
 
 declare class DatePicker extends React.Component<DatePickerProps, {}> {

package/es/Rule/index.d.ts

@@ -62,7 +62,7 @@ export interface RuleResult {
 
   range(min?: number, max?: number, message?: string): Range;
 
-  regExp(reg?: RegExp | string): RegExpParams;
+  regExp(reg?: RegExp | string, message?: string): RegExpParams;
 
   email(message?: string): Type;
 

package/es/Select/More.js

@@ -4,7 +4,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { parsePxToNumber } from '../utils/dom/element';
-import Popover from '../Popover';
+import Popover from '../Popover'; // if num = -1 display all else display num
+
 export function getResetMore(onFilter, container, doms) {
   if (!container || !doms || !doms.length) return -1;
   var items = Array.from(doms);
@@ -34,10 +35,18 @@ export function getResetMore(onFilter, container, doms) {
     for (var i = 0; i < itemWidthArr.length; i++) {
       var itemLen = itemWidthArr[i]; // number length
 
-      var reset = "+" + (items.length - 1 - i);
-      hideEl.childNodes[0].innerText = reset; // (+num) width
+      var resetNum = items.length - 1 - i;
+      var moreWidth = void 0;
+
+      if (resetNum <= 0) {
+        moreWidth = 0;
+      } else {
+        var reset = "+" + resetNum;
+        hideEl.childNodes[0].innerText = reset; // (+num) width
+
+        moreWidth = hideEl.offsetWidth + hideMargin;
+      }
 
-      var moreWidth = hideEl.offsetWidth + hideMargin;
       len += itemLen;
 
       if (len > contentWidth - moreWidth) {
@@ -97,7 +106,7 @@ function (_Component) {
         cls = _this$props.cls,
         showNum = _this$props.showNum;
     var status = this.state.status;
-    if (showNum < 0 || showNum > data.length) return React.createElement(React.Fragment, null, data, React.createElement("a", {
+    if (showNum < 0 || showNum >= data.length) return React.createElement(React.Fragment, null, data, React.createElement("a", {
       key: "hidden",
       className: className,
       style: {

package/es/Select/Result.js

@@ -99,13 +99,47 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
+    this.updateMore(preProps);
+  };
+
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    if (this.cancelResizeObserver) this.cancelResizeObserver();
+  };
+
+  _proto.bindResult = function bindResult(el) {
+    this.resultEl = el;
+  };
+
+  _proto.updateMore = function updateMore(preProps) {
     var _this$props = this.props,
         result = _this$props.result,
         compressed = _this$props.compressed,
-        onFilter = _this$props.onFilter;
+        onFilter = _this$props.onFilter,
+        renderResult = _this$props.renderResult,
+        renderUnmatched = _this$props.renderUnmatched;
 
     if (compressed) {
-      if ((preProps.result || []).join('') !== (result || []).join('')) {
+      var shouldRest = false;
+
+      if (preProps.result.length !== result.length) {
+        shouldRest = true;
+      } else {
+        var i = preProps.result.length - 1;
+
+        while (i >= 0) {
+          var before = getResultContent(preProps.result[i], preProps.renderResult, preProps.renderUnmatched);
+          var now = getResultContent(result[i], renderResult, renderUnmatched);
+
+          if (before !== now) {
+            shouldRest = true;
+            break;
+          }
+
+          i -= 1;
+        }
+      }
+
+      if (shouldRest) {
         this.resetMore();
       } else if (result.length && this.shouldResetMore) {
         this.shouldResetMore = false;
@@ -115,14 +149,6 @@ function (_PureComponent) {
     }
   };
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
-    if (this.cancelResizeObserver) this.cancelResizeObserver();
-  };
-
-  _proto.bindResult = function bindResult(el) {
-    this.resultEl = el;
-  };
-
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;

package/es/Table/index.d.ts

@@ -124,7 +124,7 @@ export interface ColumnItem<T> {
    *
    * default: none
    */
-  sorter?: ((order: ColumnOrder) => (prevRowData: T, nextRowData: T) => boolean) | string;
+  sorter?: ((order: ColumnOrder) => (prevRowData: T, nextRowData: T) => number) | string;
 
   /**
    * The content of the header
@@ -552,7 +552,7 @@ export interface TableProps<Value, TRD> extends StandardProps, ListItemStandardP
    * default: false
    */
  changedByExpand?: boolean
-  
+
   /*
    * customize sort icons
    *

package/es/TreeSelect/Result.js

@@ -76,13 +76,47 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
+    this.updateMore(preProps);
+  };
+
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    if (this.cancelResizeObserver) this.cancelResizeObserver();
+  };
+
+  _proto.bindResult = function bindResult(el) {
+    this.resultEl = el;
+  };
+
+  _proto.updateMore = function updateMore(preProps) {
     var _this$props = this.props,
         result = _this$props.result,
         compressed = _this$props.compressed,
-        onFilter = _this$props.onFilter;
+        onFilter = _this$props.onFilter,
+        renderResult = _this$props.renderResult,
+        renderUnmatched = _this$props.renderUnmatched;
 
     if (compressed) {
-      if ((preProps.result || []).join('') !== (result || []).join('')) {
+      var shouldRest = false;
+
+      if (preProps.result.length !== result.length) {
+        shouldRest = true;
+      } else {
+        var i = preProps.result.length - 1;
+
+        while (i >= 0) {
+          var before = getResultContent(preProps.result[i], preProps.renderResult, preProps.renderUnmatched);
+          var now = getResultContent(result[i], renderResult, renderUnmatched);
+
+          if (before !== now) {
+            shouldRest = true;
+            break;
+          }
+
+          i -= 1;
+        }
+      }
+
+      if (shouldRest) {
         this.resetMore();
       } else if (result.length && this.shouldResetMore) {
         this.shouldResetMore = false;
@@ -92,14 +126,6 @@ function (_PureComponent) {
     }
   };
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
-    if (this.cancelResizeObserver) this.cancelResizeObserver();
-  };
-
-  _proto.bindResult = function bindResult(el) {
-    this.resultEl = el;
-  };
-
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;

package/es/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.9.6' }
+export default { utils, version: '1.9.7' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/es/index.js

@@ -2,7 +2,7 @@
 import * as utils from './utils';
 export default {
   utils: utils,
-  version: '1.9.6'
+  version: '1.9.7'
 };
 export { utils };
 export { setLocale } from './locale';

package/lib/Cascader/Result.js

@@ -103,21 +103,7 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
-    var _this$props = this.props,
-        compressed = _this$props.compressed,
-        _this$props$value = _this$props.value,
-        value = _this$props$value === void 0 ? [] : _this$props$value,
-        onFilter = _this$props.onFilter;
-
-    if (compressed) {
-      if ((preProps.value || []).join('') !== (value || []).join('')) {
-        this.resetMore();
-      } else if (value.length && this.shouldResetMore) {
-        this.shouldResetMore = false;
-        this.state.more = (0, _More.getResetMore)(onFilter, this.resultEl, this.resultEl.querySelectorAll("." + (0, _styles3.cascaderClass)('item')));
-        this.forceUpdate();
-      }
-    }
+    this.updateMore(preProps);
   };
 
   _proto.componentWillUnmount = function componentWillUnmount() {
@@ -134,6 +120,27 @@ function (_PureComponent) {
     this.resultEl = el;
   };
 
+  _proto.updateMore = function updateMore(preProps) {
+    var _this$props = this.props,
+        compressed = _this$props.compressed,
+        _this$props$value = _this$props.value,
+        value = _this$props$value === void 0 ? [] : _this$props$value,
+        onFilter = _this$props.onFilter,
+        data = _this$props.data;
+
+    if (compressed) {
+      if ((preProps.value || []).join('') !== (value || []).join('')) {
+        this.resetMore();
+      } else if ((preProps.data || []).length !== (data || []).length) {
+        this.resetMore();
+      } else if (value.length && this.shouldResetMore) {
+        this.shouldResetMore = false;
+        this.state.more = (0, _More.getResetMore)(onFilter, this.resultEl, this.resultEl.querySelectorAll("." + (0, _styles3.cascaderClass)('item')));
+        this.forceUpdate();
+      }
+    }
+  };
+
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;
@@ -386,7 +393,8 @@ Result.propTypes = {
   selectId: _propTypes.default.string,
   showList: _propTypes.default.func,
   size: _propTypes.default.string,
-  showArrow: _propTypes.default.bool
+  showArrow: _propTypes.default.bool,
+  data: _propTypes.default.array
 };
 Result.defaultProps = {
   value: []

package/lib/DatePicker/index.d.ts

@@ -263,7 +263,14 @@ export interface DatePickerProps<T =DatePickerValue > extends StandardProps,
    * default: -
    */
   innerTitle?: ReactNode;
-  name: string | string[]
+  /**
+   * The name of a Form that accesses data
+   *
+   * Form 存取数据的名称
+   *
+   * default: -
+   */
+  name?: string | string[]
 }
 
 declare class DatePicker extends React.Component<DatePickerProps, {}> {

package/lib/Rule/index.d.ts

@@ -62,7 +62,7 @@ export interface RuleResult {
 
   range(min?: number, max?: number, message?: string): Range;
 
-  regExp(reg?: RegExp | string): RegExpParams;
+  regExp(reg?: RegExp | string, message?: string): RegExpParams;
 
   email(message?: string): Type;
 

package/lib/Select/More.js

@@ -22,6 +22,7 @@ var _element = require("../utils/dom/element");
 
 var _Popover = _interopRequireDefault(require("../Popover"));
 
+// if num = -1 display all else display num
 function getResetMore(onFilter, container, doms) {
   if (!container || !doms || !doms.length) return -1;
   var items = Array.from(doms);
@@ -51,10 +52,18 @@ function getResetMore(onFilter, container, doms) {
     for (var i = 0; i < itemWidthArr.length; i++) {
       var itemLen = itemWidthArr[i]; // number length
 
-      var reset = "+" + (items.length - 1 - i);
-      hideEl.childNodes[0].innerText = reset; // (+num) width
+      var resetNum = items.length - 1 - i;
+      var moreWidth = void 0;
+
+      if (resetNum <= 0) {
+        moreWidth = 0;
+      } else {
+        var reset = "+" + resetNum;
+        hideEl.childNodes[0].innerText = reset; // (+num) width
+
+        moreWidth = hideEl.offsetWidth + hideMargin;
+      }
 
-      var moreWidth = hideEl.offsetWidth + hideMargin;
       len += itemLen;
 
       if (len > contentWidth - moreWidth) {
@@ -114,7 +123,7 @@ function (_Component) {
         cls = _this$props.cls,
         showNum = _this$props.showNum;
     var status = this.state.status;
-    if (showNum < 0 || showNum > data.length) return _react.default.createElement(_react.default.Fragment, null, data, _react.default.createElement("a", {
+    if (showNum < 0 || showNum >= data.length) return _react.default.createElement(_react.default.Fragment, null, data, _react.default.createElement("a", {
       key: "hidden",
       className: className,
       style: {

package/lib/Select/Result.js

@@ -125,13 +125,47 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
+    this.updateMore(preProps);
+  };
+
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    if (this.cancelResizeObserver) this.cancelResizeObserver();
+  };
+
+  _proto.bindResult = function bindResult(el) {
+    this.resultEl = el;
+  };
+
+  _proto.updateMore = function updateMore(preProps) {
     var _this$props = this.props,
         result = _this$props.result,
         compressed = _this$props.compressed,
-        onFilter = _this$props.onFilter;
+        onFilter = _this$props.onFilter,
+        renderResult = _this$props.renderResult,
+        renderUnmatched = _this$props.renderUnmatched;
 
     if (compressed) {
-      if ((preProps.result || []).join('') !== (result || []).join('')) {
+      var shouldRest = false;
+
+      if (preProps.result.length !== result.length) {
+        shouldRest = true;
+      } else {
+        var i = preProps.result.length - 1;
+
+        while (i >= 0) {
+          var before = getResultContent(preProps.result[i], preProps.renderResult, preProps.renderUnmatched);
+          var now = getResultContent(result[i], renderResult, renderUnmatched);
+
+          if (before !== now) {
+            shouldRest = true;
+            break;
+          }
+
+          i -= 1;
+        }
+      }
+
+      if (shouldRest) {
         this.resetMore();
       } else if (result.length && this.shouldResetMore) {
         this.shouldResetMore = false;
@@ -141,14 +175,6 @@ function (_PureComponent) {
     }
   };
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
-    if (this.cancelResizeObserver) this.cancelResizeObserver();
-  };
-
-  _proto.bindResult = function bindResult(el) {
-    this.resultEl = el;
-  };
-
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;

package/lib/Table/index.d.ts

@@ -124,7 +124,7 @@ export interface ColumnItem<T> {
    *
    * default: none
    */
-  sorter?: ((order: ColumnOrder) => (prevRowData: T, nextRowData: T) => boolean) | string;
+  sorter?: ((order: ColumnOrder) => (prevRowData: T, nextRowData: T) => number) | string;
 
   /**
    * The content of the header
@@ -552,7 +552,7 @@ export interface TableProps<Value, TRD> extends StandardProps, ListItemStandardP
    * default: false
    */
  changedByExpand?: boolean
-  
+
   /*
    * customize sort icons
    *

package/lib/TreeSelect/Result.js

@@ -100,13 +100,47 @@ function (_PureComponent) {
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(preProps) {
+    this.updateMore(preProps);
+  };
+
+  _proto.componentWillUnmount = function componentWillUnmount() {
+    if (this.cancelResizeObserver) this.cancelResizeObserver();
+  };
+
+  _proto.bindResult = function bindResult(el) {
+    this.resultEl = el;
+  };
+
+  _proto.updateMore = function updateMore(preProps) {
     var _this$props = this.props,
         result = _this$props.result,
         compressed = _this$props.compressed,
-        onFilter = _this$props.onFilter;
+        onFilter = _this$props.onFilter,
+        renderResult = _this$props.renderResult,
+        renderUnmatched = _this$props.renderUnmatched;
 
     if (compressed) {
-      if ((preProps.result || []).join('') !== (result || []).join('')) {
+      var shouldRest = false;
+
+      if (preProps.result.length !== result.length) {
+        shouldRest = true;
+      } else {
+        var i = preProps.result.length - 1;
+
+        while (i >= 0) {
+          var before = getResultContent(preProps.result[i], preProps.renderResult, preProps.renderUnmatched);
+          var now = getResultContent(result[i], renderResult, renderUnmatched);
+
+          if (before !== now) {
+            shouldRest = true;
+            break;
+          }
+
+          i -= 1;
+        }
+      }
+
+      if (shouldRest) {
         this.resetMore();
       } else if (result.length && this.shouldResetMore) {
         this.shouldResetMore = false;
@@ -116,14 +150,6 @@ function (_PureComponent) {
     }
   };
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
-    if (this.cancelResizeObserver) this.cancelResizeObserver();
-  };
-
-  _proto.bindResult = function bindResult(el) {
-    this.resultEl = el;
-  };
-
   _proto.resetMore = function resetMore() {
     if (!this.props.compressed) return;
     this.shouldResetMore = true;

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.9.6' }
+export default { utils, version: '1.9.7' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/lib/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.9.6'
+  version: '1.9.7'
 };
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shineout",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "description": "Shein 前端组件库",
   "main": "./lib/index.js",
   "module": "./es/index.js",