shineout 3.6.5-beta.8 → 3.6.5-beta.9

package/cjs/index.js

@@ -514,5 +514,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.6.5-beta.8'
+  version: '3.6.5-beta.9'
 };

package/dist/shineout.js

@@ -12217,7 +12217,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.6.5-beta.8');
+/* harmony default export */ var version = ('3.6.5-beta.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -49447,8 +49447,7 @@ var useForm = function useForm(props) {
     size = props.size,
     colon = props.colon,
     formName = props.name,
-    scrollParent = props.scrollParent,
-    isControl = props.isControl;
+    scrollParent = props.scrollParent;
   var deepSetOptions = {
     removeUndefined: removeUndefined,
     forceSet: true
@@ -49704,13 +49703,16 @@ var useForm = function useForm(props) {
       var values = Object.keys(vals);
       // 针对 name 为数组模式，如 datepicker 的 name={['startTime', 'endTime']} 时，前者校验可能需要依赖后者，因此需要提前将后者数据整合至 draft 用于多字段整合校验
       values.forEach(function (key) {
-        deepSet(draft, key, vals[key], deepSetOptions);
+        // upload组件返回的可能是函数: (prev) => [...prev, file]
+        var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
+        deepSet(draft, key, valueOfKey, 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], current(draft));
+            var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
+            validate(key, valueOfKey, current(draft));
           });
         }
       });
@@ -70056,7 +70058,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.5-beta.8'
+  version: '3.6.5-beta.9'
 });
 }();
 /******/ 	return __webpack_exports__;