shineout 3.7.3-beta.1 → 3.7.3-beta.3

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

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.1');
+/* harmony default export */ var version = ('3.7.3-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -40609,7 +40609,7 @@ var Result = function Result(props) {
             var _props$onBlur, _inputRef$current$upd, _inputRef$current;
             e.stopPropagation();
             if (e.relatedTarget === context.inputRefs[1 - info.index]) return;
-            (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+            (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e, info.index);
             if (inputRef.current) (_inputRef$current$upd = (_inputRef$current = inputRef.current).updateValue) === null || _inputRef$current$upd === void 0 || _inputRef$current$upd.call(_inputRef$current);
             context.clickIndex = 0;
           },
@@ -44742,8 +44742,18 @@ function isValid(date) {
   if (!(date instanceof Date)) return false;
   return dayjs_min_default()(date).isValid();
 }
-function isValidString(date, fmt) {
+
+/**
+ * @param date 日期字符串
+ * @param fmt 日期格式
+ * @param isLoose 是否为宽松模式
+ * @returns 是否为有效日期
+ */
+function isValidString(date, fmt, isLoose) {
   if (!date) return false;
+  if (isLoose) {
+    return dayjs_min_default()(date).isValid();
+  }
   return dayjs_min_default()(date, fmt, true).isValid();
 }
 function util_parse(d, fmt, options) {
@@ -45305,9 +45315,9 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }
     (_props$onClear = props.onClear) === null || _props$onClear === void 0 || _props$onClear.call(props);
   });
-  var handleInputChange = usePersistFn(function (str, index) {
+  var handleInputChange = usePersistFn(function (str, index, isFromBlur) {
     // 比较 日期字符串是否符合format格式, 如果符合返回 true 否则返回 false
-    var isValid = util.isValidString(str, format);
+    var isValid = util.isValidString(str, format, isFromBlur);
     if (!isValid) return;
     var date = util.toDateWithFormat(str, format, undefined, options);
     setInputArr(function (prev) {
@@ -45331,6 +45341,11 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       return arr;
     });
   });
+
+  // 失焦时，需要宽松模式校验，eg: 2025-06-16 18:00 和 2025-06-16 18 都可以校验通过
+  var handleInputBlur = usePersistFn(function (str, index) {
+    handleInputChange(str, index, true);
+  });
   var handleClearInputArr = usePersistFn(function (index) {
     if (index !== undefined) {
       setInputArr(function (prev) {
@@ -45374,6 +45389,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     handleClear: handleClear,
     handleClearInputArr: handleClearInputArr,
     handleInputChange: handleInputChange,
+    handleInputBlur: handleInputBlur,
     registerModeDisabled: registerModeDisabled,
     setCurrentArrWithParams: setCurrentArrWithParams,
     isDisabledDate: isDisabledDate
@@ -47628,11 +47644,14 @@ var DatePicker = function DatePicker(props0) {
     setFocused(true);
     (_props$onFocus = props.onFocus) === null || _props$onFocus === void 0 || _props$onFocus.call(props, e);
   });
-  var handleBlur = usePersistFn(function (e) {
+  var handleBlur = usePersistFn(function (e, index) {
     var _props$onBlur;
     setFocused(false);
-    (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+    (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e, index);
     if (props.needConfirm) return;
+    if (props.inputable && index !== undefined) {
+      func.handleInputBlur(e.target.value, index);
+    }
 
     // 当输入框有值时，失焦时需要立即触发 onChange，否则触控板的轻触模拟出来的click事件就获取不到最新的值
     if (inputArr.some(function (d) {
@@ -50246,6 +50265,7 @@ function use_previous_usePrevious(value) {
 
 
 var globalKey = '__global__&&@@';
+var SUBMIT_TIMEOUT = 10;
 
 
 var emptyObj = {};
@@ -50451,7 +50471,7 @@ var useForm = function useForm(props) {
           docScroll.top -= scrollToError;
         }
       }
-    });
+    }, SUBMIT_TIMEOUT + 10);
   };
   var onChange = use_persist_fn(function (change) {
     var _props$onChange;
@@ -50631,14 +50651,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 9:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -50652,7 +50672,7 @@ var useForm = function useForm(props) {
         var _other$onSubmit;
         submit();
         other === null || other === void 0 || (_other$onSubmit = other.onSubmit) === null || _other$onSubmit === void 0 || _other$onSubmit.call(other, e);
-      }, 10);
+      }, SUBMIT_TIMEOUT);
     };
   };
   var validateFieldset = function validateFieldset(name, config) {
@@ -71545,7 +71565,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.3-beta.1'
+  version: '3.7.3-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;