shineout 1.10.1-beta.1 → 1.10.2-beta.1

package/css/Datum/hoc.js

@@ -125,7 +125,7 @@ var _default = (0, _func.curry)(function (options, Origin) {
 
       var values = this.props[key];
 
-      if (values !== this.prevValues) {
+      if (type === 'form' && values !== this.prevValues) {
         this.setValue(this.props.initValidate ? undefined : _types.IGNORE_VALIDATE);
         this.prevValues = values;
       }

package/css/Select/Result.js

@@ -37,6 +37,8 @@ var _More = _interopRequireWildcard(require("./More"));
 
 var _InputTitle = _interopRequireDefault(require("../InputTitle"));
 
+var _uid = require("../utils/uid");
+
 var IS_NOT_MATCHED_VALUE = 'IS_NOT_MATCHED_VALUE';
 /**
  * get result className from resultClassName attr
@@ -141,22 +143,27 @@ function (_PureComponent) {
         result = _this$props.result,
         compressed = _this$props.compressed,
         onFilter = _this$props.onFilter,
-        renderResult = _this$props.renderResult,
-        renderUnmatched = _this$props.renderUnmatched;
+        keygen = _this$props.keygen,
+        data = _this$props.data;
 
     if (compressed) {
       var shouldRest = false;
 
-      if (preProps.result.length !== result.length) {
+      if (preProps.result.length !== result.length || (data || []).length !== (preProps.data || []).length) {
         shouldRest = true;
-      } else {
+      } else if (preProps.result !== result) {
+        var getUnMatchKey = function getUnMatchKey(d, k) {
+          return d && d.IS_NOT_MATCHED_VALUE ? d.value : (0, _uid.getKey)(d, k);
+        };
+
+        var isSameData = function isSameData(data1, data2, k) {
+          return getUnMatchKey(data1, k) === getUnMatchKey(data2, k);
+        };
+
         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) {
+          if (!isSameData(result[i], preProps.result[i], keygen)) {
             shouldRest = true;
             break;
           }
@@ -445,7 +452,9 @@ Result.propTypes = {
   compressedClassName: _propTypes.default.string,
   resultClassName: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
   maxLength: _propTypes.default.number,
-  innerTitle: _propTypes.default.node
+  innerTitle: _propTypes.default.node,
+  keygen: _propTypes.default.any,
+  data: _propTypes.default.array
 };
 var _default = Result;
 exports.default = _default;

package/css/Select/Select.js

@@ -598,7 +598,9 @@ function (_PureComponent) {
         compressedClassName = _this$props12.compressedClassName,
         resultClassName = _this$props12.resultClassName,
         maxLength = _this$props12.maxLength,
-        innerTitle = _this$props12.innerTitle;
+        innerTitle = _this$props12.innerTitle,
+        keygen = _this$props12.keygen,
+        data = _this$props12.data;
     var className = (0, _styles.selectClass)('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && 'disabled', !trim && 'pre');
     return _react.default.createElement("div", {
       // eslint-disable-next-line
@@ -636,7 +638,9 @@ function (_PureComponent) {
       focusSelected: this.getFocusSelected(),
       compressedClassName: compressedClassName,
       resultClassName: resultClassName,
-      innerTitle: innerTitle
+      innerTitle: innerTitle,
+      keygen: keygen,
+      data: data
     }), this.renderOptions());
   };
 

package/css/TreeSelect/Result.js

@@ -35,6 +35,8 @@ var _More = _interopRequireWildcard(require("../Select/More"));
 
 var _InputTitle = _interopRequireDefault(require("../InputTitle"));
 
+var _uid = require("../utils/uid");
+
 var IS_NOT_MATCHED_VALUE = 'IS_NOT_MATCHED_VALUE';
 exports.IS_NOT_MATCHED_VALUE = IS_NOT_MATCHED_VALUE;
 
@@ -116,27 +118,38 @@ function (_PureComponent) {
         result = _this$props.result,
         compressed = _this$props.compressed,
         onFilter = _this$props.onFilter,
-        renderResult = _this$props.renderResult,
-        renderUnmatched = _this$props.renderUnmatched;
+        keygen = _this$props.keygen,
+        data = _this$props.data;
 
     if (compressed) {
       var shouldRest = false;
 
-      if (preProps.result.length !== result.length) {
+      if (preProps.result.length !== result.length || (data || []).length !== (preProps.data || []).length) {
         shouldRest = true;
-      } else {
+      } else if (preProps.result !== result) {
         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);
+        var _loop = function _loop() {
+          var getUnMatchKey = function getUnMatchKey(d, k) {
+            return d && d.IS_NOT_MATCHED_VALUE ? d.value : (0, _uid.getKey)(d, k);
+          };
+
+          var isSameData = function isSameData(data1, data2, k) {
+            return getUnMatchKey(data1, k) === getUnMatchKey(data2, k);
+          };
 
-          if (before !== now) {
+          if (!isSameData(result[i], preProps.result[i], keygen)) {
             shouldRest = true;
-            break;
+            return "break";
           }
 
           i -= 1;
+        };
+
+        while (i >= 0) {
+          var _ret = _loop();
+
+          if (_ret === "break") break;
         }
       }
 
@@ -342,7 +355,9 @@ Result.propTypes = {
   setInputReset: _propTypes.default.func,
   compressed: _propTypes.default.bool,
   renderUnmatched: _propTypes.default.func,
-  innerTitle: _propTypes.default.node
+  innerTitle: _propTypes.default.node,
+  keygen: _propTypes.default.any,
+  data: _propTypes.default.array
 };
 var _default = Result;
 exports.default = _default;

package/css/TreeSelect/TreeSelect.js

@@ -387,7 +387,9 @@ function (_PureComponent) {
         filterText = _this$props10.filterText,
         result = _this$props10.result,
         renderUnmatched = _this$props10.renderUnmatched,
-        innerTitle = _this$props10.innerTitle;
+        innerTitle = _this$props10.innerTitle,
+        keygen = _this$props10.keygen,
+        data = _this$props10.data;
     var className = (0, _styles.treeSelectClass)('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && 'disabled');
     var renderResult = this.props.renderResult || this.renderItem;
     return _react.default.createElement("div", {
@@ -414,7 +416,9 @@ function (_PureComponent) {
       setInputReset: this.setInputReset,
       compressed: compressed,
       renderUnmatched: renderUnmatched,
-      innerTitle: innerTitle
+      innerTitle: innerTitle,
+      keygen: keygen,
+      data: data
     }), this.renderTreeOptions());
   };
 

package/css/index.d.ts

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

package/css/index.js

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

package/dist/shineout.js

@@ -18255,7 +18255,7 @@ var types = {
 
         var values = this.props[key];
 
-        if (values !== this.prevValues) {
+        if (type === 'form' && values !== this.prevValues) {
           this.setValue(this.props.initValidate ? undefined : _types__WEBPACK_IMPORTED_MODULE_11__["IGNORE_VALIDATE"]);
           this.prevValues = values;
         }
@@ -37046,6 +37046,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../config */ "./src/config.js");
 /* harmony import */ var _More__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./More */ "./src/Select/More.js");
 /* harmony import */ var _InputTitle__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../InputTitle */ "./src/InputTitle/index.js");
+/* harmony import */ var _utils_uid__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../utils/uid */ "./src/utils/uid.js");
 
 
 
@@ -37097,6 +37098,7 @@ function _createSuper2(Derived) {
 
 
 
+
 var IS_NOT_MATCHED_VALUE = 'IS_NOT_MATCHED_VALUE';
 /**
  * get result className from resultClassName attr
@@ -37150,7 +37152,7 @@ function Item(_ref) {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 47,
+        lineNumber: 48,
         columnNumber: 5
       }
     }, content, !synDisabled &&
@@ -37161,7 +37163,7 @@ function Item(_ref) {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 56,
+        lineNumber: 57,
         columnNumber: 24
       }
     }))
@@ -37224,22 +37226,27 @@ function (_PureComponent) {
           result = _this$props.result,
           compressed = _this$props.compressed,
           onFilter = _this$props.onFilter,
-          renderResult = _this$props.renderResult,
-          renderUnmatched = _this$props.renderUnmatched;
+          keygen = _this$props.keygen,
+          data = _this$props.data;
 
       if (compressed) {
         var shouldRest = false;
 
-        if (preProps.result.length !== result.length) {
+        if (preProps.result.length !== result.length || (data || []).length !== (preProps.data || []).length) {
           shouldRest = true;
-        } else {
+        } else if (preProps.result !== result) {
+          var getUnMatchKey = function getUnMatchKey(d, k) {
+            return d && d.IS_NOT_MATCHED_VALUE ? d.value : Object(_utils_uid__WEBPACK_IMPORTED_MODULE_19__["getKey"])(d, k);
+          };
+
+          var isSameData = function isSameData(data1, data2, k) {
+            return getUnMatchKey(data1, k) === getUnMatchKey(data2, k);
+          };
+
           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) {
+            if (!isSameData(result[i], preProps.result[i], keygen)) {
               shouldRest = true;
               break;
             }
@@ -37643,7 +37650,9 @@ Result.propTypes = {
   compressedClassName: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.string,
   resultClassName: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.oneOfType([prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.string, prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.func]),
   maxLength: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.number,
-  innerTitle: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.node
+  innerTitle: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.node,
+  keygen: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.any,
+  data: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.array
 };
 /* harmony default export */ __webpack_exports__["default"] = (Result);
 
@@ -38364,7 +38373,9 @@ function (_PureComponent) {
           compressedClassName = _this$props12.compressedClassName,
           resultClassName = _this$props12.resultClassName,
           maxLength = _this$props12.maxLength,
-          innerTitle = _this$props12.innerTitle;
+          innerTitle = _this$props12.innerTitle,
+          keygen = _this$props12.keygen,
+          data = _this$props12.data;
       var className = Object(_styles__WEBPACK_IMPORTED_MODULE_14__["selectClass"])('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && 'disabled', !trim && 'pre');
       return (
         /*#__PURE__*/
@@ -38381,7 +38392,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 547,
+            lineNumber: 549,
             columnNumber: 7
           }
         },
@@ -38413,10 +38424,12 @@ function (_PureComponent) {
           compressedClassName: compressedClassName,
           resultClassName: resultClassName,
           innerTitle: innerTitle,
+          keygen: keygen,
+          data: data,
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 558,
+            lineNumber: 560,
             columnNumber: 9
           }
         }), this.renderOptions())
@@ -53398,6 +53411,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _icons_Caret__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../icons/Caret */ "./src/icons/Caret.js");
 /* harmony import */ var _Select_More__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../Select/More */ "./src/Select/More.js");
 /* harmony import */ var _InputTitle__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../InputTitle */ "./src/InputTitle/index.js");
+/* harmony import */ var _utils_uid__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../utils/uid */ "./src/utils/uid.js");
 
 
 
@@ -53448,6 +53462,7 @@ function _createSuper2(Derived) {
 
 
 
+
 var IS_NOT_MATCHED_VALUE = 'IS_NOT_MATCHED_VALUE';
 
 var getResultContent = function getResultContent(data, renderResult, renderUnmatched) {
@@ -53479,7 +53494,7 @@ function Item(_ref) {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 30,
+        lineNumber: 31,
         columnNumber: 5
       }
     }, content, !synDisabled &&
@@ -53490,7 +53505,7 @@ function Item(_ref) {
       __self: this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 35,
+        lineNumber: 36,
         columnNumber: 24
       }
     }))
@@ -53553,27 +53568,38 @@ function (_PureComponent) {
           result = _this$props.result,
           compressed = _this$props.compressed,
           onFilter = _this$props.onFilter,
-          renderResult = _this$props.renderResult,
-          renderUnmatched = _this$props.renderUnmatched;
+          keygen = _this$props.keygen,
+          data = _this$props.data;
 
       if (compressed) {
         var shouldRest = false;
 
-        if (preProps.result.length !== result.length) {
+        if (preProps.result.length !== result.length || (data || []).length !== (preProps.data || []).length) {
           shouldRest = true;
-        } else {
+        } else if (preProps.result !== result) {
           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);
+          var _loop = function _loop() {
+            var getUnMatchKey = function getUnMatchKey(d, k) {
+              return d && d.IS_NOT_MATCHED_VALUE ? d.value : Object(_utils_uid__WEBPACK_IMPORTED_MODULE_18__["getKey"])(d, k);
+            };
+
+            var isSameData = function isSameData(data1, data2, k) {
+              return getUnMatchKey(data1, k) === getUnMatchKey(data2, k);
+            };
 
-            if (before !== now) {
+            if (!isSameData(result[i], preProps.result[i], keygen)) {
               shouldRest = true;
-              break;
+              return "break";
             }
 
             i -= 1;
+          };
+
+          while (i >= 0) {
+            var _ret = _loop();
+
+            if (_ret === "break") break;
           }
         }
 
@@ -53626,7 +53652,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 125,
+              lineNumber: 126,
               columnNumber: 9
             }
           },
@@ -53638,7 +53664,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 126,
+              lineNumber: 127,
               columnNumber: 11
             }
           }))
@@ -53670,7 +53696,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 142,
+            lineNumber: 143,
             columnNumber: 7
           }
         })
@@ -53698,7 +53724,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 161,
+            lineNumber: 162,
             columnNumber: 7
           }
         })
@@ -53723,7 +53749,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 176,
+          lineNumber: 177,
           columnNumber: 7
         }
       })];
@@ -53747,7 +53773,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 197,
+            lineNumber: 198,
             columnNumber: 7
           }
         }, this.props.placeholder, "\xA0")
@@ -53797,7 +53823,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 232,
+            lineNumber: 233,
             columnNumber: 7
           }
         }, getResultContent(result[0], renderResult, renderUnmatched))
@@ -53824,7 +53850,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 242,
+            lineNumber: 243,
             columnNumber: 7
           }
         },
@@ -53835,7 +53861,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 252,
+            lineNumber: 253,
             columnNumber: 9
           }
         }, result, !this.props.multiple &&
@@ -53847,7 +53873,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 262,
+            lineNumber: 263,
             columnNumber: 13
           }
         },
@@ -53856,7 +53882,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 263,
+            lineNumber: 264,
             columnNumber: 16
           }
         })), this.renderClear()))
@@ -53882,7 +53908,9 @@ Result.propTypes = {
   setInputReset: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.func,
   compressed: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.bool,
   renderUnmatched: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.func,
-  innerTitle: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.node
+  innerTitle: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.node,
+  keygen: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.any,
+  data: prop_types__WEBPACK_IMPORTED_MODULE_7___default.a.array
 };
 /* harmony default export */ __webpack_exports__["default"] = (Result);
 
@@ -54403,7 +54431,9 @@ function (_PureComponent) {
           filterText = _this$props10.filterText,
           result = _this$props10.result,
           renderUnmatched = _this$props10.renderUnmatched,
-          innerTitle = _this$props10.innerTitle;
+          innerTitle = _this$props10.innerTitle,
+          keygen = _this$props10.keygen,
+          data = _this$props10.data;
       var className = Object(_styles__WEBPACK_IMPORTED_MODULE_15__["treeSelectClass"])('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && 'disabled');
       var renderResult = this.props.renderResult || this.renderItem;
       return (
@@ -54420,7 +54450,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 338,
+            lineNumber: 340,
             columnNumber: 7
           }
         },
@@ -54441,10 +54471,12 @@ function (_PureComponent) {
           compressed: compressed,
           renderUnmatched: renderUnmatched,
           innerTitle: innerTitle,
+          keygen: keygen,
+          data: data,
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 348,
+            lineNumber: 350,
             columnNumber: 9
           }
         }), this.renderTreeOptions())
@@ -61424,7 +61456,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.10.1-beta.1'
+  version: '1.10.2-beta.1'
 });