shineout 1.9.0-rc.7 → 1.9.1

package/css/Cascader/Cascader.js

@@ -116,6 +116,12 @@ function (_PureComponent) {
 
   var _proto = Cascader.prototype;
 
+  _proto.componentDidMount = function componentDidMount() {
+    _PureComponent.prototype.componentDidMount.call(this);
+
+    this.updatePathByValue();
+  };
+
   _proto.componentDidUpdate = function componentDidUpdate(prevProps, prevState) {
     this.datum.mode = this.props.mode;
     var _this$props = this.props,
@@ -123,7 +129,11 @@ function (_PureComponent) {
         filterDataChange = _this$props.filterDataChange,
         filterText = _this$props.filterText;
     if (!filterDataChange && prevProps.data !== this.props.data) this.datum.setData(this.props.data, true);
-    if (prevProps.value !== this.props.value) this.datum.setValue(this.props.value || []);
+
+    if (prevProps.value !== this.props.value) {
+      this.datum.setValue(this.props.value || []);
+      this.updatePathByValue();
+    }
 
     if (prevState.focus !== this.state.focus && !this.state.focus && onFilter) {
       setTimeout(function () {
@@ -185,6 +195,30 @@ function (_PureComponent) {
     }));
   };
 
+  _proto.updatePathByValue = function updatePathByValue() {
+    var _this$props3 = this.props,
+        mode = _this$props3.mode,
+        value = _this$props3.value;
+    if (mode !== undefined) return;
+    if (value === this.lastValue) return;
+
+    if (!value || !value.length) {
+      this.setState({
+        path: []
+      });
+    } else {
+      var v = value[value.length - 1];
+      var data = this.datum.getDataById(v);
+      var id = this.datum.getKey(data);
+
+      var _ref2 = this.datum.getPath(id) || {},
+          path = _ref2.path;
+
+      path = path || [];
+      this.handlePathChange(id, null, path);
+    }
+  };
+
   _proto.handleClickAway = function handleClickAway(e) {
     var desc = isDescendent(e.target, this.selectId);
 
@@ -198,12 +232,18 @@ function (_PureComponent) {
   _proto.handlePathChange = function handlePathChange(id, data, path, fromClick) {
     var _this2 = this;
 
-    var _this$props3 = this.props,
-        childrenKey = _this$props3.childrenKey,
-        finalDismiss = _this$props3.finalDismiss;
+    var _this$props4 = this.props,
+        childrenKey = _this$props4.childrenKey,
+        finalDismiss = _this$props4.finalDismiss,
+        loader = _this$props4.loader;
 
     if (fromClick && data) {
       var leaf = !data[childrenKey] || data[childrenKey].length === 0;
+
+      if (loader && typeof loader === 'function' && data[childrenKey] === undefined) {
+        leaf = false;
+      }
+
       if (finalDismiss && leaf) this.handleState(false);
     }
 
@@ -248,9 +288,9 @@ function (_PureComponent) {
     if (focus && e && e.target.classList.contains((0, _styles2.cascaderClass)('close'))) return; // if remove node, return
 
     if (e && (0, _element.getParent)(e.target, "." + (0, _styles2.cascaderClass)('remove-container'))) return;
-    var _this$props4 = this.props,
-        height = _this$props4.height,
-        onCollapse = _this$props4.onCollapse;
+    var _this$props5 = this.props,
+        height = _this$props5.height,
+        onCollapse = _this$props5.onCollapse;
     var position = this.props.position;
 
     if (!position) {
@@ -294,34 +334,40 @@ function (_PureComponent) {
   };
 
   _proto.handleChange = function handleChange() {
-    var _this$props5 = this.props,
-        onChange = _this$props5.onChange,
-        onFilter = _this$props5.onFilter,
-        filterText = _this$props5.filterText;
+    var _this$props6 = this.props,
+        onChange = _this$props6.onChange,
+        onFilter = _this$props6.onFilter,
+        filterText = _this$props6.filterText;
 
     if (this.input) {
       this.input.reset();
       this.input.focus();
     }
 
-    onChange.apply(void 0, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    var value = args[0];
+    this.lastValue = value;
+    onChange.apply(void 0, args);
     if (onFilter && filterText) onFilter('');
   };
 
   _proto.renderList = function renderList() {
     var _this4 = this;
 
-    var _this$props6 = this.props,
-        data = _this$props6.data,
-        keygen = _this$props6.keygen,
-        renderItem = _this$props6.renderItem,
-        mode = _this$props6.mode,
-        loader = _this$props6.loader,
-        onItemClick = _this$props6.onItemClick,
-        expandTrigger = _this$props6.expandTrigger,
-        childrenKey = _this$props6.childrenKey,
-        absolute = _this$props6.absolute,
-        height = _this$props6.height;
+    var _this$props7 = this.props,
+        data = _this$props7.data,
+        keygen = _this$props7.keygen,
+        renderItem = _this$props7.renderItem,
+        mode = _this$props7.mode,
+        loader = _this$props7.loader,
+        onItemClick = _this$props7.onItemClick,
+        expandTrigger = _this$props7.expandTrigger,
+        childrenKey = _this$props7.childrenKey,
+        absolute = _this$props7.absolute,
+        height = _this$props7.height;
     var path = this.state.path;
     var props = {
       datum: this.datum,
@@ -382,9 +428,9 @@ function (_PureComponent) {
   };
 
   _proto.renderAbsoluteList = function renderAbsoluteList() {
-    var _this$props7 = this.props,
-        absolute = _this$props7.absolute,
-        zIndex = _this$props7.zIndex;
+    var _this$props8 = this.props,
+        absolute = _this$props8.absolute,
+        zIndex = _this$props8.zIndex;
     var _this$state = this.state,
         focus = _this$state.focus,
         position = _this$state.position;
@@ -406,17 +452,17 @@ function (_PureComponent) {
   };
 
   _proto.renderFilterList = function renderFilterList() {
-    var _this$props8 = this.props,
-        absolute = _this$props8.absolute,
-        onFilter = _this$props8.onFilter,
-        filterText = _this$props8.filterText,
-        zIndex = _this$props8.zIndex,
-        data = _this$props8.data,
-        childrenKey = _this$props8.childrenKey,
-        renderItem = _this$props8.renderItem,
-        expandTrigger = _this$props8.expandTrigger,
-        height = _this$props8.height,
-        loading = _this$props8.loading;
+    var _this$props9 = this.props,
+        absolute = _this$props9.absolute,
+        onFilter = _this$props9.onFilter,
+        filterText = _this$props9.filterText,
+        zIndex = _this$props9.zIndex,
+        data = _this$props9.data,
+        childrenKey = _this$props9.childrenKey,
+        renderItem = _this$props9.renderItem,
+        expandTrigger = _this$props9.expandTrigger,
+        height = _this$props9.height,
+        loading = _this$props9.loading;
     var _this$state2 = this.state,
         focus = _this$state2.focus,
         position = _this$state2.position;
@@ -445,11 +491,11 @@ function (_PureComponent) {
   };
 
   _proto.renderPanel = function renderPanel() {
-    var _this$props9 = this.props,
-        filterText = _this$props9.filterText,
-        data = _this$props9.data,
-        mode = _this$props9.mode,
-        loading = _this$props9.loading;
+    var _this$props10 = this.props,
+        filterText = _this$props10.filterText,
+        data = _this$props10.data,
+        mode = _this$props10.mode,
+        loading = _this$props10.loading;
     if (loading) return this.renderFilterList();
     if (!filterText || filterText && mode !== undefined || data.length === 0) return this.renderAbsoluteList();
     return this.renderFilterList();
@@ -458,11 +504,11 @@ function (_PureComponent) {
   _proto.render = function render() {
     var _this5 = this;
 
-    var _this$props10 = this.props,
-        placeholder = _this$props10.placeholder,
-        disabled = _this$props10.disabled,
-        size = _this$props10.size,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props10, ["placeholder", "disabled", "size"]);
+    var _this$props11 = this.props,
+        placeholder = _this$props11.placeholder,
+        disabled = _this$props11.disabled,
+        size = _this$props11.size,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props11, ["placeholder", "disabled", "size"]);
     var focus = this.state.focus;
     var className = (0, _classnames.default)((0, _styles2.cascaderClass)('_', size, focus && 'focus', other.mode !== undefined && 'multiple', disabled === true && 'disabled', (0, _config.isRTL)() && 'rtl'), (0, _styles.selectClass)(this.state.position, focus && 'focus'));
     return _react.default.createElement("div", {

package/css/Input/Input.js

@@ -96,6 +96,12 @@ function (_PureComponent) {
     }
 
     var value = e.target.value;
+
+    if (clearClick && this.props.clearToUndefined) {
+      this.props.onChange(value);
+      return;
+    }
+
     if (type === 'number' && typeof value !== 'number') value = String(value).replace(/。/g, '.');
 
     if (this.invalidNumber(value)) {
@@ -138,9 +144,15 @@ function (_PureComponent) {
     var value = e.target.value;
     var _this$props4 = this.props,
         forceChange = _this$props4.forceChange,
-        onBlur = _this$props4.onBlur;
+        onBlur = _this$props4.onBlur,
+        clearToUndefined = _this$props4.clearToUndefined;
     if (onBlur) onBlur(e);
     if (this.invalidNumber(value)) return;
+
+    if (clearToUndefined && value === '' && this.props.value === undefined) {
+      return;
+    }
+
     if (forceChange) forceChange(value);
   };
 
@@ -176,9 +188,12 @@ function (_PureComponent) {
         forwardedRef = _this$props5.forwardedRef,
         innerTitle = _this$props5.innerTitle,
         inputFocus = _this$props5.inputFocus,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["type", "defaultValue", "digits", "className", "clearable", "htmlName", "forceChange", "onEnterPress", "forwardedRef", "innerTitle", "inputFocus"]);
-    var value = this.props.value == null ? '' : this.props.value;
-    var showClear = !other.disabled && clearable && value !== '';
+        clearToUndefined = _this$props5.clearToUndefined,
+        placeholder = _this$props5.placeholder,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["type", "defaultValue", "digits", "className", "clearable", "htmlName", "forceChange", "onEnterPress", "forwardedRef", "innerTitle", "inputFocus", "clearToUndefined", "placeholder"]);
+    var value = this.props.value == null || this.props.value === undefined ? '' : this.props.value;
+    var needClearUndefined = clearToUndefined && this.props.value !== undefined;
+    var showClear = !other.disabled && clearable && (value !== '' || needClearUndefined);
     var mc = (0, _classnames.default)(className, showClear && (0, _styles2.inputClass)('clearable'), innerTitle && (0, _styles.inputTitleClass)('hidable', 'item'));
     var isNumber = className && className.indexOf((0, _styles2.inputClass)('number')) > -1;
     return [_react.default.createElement(_InputTitle.default, {
@@ -187,6 +202,7 @@ function (_PureComponent) {
       innerTitle: innerTitle,
       open: !!inputFocus || !!value
     }, _react.default.createElement("input", (0, _extends2.default)({}, (0, _cleanProps.default)(other), {
+      placeholder: needClearUndefined ? '' : placeholder,
       className: mc || undefined,
       name: other.name || htmlName,
       type: type === 'password' ? type : 'text',
@@ -199,7 +215,8 @@ function (_PureComponent) {
       onBlur: this.handleBlur
     }))), showClear && _react.default.createElement(_clear.default, {
       onClick: this.handleChange,
-      key: "close"
+      key: "close",
+      clearResult: needClearUndefined ? undefined : ''
     }), this.renderInfo()];
   };
 
@@ -224,7 +241,9 @@ Input.propTypes = {
   onKeyDown: _propTypes.default.func,
   onKeyUp: _propTypes.default.func,
   innerTitle: _propTypes.default.node,
-  inputFocus: _propTypes.default.bool
+  inputFocus: _propTypes.default.bool,
+  clearToUndefined: _propTypes.default.bool,
+  placeholder: _propTypes.default.string
 };
 Input.defaultProps = {
   type: 'text'

package/css/Input/Number.js

@@ -56,7 +56,7 @@ function (_PureComponent) {
   };
 
   _proto.handleChange = function handleChange(value, check, isEmpty) {
-    if (isEmpty) {
+    if (isEmpty || value === undefined) {
       this.props.onChange(value);
       return;
     }
@@ -98,7 +98,13 @@ function (_PureComponent) {
 
 
     if (isNaN(value)) value = 0;
-    this.handleChange(value, true, value === null);
+
+    if (this.props.clearToUndefined && e.target.value === '' && this.props.value === undefined) {
+      this.handleChange(undefined, true, true);
+    } else {
+      this.handleChange(value, true, value === null);
+    }
+
     this.props.onBlur(e);
   };
 
@@ -245,6 +251,7 @@ Number.propTypes = {
   digits: _propTypes.default.number,
   allowNull: _propTypes.default.bool,
   hideArrow: _propTypes.default.bool,
+  clearToUndefined: _propTypes.default.bool,
   value: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string])
 };
 Number.defaultProps = {

package/css/Input/clear.js

@@ -35,10 +35,12 @@ function (_Component) {
   _proto.handleClick = function handleClick(e) {
     // do not blur
     e.preventDefault();
-    var onClick = this.props.onClick;
+    var _this$props = this.props,
+        onClick = _this$props.onClick,
+        clearResult = _this$props.clearResult;
     if (onClick) onClick({
       target: {
-        value: ''
+        value: clearResult
       }
     }, true);
   };
@@ -56,7 +58,8 @@ function (_Component) {
 }(_react.Component);
 
 Clear.propTypes = {
-  onClick: _propTypes.default.func
+  onClick: _propTypes.default.func,
+  clearResult: _propTypes.default.any
 };
 var _default = Clear;
 exports.default = _default;

package/css/Input/index.d.ts

@@ -190,6 +190,15 @@ FormItemStandardProps<Value> {
    */
   placeTitle?: ReactNode,
 
+  /**
+   *  点击清除按钮后数据变为 undefined
+   *
+   *  After clicking the clear button, the data becomes undefined
+   *
+   *  default: -
+   *
+   */
+  clearToUndefined?: boolean
 }
 
 export interface InputNumberProps <Value> extends InputProps<Value> {

package/css/TreeSelect/Result.js

@@ -230,7 +230,7 @@ function (_PureComponent) {
     }
 
     return _react.default.createElement("span", {
-      className: (0, _classnames.default)((0, _styles2.inputClass)('placeholder'), (0, _styles.treeSelectClass)('ellipsis'), innerTitle && (0, _styles3.inputTitleClass)('item'))
+      className: (0, _classnames.default)((0, _styles2.inputClass)('placeholder'), (0, _styles.treeSelectClass)('ellipsis'), innerTitle && (0, _styles3.inputTitleClass)('hidable'))
     }, this.props.placeholder, "\xA0");
   };
 

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.9.0-rc.7' }
+export default { utils, version: '1.9.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.9.0-rc.7'
+  version: '1.9.1'
 };
 exports.default = _default;