shineout 1.12.12 → 1.12.13-beta.2

package/css/Select/Result.js

@@ -37,10 +37,10 @@ var _More = _interopRequireWildcard(require("./More"));
 
 var _InputTitle = _interopRequireDefault(require("../InputTitle"));
 
-var _uid = require("../utils/uid");
-
 var _classname = require("../utils/classname");
 
+var _shallowEqual = _interopRequireDefault(require("../utils/shallowEqual"));
+
 var IS_NOT_MATCHED_VALUE = 'IS_NOT_MATCHED_VALUE';
 /**
  * get result className from resultClassName attr
@@ -73,18 +73,23 @@ var getResultContent = function getResultContent(data, renderResult, renderUnmat
 }; // eslint-disable-next-line
 
 
-function Item(_ref) {
-  var content = _ref.content,
-      data = _ref.data,
-      disabled = _ref.disabled,
-      onClick = _ref.onClick,
-      resultClassName = _ref.resultClassName,
-      _ref$title = _ref.title,
-      title = _ref$title === void 0 ? false : _ref$title,
-      only = _ref.only;
-  var value = data;
+function Item(props) {
+  // eslint-disable-next-line react/prop-types
+  var value = props.value,
+      onClick = props.onClick,
+      resultClassName = props.resultClassName,
+      _props$title = props.title,
+      title = _props$title === void 0 ? false : _props$title,
+      only = props.only,
+      getDataByValue = props.getDataByValue,
+      getContent = props.getContent,
+      isDisabled = props.isDisabled;
+  var data = getDataByValue(value);
+  var disabled = isDisabled(data);
+  var content = getContent(data);
+  if (data === null) return null;
   var click = disabled || !onClick ? undefined : function () {
-    return onClick(value);
+    return onClick(data);
   };
   var synDisabled = disabled || !click;
   return _react.default.createElement("a", {
@@ -157,42 +162,18 @@ function (_PureComponent) {
 
   _proto.updateMore = function updateMore(preProps) {
     var _this$props = this.props,
-        result = _this$props.result,
         compressed = _this$props.compressed,
         onFilter = _this$props.onFilter,
-        keygen = _this$props.keygen,
+        values = _this$props.values,
         data = _this$props.data;
 
     if (compressed) {
       if (this.isCompressedBound()) return;
-      var shouldRest = false;
-
-      if (preProps.result.length !== result.length || (data || []).length !== (preProps.data || []).length) {
-        shouldRest = true;
-      } 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) {
-          if (!isSameData(result[i], preProps.result[i], keygen)) {
-            shouldRest = true;
-            break;
-          }
-
-          i -= 1;
-        }
-      }
+      var shouldRest = !(0, _shallowEqual.default)(preProps.values, values) || (data || []).length !== (preProps.data || []).length;
 
       if (shouldRest) {
         this.resetMore();
-      } else if (result.length && this.shouldResetMore) {
+      } else if ((values || []).length && this.shouldResetMore) {
         this.shouldResetMore = false;
         this.state.more = (0, _More.getResetMore)(onFilter, this.resultEl, this.resultEl.querySelectorAll("." + (0, _styles.selectClass)('item')));
         this.forceUpdate();
@@ -220,20 +201,17 @@ function (_PureComponent) {
 
   _proto.isEmptyResult = function isEmptyResult() {
     var _this$props2 = this.props,
-        result = _this$props2.result,
+        values = _this$props2.values,
         renderResult = _this$props2.renderResult,
-        renderUnmatched = _this$props2.renderUnmatched;
-    if (result.length <= 0) return true;
-    var res = result.reduce(function (acc, cur) {
+        renderUnmatched = _this$props2.renderUnmatched,
+        getResultByValue = _this$props2.getResultByValue;
+    if (values.length <= 0) return true;
+    var hasValue = values.find(function (item) {
+      var cur = getResultByValue(item);
       var r = getResultContent(cur, renderResult, renderUnmatched);
-
-      if (!(0, _is.isEmpty)(r)) {
-        acc.push(cur);
-      }
-
-      return acc;
-    }, []);
-    return res.length <= 0;
+      return !(0, _is.isEmpty)(r);
+    });
+    return !hasValue;
   };
 
   _proto.handelMore = function handelMore(more) {
@@ -242,21 +220,26 @@ function (_PureComponent) {
     });
   };
 
-  _proto.renderItem = function renderItem(data, index) {
+  _proto.renderItem = function renderItem(value, index) {
     var _this$props3 = this.props,
         renderResult = _this$props3.renderResult,
         renderUnmatched = _this$props3.renderUnmatched,
         datum = _this$props3.datum,
-        resultClassName = _this$props3.resultClassName;
-    var content = getResultContent(data, renderResult, renderUnmatched);
-    if (content === null) return null;
+        resultClassName = _this$props3.resultClassName,
+        getResultByValue = _this$props3.getResultByValue;
+    if (value === null) return null;
     var more = this.getCompressedBound();
     return _react.default.createElement(Item, {
       key: index,
       only: more === 1,
-      content: content,
-      data: data,
-      disabled: datum.disabled(data),
+      value: value,
+      getDataByValue: getResultByValue,
+      getContent: function getContent(data) {
+        return getResultContent(data, renderResult, renderUnmatched);
+      },
+      isDisabled: function isDisabled(data) {
+        return datum.disabled(data);
+      },
       onClick: this.handleRemove,
       resultClassName: resultClassName,
       title: true
@@ -285,10 +268,10 @@ function (_PureComponent) {
   _proto.renderClear = function renderClear() {
     var _this$props5 = this.props,
         onClear = _this$props5.onClear,
-        result = _this$props5.result,
-        disabled = _this$props5.disabled;
+        disabled = _this$props5.disabled,
+        values = _this$props5.values;
 
-    if (onClear && result.length > 0 && disabled !== true) {
+    if (onClear && values.length && disabled !== true) {
       /* eslint-disable */
       return _react.default.createElement("div", {
         key: "clear",
@@ -368,16 +351,17 @@ function (_PureComponent) {
     var _this$props8 = this.props,
         multiple = _this$props8.multiple,
         compressed = _this$props8.compressed,
-        result = _this$props8.result,
         renderResult = _this$props8.renderResult,
         renderUnmatched = _this$props8.renderUnmatched,
         onFilter = _this$props8.onFilter,
         focus = _this$props8.focus,
         filterText = _this$props8.filterText,
-        resultClassName = _this$props8.resultClassName;
+        resultClassName = _this$props8.resultClassName,
+        getResultByValue = _this$props8.getResultByValue;
+    var values = this.props.values || [];
 
     if (multiple) {
-      var items = result.map(function (n, i) {
+      var items = values.map(function (n, i) {
         return _this2.renderItem(n, i);
       }).filter(function (n) {
         return !(0, _is.isEmpty)(n);
@@ -388,22 +372,24 @@ function (_PureComponent) {
       }
 
       if (focus && onFilter) {
-        items.push(this.renderInput(filterText, result.length));
+        items.push(this.renderInput(filterText, values.length));
       }
 
       return items;
     }
 
+    var result0 = getResultByValue(values[0]);
+
     if (onFilter) {
-      return this.renderInput(getResultContent(result[0], renderResult, renderUnmatched));
+      return this.renderInput(getResultContent(result0, renderResult, renderUnmatched));
     }
 
-    var v = getResultContent(result[0], renderResult, renderUnmatched);
+    var v = getResultContent(result0, renderResult, renderUnmatched);
     var title = (0, _is.isString)(v) ? v : undefined;
     return _react.default.createElement("span", {
       key: "result",
       title: title,
-      className: (0, _classnames.default)((0, _styles.selectClass)('ellipsis'), getResultClassName(resultClassName, result[0]))
+      className: (0, _classnames.default)((0, _styles.selectClass)('ellipsis'), getResultClassName(resultClassName, result0))
     }, v);
   };
 
@@ -461,12 +447,12 @@ Result.propTypes = {
   onFilter: _propTypes.default.func,
   onInputBlur: _propTypes.default.func,
   onInputFocus: _propTypes.default.func,
-  result: _propTypes.default.array.isRequired,
   renderResult: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]).isRequired,
   placeholder: _propTypes.default.string,
   setInputReset: _propTypes.default.func,
   bindFocusInputFunc: _propTypes.default.func,
   // collapse: PropTypes.func,
+  data: _propTypes.default.array,
   compressed: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.string]),
   compressedBound: _propTypes.default.number,
   trim: _propTypes.default.bool,
@@ -477,8 +463,8 @@ Result.propTypes = {
   resultClassName: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
   maxLength: _propTypes.default.number,
   innerTitle: _propTypes.default.node,
-  keygen: _propTypes.default.any,
-  data: _propTypes.default.array,
+  values: _propTypes.default.array.isRequired,
+  getResultByValue: _propTypes.default.func,
   convertBr: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func])
 };
 var _default = Result;

package/css/Select/Select.js

@@ -643,7 +643,6 @@ function (_PureComponent) {
         datum = _this$props12.datum,
         filterText = _this$props12.filterText,
         onCreate = _this$props12.onCreate,
-        result = _this$props12.result,
         compressed = _this$props12.compressed,
         compressedBound = _this$props12.compressedBound,
         trim = _this$props12.trim,
@@ -657,7 +656,8 @@ function (_PureComponent) {
         convertBr = _this$props12.convertBr,
         data = _this$props12.data,
         onFilter = _this$props12.onFilter,
-        treeData = _this$props12.treeData;
+        treeData = _this$props12.treeData,
+        getResultByValue = _this$props12.getResultByValue;
     var disabled = this.getDisabledStatus();
     var className = (0, _styles.selectClass)('inner', size, this.state.focus && 'focus', this.state.position, multiple && 'multiple', disabled === true && (0, _classname.getDirectionClass)('disabled'), !trim && 'pre');
     return _react.default.createElement("div", {
@@ -680,8 +680,10 @@ function (_PureComponent) {
       onFilter: onFilter && this.handleFilter,
       datum: datum,
       disabled: disabled,
-      focus: this.state.focus,
-      result: result,
+      focus: this.state.focus // result={result}
+      ,
+      values: datum.values,
+      getResultByValue: getResultByValue,
       multiple: multiple,
       placeholder: placeholder,
       renderResult: this.renderResult,

package/css/Select/filter.js

@@ -44,8 +44,9 @@ var _default = function _default(Origin) {
         text: ''
       };
       _this.handleCreate = _this.handleCreate.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-      _this.handleFilter = _this.handleFilter.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-      _this.getResultByValues = _this.getResultByValues.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+      _this.handleFilter = _this.handleFilter.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this))); // this.getResultByValues = this.getResultByValues.bind(this)
+
+      _this.getCachedResult = _this.getCachedResult.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       _this.resultCache = new Map();
       return _this;
     }
@@ -108,43 +109,50 @@ var _default = function _default(Origin) {
       return undefined;
     };
 
-    _proto.getResultByValues = function getResultByValues() {
-      var _this2 = this;
+    _proto.getCachedResult = function getCachedResult(value) {
+      var noCache = this.props.noCache;
+      var res = noCache ? undefined : this.resultCache.get(value);
 
-      var _this$props4 = this.props,
-          datum = _this$props4.datum,
-          noCache = _this$props4.noCache;
-      var _datum$values = datum.values,
-          values = _datum$values === void 0 ? [] : _datum$values;
-      var result = [];
-      values.forEach(function (v) {
-        var res = noCache ? undefined : _this2.resultCache.get(v);
-
-        if (!res) {
-          var _res;
-
-          res = _this2.getResult(v);
-          if (res !== undefined && !noCache) _this2.resultCache.set(v, res);else if (res === undefined) res = (_res = {}, _res[_Result.IS_NOT_MATCHED_VALUE] = true, _res.value = v, _res);
-        }
+      if (!res) {
+        var _res;
 
-        if (res !== undefined) {
-          result.push(res);
-        }
-      });
-      return result;
-    };
+        res = this.getResult(value);
+        if (res !== undefined && !noCache) this.resultCache.set(value, res);else if (res === undefined) res = (_res = {}, _res[_Result.IS_NOT_MATCHED_VALUE] = true, _res.value = value, _res);
+      }
+
+      return res;
+    } // getResultByValues() {
+    //   const { datum, noCache } = this.props
+    //   const { values = [] } = datum
+    //
+    //   const result = []
+    //   values.forEach(v => {
+    //     let res = noCache ? undefined : this.resultCache.get(v)
+    //     if (!res) {
+    //       res = this.getResult(v)
+    //       if (res !== undefined && !noCache) this.resultCache.set(v, res)
+    //       else if (res === undefined) res = { [IS_NOT_MATCHED_VALUE]: true, value: v }
+    //     }
+    //     if (res !== undefined) {
+    //       result.push(res)
+    //     }
+    //   })
+    //
+    //   return result
+    // }
+    ;
 
     _proto.handleFilter = function handleFilter(text, from) {
-      var _this3 = this;
+      var _this2 = this;
 
       if (from === void 0) {
         from = 'edit';
       }
 
-      var _this$props5 = this.props,
-          filterDelay = _this$props5.filterDelay,
-          onFilter = _this$props5.onFilter,
-          onCreate = _this$props5.onCreate;
+      var _this$props4 = this.props,
+          filterDelay = _this$props4.filterDelay,
+          onFilter = _this$props4.onFilter,
+          onCreate = _this$props4.onCreate;
       this.setState({
         text: text
       }); // not filter
@@ -176,7 +184,7 @@ var _default = function _default(Origin) {
         var fn = onFilter(text, from);
 
         if (typeof fn === 'function') {
-          _this3.setState({
+          _this2.setState({
             innerFilter: fn
           });
         }
@@ -192,12 +200,12 @@ var _default = function _default(Origin) {
     };
 
     _proto.filterTreeData = function filterTreeData() {
-      var _this$props6 = this.props,
-          treeData = _this$props6.treeData,
-          expanded = _this$props6.expanded,
-          showHitDescendants = _this$props6.showHitDescendants,
-          onAdvancedFilter = _this$props6.onAdvancedFilter,
-          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props6, ["treeData", "expanded", "showHitDescendants", "onAdvancedFilter"]);
+      var _this$props5 = this.props,
+          treeData = _this$props5.treeData,
+          expanded = _this$props5.expanded,
+          showHitDescendants = _this$props5.showHitDescendants,
+          onAdvancedFilter = _this$props5.onAdvancedFilter,
+          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["treeData", "expanded", "showHitDescendants", "onAdvancedFilter"]);
       var innerFilter = this.state.innerFilter;
       var filterExpandedKeys = expanded;
       var newData = treeData;
@@ -219,10 +227,10 @@ var _default = function _default(Origin) {
     };
 
     _proto.filterData = function filterData() {
-      var _this$props7 = this.props,
-          data = _this$props7.data,
-          hideCreateOption = _this$props7.hideCreateOption,
-          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["data", "hideCreateOption"]);
+      var _this$props6 = this.props,
+          data = _this$props6.data,
+          hideCreateOption = _this$props6.hideCreateOption,
+          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props6, ["data", "hideCreateOption"]);
       var _this$state = this.state,
           innerFilter = _this$state.innerFilter,
           innerData = _this$state.innerData;
@@ -247,11 +255,11 @@ var _default = function _default(Origin) {
     };
 
     _proto.render = function render() {
-      var _this$props8 = this.props,
-          treeData = _this$props8.treeData,
-          onFilter = _this$props8.onFilter,
-          onCreate = _this$props8.onCreate,
-          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props8, ["treeData", "onFilter", "onCreate"]);
+      var _this$props7 = this.props,
+          treeData = _this$props7.treeData,
+          onFilter = _this$props7.onFilter,
+          onCreate = _this$props7.onCreate,
+          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["treeData", "onFilter", "onCreate"]);
       var _this$state2 = this.state,
           filterText = _this$state2.filterText,
           innerData = _this$state2.innerData,
@@ -261,7 +269,8 @@ var _default = function _default(Origin) {
       var props = (0, _objectSpread2.default)({}, other, {
         filterText: filterText,
         inputText: text,
-        result: this.getResultByValues(),
+        // result: this.getResultByValues(),
+        getResultByValue: this.getCachedResult,
         inputable: !!onCreate,
         onCreate: onCreate ? this.handleCreate : undefined,
         onFilter: filterFn,

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.12'
+  version: '1.12.13-beta.2'
 }
 
 export default __default

package/css/index.js

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