shineout 1.11.7 → 1.11.8

package/css/EditableArea/EditableArea.js

@@ -17,6 +17,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _config = _interopRequireDefault(require("../config"));
+
 var _Textarea = _interopRequireDefault(require("../Textarea"));
 
 var _Input = _interopRequireDefault(require("../Input"));
@@ -88,11 +90,28 @@ function (_React$PureComponent) {
   };
 
   _proto.onBlur = function onBlur(e) {
-    var onBlur = this.props.onBlur;
+    var _this$props = this.props,
+        onBlur = _this$props.onBlur,
+        forceChange = _this$props.forceChange;
     this.hidePop();
+    var newValue = e.target.value;
+
+    if (this.getTrim()) {
+      newValue = newValue.trim();
+      e.target.value = newValue;
+    }
+
+    forceChange(newValue);
     if (typeof onBlur === 'function') onBlur(e);
   };
 
+  _proto.getTrim = function getTrim() {
+    var trim = this.props.trim;
+    if (trim !== undefined) return trim;
+    if (_config.default.trim !== undefined) return _config.default.trim;
+    return false;
+  };
+
   _proto.getErrorProps = function getErrorProps() {
     var p = {};
     if ('error' in this.props) p.error = this.props.error;
@@ -130,13 +149,13 @@ function (_React$PureComponent) {
 
   _proto.renderTextarea = function renderTextarea() {
     var showTextarea = this.state.showTextarea;
-    var _this$props = this.props,
-        placeholder = _this$props.placeholder,
-        maxHeight = _this$props.maxHeight,
-        value = _this$props.value,
-        innerTitle = _this$props.innerTitle,
-        placeTitle = _this$props.placeTitle,
-        renderFooter = _this$props.renderFooter;
+    var _this$props2 = this.props,
+        placeholder = _this$props2.placeholder,
+        maxHeight = _this$props2.maxHeight,
+        value = _this$props2.value,
+        innerTitle = _this$props2.innerTitle,
+        placeTitle = _this$props2.placeTitle,
+        renderFooter = _this$props2.renderFooter;
     if (!showTextarea) return null;
     return _react.default.createElement("div", {
       ref: this.bindContainer
@@ -158,14 +177,14 @@ function (_React$PureComponent) {
   };
 
   _proto.renderResult = function renderResult() {
-    var _this$props2 = this.props,
-        placeholder = _this$props2.placeholder,
-        disabled = _this$props2.disabled,
-        value = _this$props2.value,
-        renderResult = _this$props2.renderResult,
-        placeTitle = _this$props2.placeTitle,
-        innerTitle = _this$props2.innerTitle,
-        error = _this$props2.error;
+    var _this$props3 = this.props,
+        placeholder = _this$props3.placeholder,
+        disabled = _this$props3.disabled,
+        value = _this$props3.value,
+        renderResult = _this$props3.renderResult,
+        placeTitle = _this$props3.placeTitle,
+        innerTitle = _this$props3.innerTitle,
+        error = _this$props3.error;
     var result = renderResult(value);
     return _react.default.createElement("div", {
       tabIndex: disabled ? undefined : 0,
@@ -184,12 +203,12 @@ function (_React$PureComponent) {
   };
 
   _proto.renderInput = function renderInput() {
-    var _this$props3 = this.props,
-        placeholder = _this$props3.placeholder,
-        disabled = _this$props3.disabled,
-        value = _this$props3.value,
-        innerTitle = _this$props3.innerTitle,
-        placeTitle = _this$props3.placeTitle;
+    var _this$props4 = this.props,
+        placeholder = _this$props4.placeholder,
+        disabled = _this$props4.disabled,
+        value = _this$props4.value,
+        innerTitle = _this$props4.innerTitle,
+        placeTitle = _this$props4.placeTitle;
     return _react.default.createElement(_Input.default, (0, _extends2.default)({
       innerTitle: innerTitle,
       placeTitle: placeTitle,
@@ -215,14 +234,14 @@ function (_React$PureComponent) {
 
   _proto.render = function render() {
     var showTextarea = this.state.showTextarea;
-    var _this$props4 = this.props,
-        width = _this$props4.width,
-        style = _this$props4.style,
-        className = _this$props4.className,
-        bordered = _this$props4.bordered,
-        clearable = _this$props4.clearable,
-        getPopupContainer = _this$props4.getPopupContainer,
-        value = _this$props4.value;
+    var _this$props5 = this.props,
+        width = _this$props5.width,
+        style = _this$props5.style,
+        className = _this$props5.className,
+        bordered = _this$props5.bordered,
+        clearable = _this$props5.clearable,
+        getPopupContainer = _this$props5.getPopupContainer,
+        value = _this$props5.value;
     var cls = (0, _classnames.default)(className, (0, _styles.editableAreaClass)('_', !bordered && 'none-bordered'));
     var ms = Object.assign({
       width: width
@@ -271,7 +290,9 @@ Editable.propTypes = {
   renderFooter: _propTypes.default.func,
   renderResult: _propTypes.default.func,
   onShowTextareaChange: _propTypes.default.func,
-  error: _propTypes.default.object
+  error: _propTypes.default.object,
+  trim: _propTypes.default.bool,
+  forceChange: _propTypes.default.func
 };
 var _default = Editable;
 exports.default = _default;

package/css/EditableArea/index.js

@@ -9,13 +9,11 @@ var _func = require("../utils/func");
 
 var _delay = _interopRequireDefault(require("../hoc/delay"));
 
-var _trim = _interopRequireDefault(require("../hoc/trim"));
-
 var _inputable = _interopRequireDefault(require("../Form/inputable"));
 
 var _EditableArea = _interopRequireDefault(require("./EditableArea"));
 
-var EditableArea = (0, _func.compose)(_inputable.default, (0, _delay.default)(400), _trim.default)(_EditableArea.default);
+var EditableArea = (0, _func.compose)(_inputable.default, (0, _delay.default)(400))(_EditableArea.default);
 EditableArea.displayName = 'ShineoutEditableArea';
 var _default = EditableArea;
 exports.default = _default;

package/css/Input/Input.js

@@ -23,6 +23,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _config = _interopRequireDefault(require("../config"));
+
 var _styles = require("../InputTitle/styles");
 
 var _cleanProps = _interopRequireDefault(require("../utils/cleanProps"));
@@ -58,6 +60,12 @@ function (_PureComponent) {
       if (value.length <= info) return text;
       return new Error(text);
     });
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "getTrim", function () {
+      var trim = _this.props.trim;
+      if (trim !== undefined) return trim;
+      if (_config.default.trim !== undefined) return _config.default.trim;
+      return false;
+    });
     _this.enterLock = false;
     _this.handleChange = _this.handleChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleKeyDown = _this.handleKeyDown.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
@@ -204,13 +212,19 @@ function (_PureComponent) {
     var value = e.target.value;
     var _this$props6 = this.props,
         forceChange = _this$props6.forceChange,
+        onChange = _this$props6.onChange,
         onBlur = _this$props6.onBlur,
-        clearToUndefined = _this$props6.clearToUndefined,
-        cancelChange = _this$props6.cancelChange;
-    if (cancelChange) cancelChange();
+        clearToUndefined = _this$props6.clearToUndefined;
     var newVal = this.fixValue(value);
-    var isChange = !(clearToUndefined && newVal === '' && this.props.value === undefined);
-    if (isChange && forceChange && !this.invalidNumber(newVal)) forceChange(newVal);
+    var shouldKeepUndefined = clearToUndefined && newVal === '' && this.props.value === undefined;
+
+    if (!shouldKeepUndefined && !this.invalidNumber(newVal)) {
+      if (this.getTrim()) newVal = newVal.trim();
+      var change = forceChange || onChange;
+      change(newVal);
+      e.target.value = newVal;
+    }
+
     if (onBlur) onBlur(e);
   };
 
@@ -308,7 +322,6 @@ Input.propTypes = {
   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]),
@@ -322,7 +335,8 @@ Input.propTypes = {
   inputFocus: _propTypes.default.bool,
   clearToUndefined: _propTypes.default.bool,
   placeholder: _propTypes.default.string,
-  coin: _propTypes.default.bool
+  coin: _propTypes.default.bool,
+  trim: _propTypes.default.bool
 };
 Input.defaultProps = {
   type: 'text'

package/css/Input/index.js

@@ -13,8 +13,6 @@ var _inputBorder = _interopRequireDefault(require("../hoc/inputBorder"));
 
 var _delay = _interopRequireDefault(require("../hoc/delay"));
 
-var _trim = _interopRequireDefault(require("../hoc/trim"));
-
 var _coin = _interopRequireDefault(require("../hoc/coin"));
 
 var _Input = _interopRequireDefault(require("./Input"));
@@ -25,7 +23,7 @@ var _Group = _interopRequireDefault(require("./Group"));
 
 var _Password = _interopRequireDefault(require("./Password"));
 
-var _exports = (0, _func.compose)(_inputable.default, (0, _inputBorder.default)({}), (0, _delay.default)(400), _trim.default, (0, _coin.default)('input'))(_Input.default);
+var _exports = (0, _func.compose)(_inputable.default, (0, _inputBorder.default)({}), (0, _delay.default)(400), (0, _coin.default)('input'))(_Input.default);
 
 _exports.Group = (0, _inputBorder.default)({
   tag: 'div',

package/css/Textarea/Textarea.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -21,7 +23,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _config = require("../config");
+var _config = _interopRequireWildcard(require("../config"));
 
 var _component = require("../component");
 
@@ -73,6 +75,13 @@ function (_PureComponent) {
     if (this.props.autosize && prevProps.value !== this.props.value) this.resize(this.props.value);
   };
 
+  _proto.getTrim = function getTrim() {
+    var trim = this.props.trim;
+    if (trim !== undefined) return trim;
+    if (_config.default.trim !== undefined) return _config.default.trim;
+    return false;
+  };
+
   _proto.bindShadow = function bindShadow(el) {
     this.shadow = el;
   };
@@ -102,12 +111,18 @@ function (_PureComponent) {
   };
 
   _proto.handleBlur = function handleBlur(e) {
-    var value = e.target.value;
+    var newValue = e.target.value;
     var _this$props = this.props,
         forceChange = _this$props.forceChange,
         onBlur = _this$props.onBlur;
+
+    if (this.getTrim()) {
+      newValue = newValue.trim();
+      e.target.value = newValue;
+    }
+
+    forceChange(newValue);
     if (onBlur) onBlur(e);
-    forceChange(value);
   };
 
   _proto.renderFooter = function renderFooter() {
@@ -207,7 +222,8 @@ Textarea.propTypes = {
   renderFooter: _propTypes.default.func,
   innerTitle: _propTypes.default.node,
   inputFocus: _propTypes.default.bool,
-  placeTitle: _propTypes.default.node
+  placeTitle: _propTypes.default.node,
+  trim: _propTypes.default.bool
 };
 Textarea.defaultProps = {
   rows: 4,

package/css/Textarea/index.js

@@ -9,8 +9,6 @@ var _func = require("../utils/func");
 
 var _delay = _interopRequireDefault(require("../hoc/delay"));
 
-var _trim = _interopRequireDefault(require("../hoc/trim"));
-
 var _inputable = _interopRequireDefault(require("../Form/inputable"));
 
 var _inputBorder = _interopRequireDefault(require("../hoc/inputBorder"));
@@ -31,7 +29,7 @@ var input = (0, _func.compose)(_inputable.default, (0, _inputBorder.default)({
 
     return footer && (0, _styles.inputClass)('with-footer');
   }
-}), (0, _delay.default)(400), _trim.default);
+}), (0, _delay.default)(400));
 var Textarea = input(_Textarea.default);
 Textarea.displayName = 'ShineoutTextarea';
 var _default = Textarea;

package/css/hoc/delay.js

@@ -99,6 +99,7 @@ var _default = (0, _func.curry)(function (defaultDelay, Origin) {
     _proto.forceChange = function forceChange(value) {
       var _this$props2;
 
+      this.cancelChange();
       this.setState({
         value: value
       });

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.11.7'
+  version: '1.11.8'
 }
 
 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.11.7'
+  version: '1.11.8'
 };
 exports.default = _default;

package/css/utils/vars-inject.js

@@ -4202,6 +4202,9 @@ var injects = {
     }, {
       name: 'spinDefaultName',
       className: (0, _expose.exposeClass)('common-spin-default'),
+      parser: function parser(d) {
+        return d === 'none' ? 'default' : d;
+      },
       attr: 'animationName',
       type: ['default', 'chasing-dots', 'cube-grid', 'double-bounce', 'fading-circle', 'four-dots', 'plane', 'pulse', 'ring', 'scale-circle', 'three-bounce', 'wave'],
       desc: '默认加载中样式'