shineout 3.9.5-beta.6 → 3.9.5-beta.7

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.5-beta.6'
+  version: '3.9.5-beta.7'
 };

package/dist/shineout.js

@@ -12401,7 +12401,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.5-beta.6');
+/* harmony default export */ var version = ('3.9.5-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -37436,34 +37436,13 @@ var Input = function Input(props) {
     addEnd = props.addEnd,
     hasSuffix = props.hasSuffix,
     rest = objectWithoutProperties_default()(props, simple_input_excluded);
-  var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
-      needTriggerEnter: false
-    }),
-    context = _useRef.current;
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var config = useConfig();
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
   var showClearFromProp = props.showClear && !props.disabled;
   var _useInput = use_input(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
-      onFocusedChange: onFocusedChange,
-      // 由于form的原生submit事件是在keydown中触发的，submit校验后触发scrollToError会导致当前焦点的input立即失焦，导致input的回车事件无法触发
-      // 所以这里在onKeyDown时机记录下needTriggerEnter标志，在onBlur时机判断是否需要触发onEnterPress
-      onKeyDown: function onKeyDown(e) {
-        var _props$onKeyDown;
-        if (e.key === 'Enter') {
-          context.needTriggerEnter = true;
-        }
-        (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
-      },
-      onBlur: function onBlur(e) {
-        var _props$onBlur;
-        if (context.needTriggerEnter) {
-          context.needTriggerEnter = false;
-          _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
-        }
-        (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
-      }
+      onFocusedChange: onFocusedChange
     })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
@@ -37478,10 +37457,6 @@ var Input = function Input(props) {
   });
   var onKeyUp = usePersistFn(function (e) {
     var _props$onKeyUp;
-    if (e.key === 'Enter') {
-      context.needTriggerEnter = false;
-    }
-    ;
     (_props$onKeyUp = props.onKeyUp) === null || _props$onKeyUp === void 0 || _props$onKeyUp.call(props, e);
     keyHandler(e);
   });
@@ -38284,10 +38259,21 @@ var input_Input = function Input(props) {
     showClear: props.showClear,
     onKeyDown: function onKeyDown(e) {
       var _props$onKeyDown;
+      // 在 Enter 键按下时,如果开启了 trim,先执行 trim 逻辑
+      if (e.key === 'Enter' && inputFormatParams.trim) {
+        var target = e.target;
+        var value = target.value;
+        var trimmedValue = value.trim();
+        if (value !== trimmedValue) {
+          var _commonProps$onChange;
+          target.value = trimmedValue;
+          (_commonProps$onChange = commonProps.onChange) === null || _commonProps$onChange === void 0 || _commonProps$onChange.call(commonProps, trimmedValue);
+        }
+      }
       if (e.key === 'Enter' && !e.defaultPrevented) {
         var _props$onChange;
-        var value = e.target.value;
-        (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, value);
+        var _value = e.target.value;
+        (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, _value);
       }
       (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
     }
@@ -53035,8 +53021,6 @@ var useForm = function useForm(props) {
       return;
     }
     context.submitLock = true;
-    var activeEl = document.activeElement;
-    if (activeEl) activeEl.blur();
     setTimeout(function () {
       // 防止连续点击
       context.submitLock = false;
@@ -53064,7 +53048,6 @@ var useForm = function useForm(props) {
             result = _context.sent;
             if (result === true) {
               (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
-              if (activeEl) activeEl.focus();
             } else {
               handleSubmitError(result);
             }
@@ -74786,7 +74769,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.5-beta.6'
+  version: '3.9.5-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;