shineout 3.9.1-beta.7 → 3.9.2-beta.1

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

package/dist/shineout.js

@@ -12400,7 +12400,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.9.1-beta.7');
+/* harmony default export */ var version = ('3.9.2-beta.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -36740,6 +36740,26 @@ var getCompleteFieldKeys = function getCompleteFieldKeys(fields, allFields) {
   return Array.from(new Set(completeFields));
 };
 
+/**
+ * 获取字段的所有父级key数组
+ * @param field 字段key
+ * @description 获取字段的所有父级key数组，并去掉数组下标部分, 结果按从近及远排序
+ * @example a.b[0].c => ['a.b', 'a']
+ */
+var getParentKeys = function getParentKeys(field) {
+  if (!field) return [];
+  var parts = field.split('.');
+  var parentKeys = [];
+  for (var i = parts.length - 1; i > 0; i--) {
+    var parentKey = parts.slice(0, i).join('.');
+    var cleanedKey = parentKey.replace(/\[\d+\]/g, '');
+    if (cleanedKey && !parentKeys.includes(cleanedKey)) {
+      parentKeys.push(cleanedKey);
+    }
+  }
+  return parentKeys;
+};
+
 /**
  * 将对象中的所有值设置为空, 如果值是数组，重置为空数组，如果是对象，重置为空对象，如果是基础类型，重置为undefined
  * @param obj 对象
@@ -44578,13 +44598,14 @@ function useFormControl(props) {
         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);
-              }
+              var keys = Object.keys(error);
+              keys.forEach(function (fieldName) {
+                var fieldError = error === null || error === void 0 ? void 0 : error[fieldName];
+                var na = "".concat(name, "[").concat(index, "].").concat(fieldName);
+                if (fieldName && fieldError) {
+                  formFunc === null || formFunc === void 0 || formFunc.setError(na, fieldError);
+                }
+              });
             }
           });
         } else {
@@ -52507,6 +52528,7 @@ var useForm = function useForm(props) {
       ignoreValidateFields: [],
       updateMap: {},
       flowMap: {},
+      rulesMap: {},
       removeArr: new Set(),
       names: new Set(),
       submitLock: false,
@@ -52606,18 +52628,30 @@ var useForm = function useForm(props) {
   var update = function update(name) {
     var _context$flowMap$glob;
     if (!name) {
+      var needValidateParentKeys = new Set();
       Object.keys(context.updateMap).forEach(function (key) {
         var _context$updateMap$ke;
-        (_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
-          update(context.value, context.errors, context.serverErrors);
+        (_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (updateFn) {
+          updateFn(context.value, context.errors, context.serverErrors);
           if (context.errors[key]) {
             validateFields(key).catch(function () {});
+            getParentKeys(key).forEach(function (parentKey) {
+              if (context.validateMap[parentKey] && context.rulesMap[parentKey]) {
+                needValidateParentKeys.add(parentKey);
+              }
+            });
           }
         });
       });
+      // fix issue's playground id: 0898fabb-a1b4-4453-a2aa-f5a92e7777c0
+      if (needValidateParentKeys.size > 0) {
+        needValidateParentKeys.forEach(function (parentKey) {
+          validateFields(parentKey).catch(function () {});
+        });
+      }
       Object.keys(context.flowMap).forEach(function (key) {
-        context.flowMap[key].forEach(function (update) {
-          update();
+        context.flowMap[key].forEach(function (updateFn) {
+          updateFn();
         });
       });
     } else {
@@ -52629,22 +52663,22 @@ var useForm = function useForm(props) {
         if (!context.updateMap[key]) {
           var _context$updateMap$pa;
           var parentKey = key.split('.')[0];
-          (_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
-            update(context.value, context.errors, context.serverErrors);
+          (_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (updateFn) {
+            updateFn(context.value, context.errors, context.serverErrors);
           });
         } else {
           var _context$updateMap$ke2;
-          (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
-            update(context.value, context.errors, context.serverErrors);
+          (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (updateFn) {
+            updateFn(context.value, context.errors, context.serverErrors);
           });
         }
-        (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
-          update();
+        (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (updateFn) {
+          updateFn();
         });
       });
     }
-    (_context$flowMap$glob = context.flowMap[globalKey]) === null || _context$flowMap$glob === void 0 || _context$flowMap$glob.forEach(function (update) {
-      update();
+    (_context$flowMap$glob = context.flowMap[globalKey]) === null || _context$flowMap$glob === void 0 || _context$flowMap$glob.forEach(function (updateFn) {
+      updateFn();
     });
   };
   var updateFieldsets = use_persist_fn(function (name) {
@@ -52975,6 +53009,7 @@ var useForm = function useForm(props) {
       if (validateFieldSet.size === 0 && updateFieldSet.size === 0) {
         context.names.delete(n);
         delete context.defaultValues[n];
+        delete context.rulesMap[n];
       }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
       if (!finalReserveAble && !context.removeLock) {
@@ -52989,22 +53024,25 @@ var useForm = function useForm(props) {
       if (isArray(propRules)) {
         newRules = newRules.concat(propRules);
       }
+      if (newRules.length > 0) {
+        context.rulesMap[name] = newRules;
+      }
       return newRules;
     },
     watch: function watch() {
       var names = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [globalKey];
-      var update = arguments.length > 1 ? arguments[1] : undefined;
+      var updateFn = arguments.length > 1 ? arguments[1] : undefined;
       names.forEach(function (name) {
         context.flowMap[name] = context.flowMap[name] || new Set();
-        context.flowMap[name].add(update);
+        context.flowMap[name].add(updateFn);
       });
     },
     unWatch: function unWatch() {
       var names = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [globalKey];
-      var update = arguments.length > 1 ? arguments[1] : undefined;
+      var updateFn = arguments.length > 1 ? arguments[1] : undefined;
       names.forEach(function (name) {
-        if (update) {
-          context.flowMap[name].delete(update);
+        if (updateFn) {
+          context.flowMap[name].delete(updateFn);
         } else {
           delete context.flowMap[name];
         }
@@ -74423,7 +74461,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.1-beta.7'
+  version: '3.9.2-beta.1'
 });
 }();
 /******/ 	return __webpack_exports__;