shineout 3.5.1-beta.1 → 3.5.1-beta.2

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

package/dist/shineout.js

@@ -12002,7 +12002,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.1-beta.1');
+/* harmony default export */ var version = ('3.5.1-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -39604,7 +39604,8 @@ var FormItemContext = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_
 
 
 var FieldsetContext = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createContext)({
-  path: ''
+  path: '',
+  validateFieldSet: function validateFieldSet() {}
 });
 function extendName() {
   var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -39620,7 +39621,8 @@ function extendName() {
 }
 var useFieldSetConsumer = function useFieldSetConsumer(props) {
   var _React$useContext = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useContext(FieldsetContext),
-    path = _React$useContext.path;
+    path = _React$useContext.path,
+    validateFieldSet = _React$useContext.validateFieldSet;
   var bind = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useMemo(function () {
     return path ? (props.bind || []).concat(path) : props.bind;
   }, [path, props.bind]);
@@ -39629,7 +39631,8 @@ var useFieldSetConsumer = function useFieldSetConsumer(props) {
   }, [path, props.name]);
   return objectSpread2_default()(objectSpread2_default()({}, props), {}, {
     name: name,
-    bind: bind
+    bind: bind,
+    validateFieldSet: validateFieldSet
   });
 };
 /* harmony default export */ var fieldset_context = (FieldsetContext);
@@ -40019,7 +40022,8 @@ function useFormControl(props) {
       bind: props.bind
     }),
     name = _useFieldSetConsumer.name,
-    bind = _useFieldSetConsumer.bind;
+    bind = _useFieldSetConsumer.bind,
+    validateFieldSet = _useFieldSetConsumer.validateFieldSet;
   var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(undefined),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     errorState = _React$useState2[0],
@@ -40116,7 +40120,19 @@ function useFormControl(props) {
         bindValidate();
         return res;
       }).catch(function (e) {
-        formFunc === null || formFunc === void 0 || formFunc.setError(name, e);
+        if (isArray(e)) {
+          e.forEach(function (error, index) {
+            if (error) {
+              var _Object$keys, _Object$values;
+              var fieldSetName = (_Object$keys = Object.keys(error)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
+              var fieldSetError = (_Object$values = Object.values(error)) === null || _Object$values === void 0 ? void 0 : _Object$values[0];
+              var na = "".concat(name, "[").concat(index, "].").concat(fieldSetName);
+              if (fieldSetName && fieldSetError) {
+                formFunc === null || formFunc === void 0 || formFunc.setError(na, fieldSetError);
+              }
+            }
+          });
+        }
         onError === null || onError === void 0 || onError(e);
         bindValidate();
         return e;
@@ -40157,6 +40173,7 @@ function useFormControl(props) {
       other[_key - 1] = arguments[_key];
     }
     if (onChangePo) onChangePo.apply(void 0, [v].concat(other));
+    if (validateFieldSet) validateFieldSet();
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (inForm && controlFunc) {
@@ -46990,7 +47007,8 @@ EmptyComp.displayName = 'ShineoutEmpty';
 
 
 var topPath = {
-  path: ''
+  path: '',
+  validateFieldSet: function validateFieldSet() {}
 };
 var Provider = function Provider(props) {
   var children = props.children,
@@ -48033,7 +48051,8 @@ var useFormFieldSet = function useFormFieldSet(props) {
     console.error('[FieldSet] should render in Form');
   }
   var ProviderValue = {
-    path: name
+    path: name,
+    validateFieldSet: function validateFieldSet() {}
   };
   return {
     Provider: fieldset_context.Provider,
@@ -48050,6 +48069,7 @@ var useFormFieldSet = function useFormFieldSet(props) {
 
 
 
+
 var form_fieldset_produce = utils_immer_produce;
 var FormFieldSet = function FormFieldSet(props) {
   var children = props.children,
@@ -48059,6 +48079,11 @@ var FormFieldSet = function FormFieldSet(props) {
     }),
     context = _React$useRef.current;
   var formFunc = useFormFunc();
+  var validateFieldSet = function validateFieldSet() {
+    formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name).catch(function (e) {
+      return e;
+    });
+  };
   var getValidateProps = usePersistFn(function () {
     return props;
   });
@@ -48077,7 +48102,9 @@ var FormFieldSet = function FormFieldSet(props) {
     name = _useFormFieldSet.name;
   if (typeof children !== 'function') {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
-      value: ProviderValue,
+      value: objectSpread2_default()(objectSpread2_default()({}, ProviderValue), {}, {
+        validateFieldSet: validateFieldSet
+      }),
       children: children
     });
   }
@@ -48106,7 +48133,8 @@ var FormFieldSet = function FormFieldSet(props) {
   valueArr.forEach(function (v, i) {
     result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: {
-        path: "".concat(ProviderValue.path, "[").concat(i, "]")
+        path: "".concat(ProviderValue.path, "[").concat(i, "]"),
+        validateFieldSet: validateFieldSet
       },
       children: children({
         list: valueArr,
@@ -66318,7 +66346,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.1-beta.1'
+  version: '3.5.1-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;