shineout 3.5.7-beta.1 → 3.5.7-beta.3

package/cjs/index.js

@@ -507,5 +507,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.7-beta.1'
+  version: '3.5.7-beta.3'
 };

package/dist/shineout.js

@@ -12040,7 +12040,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.7-beta.1');
+/* harmony default export */ var version = ('3.5.7-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -32583,7 +32583,9 @@ var FormFooterProvider = function FormFooterProvider(props) {
     if (!context.hasSubmit) {
       context.submit = info.submit;
       context.hasSubmit = true;
+      return true;
     }
+    return false;
   });
   var deleteFormInfo = usePersistFn(function () {
     context.hasSubmit = false;
@@ -47817,6 +47819,7 @@ var useForm = function useForm(props) {
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef({
       defaultValues: {},
       validateMap: {},
+      ignoreValidateFields: [],
       updateMap: {},
       flowMap: {},
       removeArr: new Set(),
@@ -47922,9 +47925,22 @@ var useForm = function useForm(props) {
     return new Promise(function (resolve, reject) {
       var finalFields = Object.keys(context.validateMap);
       if (fields) {
-        // 假设进去的是['user']，那么最终的finalFields是['user', 'user.name', 'user.age']
-        // 假设进去的是['users']，那么最终的finalFields是['users', 'users[0].name', 'users[0].age', 'users[1].name', 'users[1].age']
-        finalFields = getCompleteFieldKeys(fields, finalFields);
+        if (config.ignoreChildren) {
+          // 旧行为：仅校验当前字段
+          finalFields = (isArray(fields) ? fields : [fields]).filter(function (key) {
+            return context.validateMap[key];
+          });
+        } else {
+          // 新行为：校验当前字段及其所有子字段
+          // 假设进去的是['user']，那么最终的finalFields是['user', 'user.name', 'user.age']
+          // 假设进去的是['users']，那么最终的finalFields是['users', 'users[0].name', 'users[0].age', 'users[1].name', 'users[1].age']
+          finalFields = getCompleteFieldKeys(fields, finalFields);
+        }
+      }
+      if (context.ignoreValidateFields.length > 0) {
+        finalFields = finalFields.filter(function (key) {
+          return !context.ignoreValidateFields.includes(key);
+        });
       }
       var validates = finalFields.map(function (key) {
         var validateField = context.validateMap[key];
@@ -48160,7 +48176,7 @@ var useForm = function useForm(props) {
       }, 10);
     };
   };
-  var validateFieldset = function validateFieldset(name) {
+  var validateFieldset = function validateFieldset(name, config) {
     var na = "".concat(name, "[");
     var no = "".concat(name, ".");
     var fields = [];
@@ -48169,6 +48185,15 @@ var useForm = function useForm(props) {
         fields.push(key);
       }
     });
+
+    // 用户声明了跳过校验子字段
+    if (config !== null && config !== void 0 && config.ignoreChildren) {
+      var parentName = name.split('[')[0];
+      context.ignoreValidateFields = getCompleteFieldKeys(parentName, Array.from(context.names));
+      setTimeout(function () {
+        context.ignoreValidateFields = [];
+      });
+    }
     validateFields(fields).catch(function () {});
   };
   var getDefaultValue = function getDefaultValue() {
@@ -48456,6 +48481,10 @@ var Form = function Form(props) {
       props.setForm(formRefObj);
     }
   }, [formRefObj]);
+  var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
+      bindindModalFormContextSuccess: false
+    }),
+    context = _React$useRef.current;
   var handleFormModalInfo = function handleFormModalInfo() {
     var status = undefined;
     if (props.disabled) {
@@ -48468,13 +48497,16 @@ var Form = function Form(props) {
       modalFormContext === null || modalFormContext === void 0 || modalFormContext.setFormStats(status);
     }
     if (props.onSubmit) {
-      modalFormContext === null || modalFormContext === void 0 || modalFormContext.setFormInfo(formRefObj);
+      var ok = modalFormContext === null || modalFormContext === void 0 ? void 0 : modalFormContext.setFormInfo(formRefObj);
+      context.bindindModalFormContextSuccess = !!ok;
     }
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     handleFormModalInfo();
     return function () {
-      modalFormContext === null || modalFormContext === void 0 || modalFormContext.deleteFormInfo();
+      if (context.bindindModalFormContextSuccess) {
+        modalFormContext === null || modalFormContext === void 0 || modalFormContext.deleteFormInfo();
+      }
     };
   }, [props.disabled, props.pending]);
   var rootClass = classnames_default()([formClasses === null || formClasses === void 0 ? void 0 : formClasses.rootClass, formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapper, className, props.inline && (formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapperInline)]);
@@ -48881,7 +48913,9 @@ var FormFieldSet = function FormFieldSet(props) {
 
   var formFunc = useFormFunc();
   var validateFieldSet = function validateFieldSet() {
-    formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name).catch(function (e) {
+    formFunc === null || formFunc === void 0 || formFunc.validateFields(props.name, {
+      ignoreChildren: true
+    }).catch(function (e) {
       return e;
     });
   };
@@ -48945,9 +48979,9 @@ var FormFieldSet = function FormFieldSet(props) {
             draft[i] = val;
           });
           _onChange(newValue);
-          if (options === undefined || options !== null && options !== void 0 && options.validate) {
-            formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
-          }
+          formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"), {
+            ignoreChildren: (options === null || options === void 0 ? void 0 : options.validate) === false
+          });
         },
         onInsert: function onInsert(val) {
           var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
@@ -67365,7 +67399,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.7-beta.1'
+  version: '3.5.7-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;