shineout 3.7.3-beta.3 → 3.7.3-beta.5

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.7.3-beta.3'
+  version: '3.7.3-beta.5'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.7.3-beta.3');
+/* harmony default export */ var version = ('3.7.3-beta.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -35810,12 +35810,33 @@ 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 _useInput = use_input(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
-      onFocusedChange: onFocusedChange
+      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);
+      }
     })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
@@ -35831,6 +35852,10 @@ 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);
   });
@@ -45428,14 +45453,16 @@ var useDate = function useDate(props) {
       cachedDays: []
     }),
     context = _useRef.current;
-  var current = props.current === undefined ? currentState : props.current;
+  var current = props.current === undefined || !props.current ? currentState : props.current;
   var setCurrent = function setCurrent(date) {
     var _props$onCurrentChang2;
     if (props.current !== undefined) {
       var _props$onCurrentChang;
       (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date);
     } else {
-      setCurrentState(date);
+      if (date) {
+        setCurrentState(date);
+      }
     }
     (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date);
   };
@@ -45510,9 +45537,15 @@ var useDate = function useDate(props) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = getDateWithTime(date);
-    props === null || props === void 0 || props.onClearInputArr(position === 'start' ? 0 : 1);
+    var index = position === 'start' ? 0 : 1;
+    if (props.allowSingle && props.rangeDate && Array.isArray(props.rangeDate) && props.rangeDate[index] && util.clearHMS(newDate, options).getTime() === util.clearHMS(props.rangeDate[index], options).getTime()) {
+      newDate = '';
+    }
+    props === null || props === void 0 || props.onClearInputArr(index);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
-    setCurrent(newDate);
+    if (newDate) {
+      setCurrent(newDate);
+    }
   };
   var getTimeStr = function getTimeStr() {
     var format = props.format,
@@ -46043,7 +46076,8 @@ var Time = function Time(props) {
 
 var Day = function Day(props) {
   var _jssStyle$datePicker;
-  var jssStyle = props.jssStyle;
+  var jssStyle = props.jssStyle,
+    allowSingle = props.allowSingle;
   var _useConfig = useConfig(),
     locale = _useConfig.locale,
     direction = _useConfig.direction;
@@ -46062,6 +46096,7 @@ var Day = function Day(props) {
       value: props.value,
       range: props.range,
       onChange: onChange,
+      allowSingle: allowSingle,
       onClearInputArr: props.onClearInputArr,
       position: props.position,
       min: props.min,
@@ -47088,7 +47123,7 @@ var useRangePick = function useRangePick(props) {
     setDateArr(function (arr) {
       var newArr = toConsumableArray_default()(arr);
       newArr[index] = date;
-      if (range && index === 0 && newArr[1]) {
+      if (date && range && index === 0 && newArr[1]) {
         if (typeof range === 'number') {
           var rangeMax = util.addSeconds(date, range, options);
           if (rangeMax.getTime() < newArr[1].getTime()) {
@@ -47117,7 +47152,7 @@ var useRangePick = function useRangePick(props) {
       var newArr = toConsumableArray_default()(arr);
       newArr[index] = date;
       var modeCache = context.modeCache;
-      if (modeCache[0] === modeCache[1]) {
+      if (date && modeCache[0] === modeCache[1]) {
         var mode = modeCache[0];
         if (range && index === 0 && newArr[1]) {
           if (mode === 'year') {
@@ -47362,6 +47397,7 @@ var Picker = function Picker(props) {
       format: props.format,
       disabled: position === 'end' ? func.endDisabled : func.startDisabled,
       rangeDate: dateArr,
+      allowSingle: props.allowSingle,
       min: position === 'end' ? endMin : startMin,
       staticMin: position === 'end' ? endMin : staticStartMin,
       max: position === 'end' ? endMax : startMax,
@@ -47770,6 +47806,7 @@ var DatePicker = function DatePicker(props0) {
           type: type,
           options: options,
           disabled: disabled,
+          allowSingle: props.allowSingle,
           jssStyle: jssStyle,
           closePop: handleClose,
           defaultTime: props.defaultTime,
@@ -50651,14 +50688,14 @@ var useForm = function useForm(props) {
             });
           case 6:
             result = _context.sent;
-            if (activeEl) activeEl.focus();
             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);
             }
             callback === null || callback === void 0 || callback();
-          case 10:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -71565,7 +71602,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.3-beta.3'
+  version: '3.7.3-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;