shineout 1.7.1-rc.5 → 1.7.1

package/css/Cascader/Result.js

@@ -49,7 +49,8 @@ function Item(_ref) {
       data = _ref.data,
       isPopover = _ref.isPopover,
       singleRemove = _ref.singleRemove,
-      click = _ref.click;
+      click = _ref.click,
+      only = _ref.only;
   var onClose = close ? function (e) {
     close(data, isPopover, e);
   } : undefined;
@@ -58,7 +59,7 @@ function Item(_ref) {
   } : undefined;
   return _react.default.createElement("a", {
     tabIndex: -1,
-    className: (0, _classnames.default)((0, _styles3.cascaderClass)('item'), className),
+    className: (0, _classnames.default)((0, _styles3.cascaderClass)('item', only && 'item-only'), className),
     onClick: onClick
   }, children, singleRemove && _react.default.createElement("span", {
     className: (0, _styles3.cascaderClass)('single-remove'),
@@ -223,8 +224,10 @@ function (_PureComponent) {
     var itemClassName = (0, _classnames.default)(className, (0, _styles3.cascaderClass)(singleRemove && 'remove-container'));
     var res = data && render(data, raw);
     if (!res) return null;
+    var more = this.state.more;
     return _react.default.createElement(Item, (0, _extends2.default)({
-      key: index
+      key: index,
+      only: more === 1
     }, options, {
       data: data,
       className: itemClassName,

package/css/Cascader/styles/cascader.css

@@ -173,6 +173,10 @@ div.so-cascader-options {
   -ms-flex-negative: 0;
       flex-shrink: 0;
 }
+.so-cascader-result.so-cascader-compressed .so-cascader-item-only {
+  -ms-flex-negative: 1;
+      flex-shrink: 1;
+}
 .so-cascader-result.so-cascader-compressed .so-cascader-input {
   white-space: nowrap;
 }

package/css/Datum/List.js

@@ -50,6 +50,16 @@ function () {
     this.$cachedFlatten = new Map();
   };
 
+  _proto.resetValueMap = function resetValueMap() {
+    var map = new Map();
+
+    for (var i = 0; i < this.$values.length; i++) {
+      map.set(this.$values[i], true);
+    }
+
+    this.valueMap = map;
+  };
+
   _proto.setDisabled = function setDisabled(disabled) {
     if (this.$cachedDisabled === disabled) return;
     this.$cachedDisabled = disabled;
@@ -70,6 +80,7 @@ function () {
 
   _proto.handleChange = function handleChange(values) {
     this.$values = values;
+    this.resetValueMap();
     this.dispatch(_types.CHANGE_TOPIC);
 
     if (this.onChange) {
@@ -119,6 +130,7 @@ function () {
     if (data === undefined || data === null) return; // clear value
 
     if (this.limit === 1) this.$values = [];
+    this.resetValueMap();
     var raws = Array.isArray(data) ? data : [data];
 
     if (childrenKey && this.limit !== 1) {
@@ -156,6 +168,7 @@ function () {
 
   _proto.set = function set(value) {
     this.$values = [];
+    this.resetValueMap();
     this.add(value);
   };
 
@@ -168,7 +181,7 @@ function () {
       return false;
     }
 
-    return this.values.indexOf(this.format(raw)) >= 0;
+    return !!this.valueMap.get(this.format(raw));
   };
 
   _proto.getDataByValue = function getDataByValue(data, value) {
@@ -246,30 +259,51 @@ function () {
       return !_this4.disabled(r);
     });
     var values = [];
-    var prediction = this.prediction || this.defaultPrediction.bind(this);
 
-    outer: for (var _iterator2 = this.values, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
-      var _ref2;
+    if (!this.prediction) {
+      var rowValueMap = new Map();
 
-      if (_isArray2) {
-        if (_i2 >= _iterator2.length) break;
-        _ref2 = _iterator2[_i2++];
-      } else {
-        _i2 = _iterator2.next();
-        if (_i2.done) break;
-        _ref2 = _i2.value;
+      for (var i = 0; i < raws.length; i++) {
+        if (raws[i].IS_NOT_MATCHED_VALUE) {
+          rowValueMap.set(raws[i].value, true);
+        } else {
+          rowValueMap.set(this.format(raws[i]), true);
+        }
       }
 
-      var val = _ref2;
+      for (var _i2 = 0; _i2 < this.values.length; _i2++) {
+        var val = this.values[_i2];
 
-      for (var j = 0; j < raws.length; j++) {
-        if (raws[j].IS_NOT_MATCHED_VALUE && val === raws[j].value || prediction(val, raws[j])) {
-          raws.splice(j, 1);
-          continue outer;
+        if (!rowValueMap.get(val)) {
+          values.push(val);
         }
       }
+    } else {
+      var prediction = this.prediction;
+
+      outer: for (var _iterator2 = this.values, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+        var _ref2;
+
+        if (_isArray2) {
+          if (_i3 >= _iterator2.length) break;
+          _ref2 = _iterator2[_i3++];
+        } else {
+          _i3 = _iterator2.next();
+          if (_i3.done) break;
+          _ref2 = _i3.value;
+        }
+
+        var _val = _ref2;
 
-      values.push(val);
+        for (var j = 0; j < raws.length; j++) {
+          if (raws[j].IS_NOT_MATCHED_VALUE && _val === raws[j].value || prediction(_val, raws[j])) {
+            raws.splice(j, 1);
+            continue outer;
+          }
+        }
+
+        values.push(_val);
+      }
     } // this.values = values
 
 
@@ -300,6 +334,7 @@ function () {
 
   _proto.resetValue = function resetValue(values, cached) {
     this.$values = values;
+    this.resetValueMap();
 
     if (this.onChange && !cached) {
       this.onChange(this.getValue());
@@ -348,6 +383,7 @@ function () {
 
     if (type === _types.WITH_OUT_DISPATCH) {
       this.$values = this.formatValue(values);
+      this.resetValueMap();
     } else {
       this.resetValue(this.formatValue(values), (0, _shallowEqual.default)(this.$cachedValue, values));
     }
@@ -367,6 +403,7 @@ function () {
     },
     set: function set(values) {
       this.$values = values;
+      this.resetValueMap();
       this.dispatch(_types.CHANGE_TOPIC);
 
       if (this.onChange) {

package/css/Select/More.js

@@ -68,6 +68,11 @@ function getResetMore(onFilter, container, doms) {
         num = -1;
       }
     }
+  } // at least show one
+
+
+  if (num === 0 && itemWidthArr[0] && itemWidthArr[0] > 70) {
+    num = 1;
   }
 
   return num;

package/css/Select/Result.js

@@ -72,7 +72,8 @@ function Item(_ref) {
       onClick = _ref.onClick,
       resultClassName = _ref.resultClassName,
       _ref$title = _ref.title,
-      title = _ref$title === void 0 ? false : _ref$title;
+      title = _ref$title === void 0 ? false : _ref$title,
+      only = _ref.only;
   var value = data;
   var click = disabled || !onClick ? undefined : function () {
     return onClick(value);
@@ -81,7 +82,7 @@ function Item(_ref) {
   return _react.default.createElement("a", {
     title: title && (0, _is.isString)(content) ? content : null,
     tabIndex: -1,
-    className: (0, _classnames.default)((0, _styles.selectClass)('item', disabled && 'disabled', synDisabled && 'ban'), getResultClassName(resultClassName, data))
+    className: (0, _classnames.default)((0, _styles.selectClass)('item', disabled && 'disabled', synDisabled && 'ban', only && 'item-only'), getResultClassName(resultClassName, data))
   }, content, !synDisabled && _react.default.createElement("span", {
     className: (0, _styles.selectClass)('indicator', 'close'),
     onClick: click
@@ -190,8 +191,10 @@ function (_PureComponent) {
         resultClassName = _this$props3.resultClassName;
     var content = getResultContent(data, renderResult, renderUnmatched);
     if (content === null) return null;
+    var more = this.state.more;
     return _react.default.createElement(Item, {
       key: index,
+      only: more === 1,
       content: content,
       data: data,
       disabled: datum.disabled(data),

package/css/Select/styles/select.css

@@ -141,6 +141,10 @@
   -ms-flex-negative: 0;
       flex-shrink: 0;
 }
+.so-select-compressed.so-select-result .so-select-item-only {
+  -ms-flex-negative: 1;
+      flex-shrink: 1;
+}
 .so-select-close-warpper {
   position: absolute;
   top: 50%;

package/css/Transfer/Transfer.js

@@ -105,14 +105,19 @@ function (_PureComponent) {
       this.props.datum.setValue(this.props.value);
     }
 
-    var sources = data.filter(function (d) {
-      return !datum.check(d);
-    });
-    var targets = datumValues.reduce(function (p, n) {
-      var d = datum.getDataByValue(data, n);
-      if (d) p.push(d);
-      return p;
-    }, []);
+    var sources = [];
+    var targets = [];
+
+    for (var i = 0; i < data.length; i++) {
+      var d = data[i];
+
+      if (datum.check(d)) {
+        targets.push(d);
+      } else {
+        sources.push(d);
+      }
+    }
+
     return _react.default.createElement("div", (0, _extends2.default)({
       className: (0, _classnames.default)((0, _styles.transferClass)('_', (0, _config.isRTL)() && 'rtl'), className),
       style: style

package/css/Transfer/btns.js

@@ -41,18 +41,29 @@ function (_Component) {
 
   var _proto = Btns.prototype;
 
-  _proto.change = function change(index) {
+  _proto.getDataMap = function getDataMap() {
     var _this$props = this.props,
-        setSelecteds = _this$props.setSelecteds,
-        selecteds = _this$props.selecteds,
-        datum = _this$props.datum,
         data = _this$props.data,
         keygen = _this$props.keygen;
+    var dataMap = new Map();
+
+    for (var i = 0; i < data.length; i++) {
+      dataMap.set((0, _uid.getKey)(data[i], keygen, i), data[i]);
+    }
+
+    return dataMap;
+  };
+
+  _proto.change = function change(index) {
+    var _this$props2 = this.props,
+        setSelecteds = _this$props2.setSelecteds,
+        selecteds = _this$props2.selecteds,
+        datum = _this$props2.datum;
+    var dataMap = this.getDataMap();
     var newValue = selecteds[1 - index].map(function (c) {
-      return data.find(function (d, i) {
-        return (0, _uid.getKey)(d, keygen, i) === c;
-      });
-    });
+      return dataMap.get(c);
+    }); // const newValue = selecteds[1 - index].map(c => data.find((d, i) => getKey(d, keygen, i) === c))
+
     setSelecteds(1 - index, []);
     datum[index ? 'add' : 'remove'](newValue, undefined, undefined, true);
   };
@@ -62,9 +73,9 @@ function (_Component) {
       mode = 'left';
     }
 
-    var _this$props2 = this.props,
-        operations = _this$props2.operations,
-        operationIcon = _this$props2.operationIcon;
+    var _this$props3 = this.props,
+        operations = _this$props3.operations,
+        operationIcon = _this$props3.operationIcon;
 
     if (mode === 'left') {
       var left = [_react.default.createElement(_react.default.Fragment, {
@@ -86,9 +97,9 @@ function (_Component) {
   };
 
   _proto.render = function render() {
-    var _this$props3 = this.props,
-        selecteds = _this$props3.selecteds,
-        disabled = _this$props3.disabled;
+    var _this$props4 = this.props,
+        selecteds = _this$props4.selecteds,
+        disabled = _this$props4.disabled;
     var disable = disabled === true;
     return _react.default.createElement("div", {
       className: (0, _styles.transferClass)('btns')

package/css/TreeSelect/Result.js

@@ -48,7 +48,8 @@ function Item(_ref) {
   var content = _ref.content,
       data = _ref.data,
       disabled = _ref.disabled,
-      onClick = _ref.onClick;
+      onClick = _ref.onClick,
+      only = _ref.only;
   var value = data;
   var click = disabled || !onClick ? undefined : function () {
     return onClick(value);
@@ -56,7 +57,7 @@ function Item(_ref) {
   var synDisabled = disabled || !click;
   return _react.default.createElement("a", {
     tabIndex: -1,
-    className: (0, _styles.treeSelectClass)('item', disabled && 'disabled', synDisabled && 'ban')
+    className: (0, _styles.treeSelectClass)('item', disabled && 'disabled', synDisabled && 'ban', only && 'item-only')
   }, content, !synDisabled && _react.default.createElement("span", {
     className: (0, _styles.treeSelectClass)('indicator', 'close'),
     onClick: click
@@ -183,7 +184,9 @@ function (_PureComponent) {
         datum = _this$props4.datum;
     var content = getResultContent(data, renderResult, renderUnmatched);
     if (content === null) return null;
+    var more = this.state.more;
     return _react.default.createElement(Item, {
+      only: more === 1,
       key: index,
       content: content,
       data: data,

package/css/TreeSelect/styles/treeSelect.css

@@ -160,6 +160,10 @@
   -ms-flex-negative: 0;
       flex-shrink: 0;
 }
+.so-treeSelect-compressed .so-treeSelect-item-only {
+  -ms-flex-negative: 1;
+      flex-shrink: 1;
+}
 .so-treeSelect-indicator {
   position: absolute;
   top: 50%;

package/css/Upload/ImageResult.js

@@ -42,6 +42,7 @@ function (_PureComponent) {
     _this.bindImage = _this.bindImage.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handlePreview = _this.handlePreview.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleConfirmChange = _this.handleConfirmChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.preview = _this.preview.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
 
@@ -69,6 +70,11 @@ function (_PureComponent) {
     });
   };
 
+  _proto.preview = function preview() {
+    if (!this.image) return;
+    this.image.preview();
+  };
+
   _proto.handlePreview = function handlePreview() {
     var _this2 = this;
 
@@ -83,14 +89,13 @@ function (_PureComponent) {
       var url = renderResult(value);
       onPreview(url, value, index, values, {
         preview: function preview() {
-          return _this2.image.preview();
+          return _this2.preview();
         }
       });
       return;
     }
 
-    if (!this.image) return;
-    this.image.preview();
+    this.preview();
   };
 
   _proto.renderOptions = function renderOptions() {

package/css/index.d.ts

@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.7.1-rc.5' }
+export default { utils, version: '1.7.1' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

@@ -222,6 +222,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.7.1-rc.5'
+  version: '1.7.1'
 };
 exports.default = _default;