shineout 3.5.3-beta.5 → 3.5.3-beta.7

package/cjs/index.js

@@ -500,5 +500,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.5.3-beta.5'
+  version: '3.5.3-beta.7'
 };

package/dist/shineout.js

@@ -12030,7 +12030,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.5.3-beta.5');
+/* harmony default export */ var version = ('3.5.3-beta.7');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -40297,9 +40297,6 @@ function useFormControl(props) {
         }
       });
       setValueState(nextValue);
-      formFunc === null || formFunc === void 0 || formFunc.setValue(defineProperty_default()({}, name, nextValue), {
-        validate: false
-      });
     } else {
       var _value2 = getValue(name, formValue);
       var _error2 = getError(name, errors, severErrors);
@@ -40309,9 +40306,6 @@ function useFormControl(props) {
       if (!shallowEqual(_value2, latestInfo.valueState)) {
         if (_value2 === undefined && defaultValue !== undefined) {
           setValueState(defaultValue);
-          formFunc === null || formFunc === void 0 || formFunc.setValue(defineProperty_default()({}, name, defaultValue), {
-            validate: false
-          });
         } else {
           setValueState(_value2);
         }
@@ -43455,6 +43449,7 @@ var Day = function Day(props) {
   var weekDays = Array.from({
     length: 7
   }).map(function (_, index) {
+    // weekStartsOn可能是字符串，需要转换为数字，否则得到星期顺序不正确
     var num = (props.options.weekStartsOn + index) % 7;
     return weeks[num];
   });
@@ -43610,6 +43605,9 @@ var Day = function Day(props) {
             length: len
           }).map(function (_, index) {
             var start = index * 7;
+            // console.log('======================')
+            // console.log('days, start, days[start + 3]: >>', days, start, days[start + 3])
+            // console.log('======================')
             return /*#__PURE__*/(0,jsx_runtime.jsxs)("tr", {
               className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerRow, props.type === 'week' && (styles === null || styles === void 0 ? void 0 : styles.pickerRowWeek)),
               children: [renderWeek(days[start + 3]), days.slice(start, start + 7).map(function (item, index) {
@@ -47698,15 +47696,14 @@ var useForm = function useForm(props) {
     onChange(function (draft) {
       var values = Object.keys(vals);
       // 针对 name 为数组模式，如 datepicker 的 name={['startTime', 'endTime']} 时，前者校验可能需要依赖后者，因此需要提前将后者数据整合至 draft 用于多字段整合校验
-      var nextDraft = current(draft);
       values.forEach(function (key) {
-        deepSet(nextDraft, key, vals[key], deepSetOptions);
+        deepSet(draft, key, vals[key], deepSetOptions);
       });
       values.forEach(function (key) {
         if (option.validate) {
           var _context$validateMap$;
           (_context$validateMap$ = context.validateMap[key]) === null || _context$validateMap$ === void 0 || _context$validateMap$.forEach(function (validate) {
-            validate(key, vals[key], nextDraft);
+            validate(key, vals[key], current(draft));
           });
         }
       });
@@ -47719,6 +47716,17 @@ var useForm = function useForm(props) {
     });
     update(fullKeyPaths);
   });
+  var updateDefaultValue = function updateDefaultValue() {
+    if (!context.mounted) return;
+    Object.keys(context.defaultValues).forEach(function (df) {
+      var latestDefaultValue = getValue(df);
+      if (latestDefaultValue === undefined) {
+        setValue(defineProperty_default()({}, df, context.defaultValues[df]), {
+          validate: false
+        });
+      }
+    });
+  };
   var getErrors = use_persist_fn(function () {
     return context.errors;
   });
@@ -47990,6 +47998,7 @@ var useForm = function useForm(props) {
       validateFields(keys).catch(function () {});
     }
     update();
+    updateDefaultValue();
     context.resetTime = 0;
   }, [props.value]);
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
@@ -66959,7 +66968,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.3-beta.5'
+  version: '3.5.3-beta.7'
 });
 }();
 /******/ 	return __webpack_exports__;