shineout 1.9.2 → 1.10.0-rc.1

package/css/Input/Input.js

@@ -33,6 +33,19 @@ var _styles2 = require("./styles");
 
 var _InputTitle = _interopRequireDefault(require("../InputTitle"));
 
+function isNumberType(n) {
+  return !Number.isNaN(parseFloat(n)) && !Number.isNaN(n - 0);
+}
+
+function regLength(size) {
+  return /\d+/.test(size) && size > 0 ? "{0," + size + "}" : '*';
+}
+
+function fillNumber(val) {
+  return val.replace(/^(-)?(\.\d+)(?!=\.).*/g, '$10$2') // eslint-disable-next-line no-useless-escape
+  .replace(/^0+(?=0\.?|[^0\.])/g, '').replace(/\.$/, '');
+}
+
 var Input =
 /*#__PURE__*/
 function (_PureComponent) {
@@ -54,6 +67,7 @@ function (_PureComponent) {
     _this.handleKeyDown = _this.handleKeyDown.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleKeyUp = _this.handleKeyUp.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleBlur = _this.handleBlur.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    _this.handleAutoSelect = _this.handleAutoSelect.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.bindRef = _this.bindRef.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     return _this;
   }
@@ -66,16 +80,71 @@ function (_PureComponent) {
     if (forwardedRef) forwardedRef(el);
   };
 
-  _proto.invalidNumber = function invalidNumber(value) {
+  _proto.isValidNumber = function isValidNumber(val) {
+    var positive = this.props.positive;
+    var regExp = new RegExp("^(" + (positive ? '' : '-') + ")?\\d*\\.?\\d*$", 'g');
+    return regExp.test(val);
+  };
+
+  _proto.formatValue = function formatValue(val) {
+    var value = val;
     var _this$props = this.props,
+        type = _this$props.type,
         digits = _this$props.digits,
-        type = _this$props.type;
+        integerLimit = _this$props.integerLimit,
+        positive = _this$props.positive;
+    if (type !== 'number') return value; // if (positive) {
+    //   value = value.replace(/^0/g, '')
+    // }
+
+    var regExp = new RegExp("^(" + (positive ? '' : '-') + ")?(\\d" + regLength(integerLimit) + ")(" + (digits !== 0 ? "\\.\\d" + regLength(digits) : '') + ")?.*$", 'g');
+    console.log(value, typeof value);
+    value = value.replace(regExp, '$1$2$3');
+    return value;
+  };
+
+  _proto.fixValue = function fixValue(val) {
+    var _this$props2 = this.props,
+        type = _this$props2.type,
+        digits = _this$props2.digits,
+        autoFix = _this$props2.autoFix,
+        cancelChange = _this$props2.cancelChange,
+        positive = _this$props2.positive;
+    if (type !== 'number' || val === '') return val;
+    if (!isNumberType(val)) return '';
+    var fixVal = fillNumber(val);
+    if (positive && fixVal <= 0) return '';
+
+    if (digits !== undefined && autoFix) {
+      if (digits > 0) {
+        fixVal = parseFloat(fixVal).toFixed(digits);
+      } else {
+        fixVal = parseInt(fixVal, 10).toString();
+      }
+
+      if (cancelChange) cancelChange();
+    }
+
+    return fixVal;
+  };
+
+  _proto.invalidNumber = function invalidNumber(value) {
+    var _this$props3 = this.props,
+        digits = _this$props3.digits,
+        type = _this$props3.type,
+        integerLimit = _this$props3.integerLimit;
     if (type !== 'number') return false;
-    var reg = '^-?\\d*';
+    var reg = '^-?';
+
+    if (!integerLimit) {
+      reg += "\\d*";
+    } else if (integerLimit > 0) {
+      reg += "\\d{0," + integerLimit + "}";
+    }
 
     if (digits === undefined) {
       reg += '\\.?\\d*';
-    } else if (digits > 0) {
+    } else if (digits >= 0) {
       reg += "\\.?\\d{0," + digits + "}";
     }
 
@@ -85,10 +154,9 @@ function (_PureComponent) {
   };
 
   _proto.handleChange = function handleChange(e, clearClick) {
-    var _this$props2 = this.props,
-        type = _this$props2.type,
-        clearable = _this$props2.clearable,
-        digits = _this$props2.digits;
+    var _this$props4 = this.props,
+        type = _this$props4.type,
+        clearable = _this$props4.clearable;
 
     if (clearClick) {
       this.ref.focus();
@@ -102,20 +170,16 @@ function (_PureComponent) {
       return;
     }
 
-    if (type === 'number' && typeof value !== 'number') value = String(value).replace(/。/g, '.');
+    if (type === 'number') {
+      if (typeof value !== 'number') {
+        value = String(value).replace(/。/g, '.');
+      }
 
-    if (this.invalidNumber(value)) {
-      // For numbers with a decimal point, use toFixed to correct the number of decimal points.
-      if (digits >= 0 && /^-?\d*\.?\d*$/.test(value)) {
-        if (digits === 0) {
-          value = value === '.' ? '' : Number(value).toFixed(digits);
-        } else {
-          value = Number(value).toFixed(digits + 1).slice(0, -1);
-        }
-      } else {
-        // digits <= 0 || not of number
+      if (!this.isValidNumber(value)) {
         return;
       }
+
+      value = this.formatValue(value);
     }
 
     this.props.onChange(value);
@@ -128,9 +192,9 @@ function (_PureComponent) {
   };
 
   _proto.handleKeyUp = function handleKeyUp(e) {
-    var _this$props3 = this.props,
-        onKeyUp = _this$props3.onKeyUp,
-        onEnterPress = _this$props3.onEnterPress;
+    var _this$props5 = this.props,
+        onKeyUp = _this$props5.onKeyUp,
+        onEnterPress = _this$props5.onEnterPress;
 
     if (this.enterPress && e.keyCode === 13 && onEnterPress) {
       onEnterPress(e.target.value, e);
@@ -142,18 +206,34 @@ function (_PureComponent) {
 
   _proto.handleBlur = function handleBlur(e) {
     var value = e.target.value;
-    var _this$props4 = this.props,
-        forceChange = _this$props4.forceChange,
-        onBlur = _this$props4.onBlur,
-        clearToUndefined = _this$props4.clearToUndefined;
+    var _this$props6 = this.props,
+        forceChange = _this$props6.forceChange,
+        onBlur = _this$props6.onBlur,
+        clearToUndefined = _this$props6.clearToUndefined,
+        cancelChange = _this$props6.cancelChange;
+    if (cancelChange) cancelChange();
+    var newVal = this.fixValue(value);
     if (onBlur) onBlur(e);
-    if (this.invalidNumber(value)) return;
+    if (this.invalidNumber(newVal)) return;
 
-    if (clearToUndefined && value === '' && this.props.value === undefined) {
+    if (clearToUndefined && newVal === '' && this.props.value === undefined) {
       return;
     }
 
-    if (forceChange) forceChange(value);
+    if (forceChange) forceChange(newVal);
+  };
+
+  _proto.handleAutoSelect = function handleAutoSelect(event) {
+    var onFocus = this.props.onFocus;
+    var autoSelect = this.props.autoSelect;
+
+    if (autoSelect) {
+      event.currentTarget.select();
+    }
+
+    if (typeof onFocus === 'function') {
+      onFocus(event);
+    }
   };
 
   _proto.renderInfo = function renderInfo() {
@@ -176,21 +256,21 @@ function (_PureComponent) {
   };
 
   _proto.render = function render() {
-    var _this$props5 = this.props,
-        type = _this$props5.type,
-        defaultValue = _this$props5.defaultValue,
-        digits = _this$props5.digits,
-        className = _this$props5.className,
-        clearable = _this$props5.clearable,
-        htmlName = _this$props5.htmlName,
-        forceChange = _this$props5.forceChange,
-        onEnterPress = _this$props5.onEnterPress,
-        forwardedRef = _this$props5.forwardedRef,
-        innerTitle = _this$props5.innerTitle,
-        inputFocus = _this$props5.inputFocus,
-        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 _this$props7 = this.props,
+        type = _this$props7.type,
+        defaultValue = _this$props7.defaultValue,
+        digits = _this$props7.digits,
+        className = _this$props7.className,
+        clearable = _this$props7.clearable,
+        htmlName = _this$props7.htmlName,
+        forceChange = _this$props7.forceChange,
+        onEnterPress = _this$props7.onEnterPress,
+        forwardedRef = _this$props7.forwardedRef,
+        innerTitle = _this$props7.innerTitle,
+        inputFocus = _this$props7.inputFocus,
+        clearToUndefined = _this$props7.clearToUndefined,
+        placeholder = _this$props7.placeholder,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props7, ["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);
@@ -212,7 +292,8 @@ function (_PureComponent) {
       onChange: this.handleChange,
       onKeyDown: this.handleKeyDown,
       onKeyUp: this.handleKeyUp,
-      onBlur: this.handleBlur
+      onBlur: this.handleBlur,
+      onFocus: this.handleAutoSelect
     }))), showClear && _react.default.createElement(_clear.default, {
       onClick: this.handleChange,
       key: "close",
@@ -227,10 +308,15 @@ Input.propTypes = {
   className: _propTypes.default.string,
   defaultValue: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
   digits: _propTypes.default.number,
+  integerLimit: _propTypes.default.number,
+  positive: _propTypes.default.bool,
+  autoSelect: _propTypes.default.bool,
+  autoFix: _propTypes.default.bool,
   forceChange: _propTypes.default.func,
   htmlName: _propTypes.default.string,
   onBlur: _propTypes.default.func,
   onChange: _propTypes.default.func.isRequired,
+  cancelChange: _propTypes.default.func,
   onEnterPress: _propTypes.default.func,
   type: _propTypes.default.string,
   value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),

package/css/Input/Number.js

@@ -69,17 +69,21 @@ function (_PureComponent) {
       return;
     }
 
-    if (typeof this.props.digits === 'number') {
-      value = parseFloat(value.toFixed(this.props.digits));
+    var _this$props = this.props,
+        digits = _this$props.digits,
+        step = _this$props.step;
+
+    if (typeof digits === 'number') {
+      value = parseFloat(value.toFixed(digits));
     } else {
-      var stepStr = this.props.step.toString();
+      var stepStr = step.toString();
       var dot = stepStr.lastIndexOf('.');
       if (dot >= 0) value = parseFloat(value.toFixed(stepStr.length - dot));
     }
 
-    var _this$props = this.props,
-        min = _this$props.min,
-        max = _this$props.max;
+    var _this$props2 = this.props,
+        min = _this$props2.min,
+        max = _this$props2.max;
     if (max !== undefined && value > max) value = max;
     if (min !== undefined && value < min) value = min;
 
@@ -115,7 +119,20 @@ function (_PureComponent) {
     var value = parseFloat(("" + (val || '')).replace(/,/g, '')); // eslint-disable-next-line
 
     if (isNaN(value)) value = 0;
-    this.handleChange((0, _numbers.sub)(value, mod), true);
+    var _this$props3 = this.props,
+        positive = _this$props3.positive,
+        integerLimit = _this$props3.integerLimit;
+    var calculateVal = (0, _numbers.sub)(value, mod);
+
+    if (positive && calculateVal <= 0) {
+      calculateVal = value;
+    }
+
+    if (integerLimit && String(parseInt(calculateVal, 10)).length > integerLimit) {
+      calculateVal = value;
+    }
+
+    this.handleChange(calculateVal, true);
   };
 
   _proto.longPress = function longPress(mod) {
@@ -191,11 +208,11 @@ function (_PureComponent) {
   };
 
   _proto.renderRTL = function renderRTL() {
-    var _this$props2 = this.props,
-        onChange = _this$props2.onChange,
-        allowNull = _this$props2.allowNull,
-        hideArrow = _this$props2.hideArrow,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props2, ["onChange", "allowNull", "hideArrow"]);
+    var _this$props4 = this.props,
+        onChange = _this$props4.onChange,
+        allowNull = _this$props4.allowNull,
+        hideArrow = _this$props4.hideArrow,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props4, ["onChange", "allowNull", "hideArrow"]);
     return [].concat(this.renderArrowGroup(), [_react.default.createElement(_Input.default, (0, _extends2.default)({
       key: "input"
     }, other, {
@@ -211,11 +228,11 @@ function (_PureComponent) {
   };
 
   _proto.render = function render() {
-    var _this$props3 = this.props,
-        onChange = _this$props3.onChange,
-        allowNull = _this$props3.allowNull,
-        hideArrow = _this$props3.hideArrow,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props3, ["onChange", "allowNull", "hideArrow"]);
+    var _this$props5 = this.props,
+        onChange = _this$props5.onChange,
+        allowNull = _this$props5.allowNull,
+        hideArrow = _this$props5.hideArrow,
+        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["onChange", "allowNull", "hideArrow"]);
     var rtl = (0, _config.isRTL)();
 
     if (rtl) {
@@ -249,6 +266,9 @@ Number.propTypes = {
   onChange: _propTypes.default.func.isRequired,
   step: _propTypes.default.number,
   digits: _propTypes.default.number,
+  integerLimit: _propTypes.default.number,
+  positive: _propTypes.default.bool,
+  autoSelect: _propTypes.default.bool,
   allowNull: _propTypes.default.bool,
   hideArrow: _propTypes.default.bool,
   clearToUndefined: _propTypes.default.bool,

package/css/Input/index.d.ts

@@ -188,7 +188,57 @@ FormItemStandardProps<Value> {
    *  default: -
    *
    */
-  clearToUndefined?: boolean
+  clearToUndefined?: boolean,
+
+  /**
+   * the digits of number 仅在type = number 下生效
+   *
+   * Decimal place limit (valid when type is number)
+   *
+   * default: -
+   */
+  digits?: number;
+
+  /**
+   *  整数位数限制, 仅在type = number 下生效
+   *
+   *  Integer bit limit (valid when type is number)
+   *
+   *  default: -
+   *
+   */
+  integerLimit?: number,
+
+  /**
+   *  非负数，仅在type = number 下生效
+   *
+   *  positive number
+   *
+   *  default: -
+   *
+   */
+   positive?: boolean,
+
+  /**
+   *  鼠标点击后自动全选数据
+   *
+   *  Automatically select all data after mouse click
+   *
+   *  default: false
+   *
+   */
+  autoSelect?: boolean,
+
+  /**
+   *  失焦后自动按照 digits 精度限制补足 (type 为 number 时生效)
+   *
+   *  Automatically fill up according to the precision limit of digits after out of focus
+   *
+   *  default: false
+   *
+   */
+  autoFix?: boolean,
+
 }
 
 export interface InputNumberProps <Value> extends InputProps<Value> {
@@ -220,15 +270,6 @@ export interface InputNumberProps <Value> extends InputProps<Value> {
    */
   step?: number;
 
-  /**
-   * the digits of number
-   *
-   * 数值的精度
-   *
-   * default: -
-   */
-  digits?: number;
-
   /**
    * allow value is null
    *

package/css/hoc/delay.js

@@ -42,6 +42,7 @@ var _default = (0, _func.curry)(function (defaultDelay, Origin) {
       };
       _this.handleChange = _this.handleChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       _this.forceChange = _this.forceChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+      _this.cancelChange = _this.cancelChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       return _this;
     }
 
@@ -91,6 +92,10 @@ var _default = (0, _func.curry)(function (defaultDelay, Origin) {
       }, delay);
     };
 
+    _proto.cancelChange = function cancelChange() {
+      if (this.changeTimer) clearTimeout(this.changeTimer);
+    };
+
     _proto.forceChange = function forceChange(value) {
       var _this$props2;
 
@@ -115,7 +120,8 @@ var _default = (0, _func.curry)(function (defaultDelay, Origin) {
       return _react.default.createElement(Origin, (0, _extends2.default)({}, props, {
         value: this.getValue(),
         onChange: this.handleChange,
-        forceChange: this.forceChange
+        forceChange: this.forceChange,
+        cancelChange: this.cancelChange
       }));
     };
 

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

package/css/utils/cleanProps.js

@@ -7,7 +7,7 @@ exports.default = cleanProps;
 
 var _immer = _interopRequireDefault(require("immer"));
 
-var names = ['delay', 'onDatumBind', 'rules', 'formDatum', 'forceChange', 'trim', 'beforeChange', 'validateHook', 'innerFormNamePath', 'fieldSetValidate', 'combineRules', 'popoverProps', 'inputFocus', 'placeTitle'];
+var names = ['delay', 'onDatumBind', 'rules', 'formDatum', 'forceChange', 'trim', 'beforeChange', 'validateHook', 'innerFormNamePath', 'fieldSetValidate', 'combineRules', 'popoverProps', 'inputFocus', 'placeTitle', 'cancelChange', 'integerLimit', 'autoSelect', 'autoFix', 'positive'];
 /**
  * delete some props if needed, will not modify the pass argument
  * @param props