shineout 3.5.6 → 3.5.7-beta.2

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

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.6');
+/* harmony default export */ var version = ('3.5.7-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -34313,6 +34313,34 @@ var getAllKeyPaths = function getAllKeyPaths(obj) {
     return keys.concat(obj[key] !== null && typeof_default()(obj[key]) === 'object' ? getAllKeyPaths(obj[key], newKey) : newKey);
   }, []);
 };
+
+/**
+ * 获取完整的字段key
+ * @param fields 字段key
+ * @param allFields 所有字段key
+ * @returns 完整的字段key
+ * @example
+ * const fields = ['user']
+ * const allFields = ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
+ * const completeFields = getCompleteFieldKeys(fields, allFields)
+ * console.log(completeFields) // ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
+ */
+var getCompleteFieldKeys = function getCompleteFieldKeys(fields, allFields) {
+  var fieldsArray = isArray(fields) ? fields : [fields];
+  var completeFields = [];
+  fieldsArray.forEach(function (field) {
+    var na = "".concat(field, "[");
+    var no = "".concat(field, ".");
+    completeFields.push(field);
+    var childFields = allFields.filter(function (f) {
+      return f.startsWith(na) || f.startsWith(no);
+    });
+    if (childFields.length) {
+      completeFields.push.apply(completeFields, toConsumableArray_default()(childFields));
+    }
+  });
+  return completeFields;
+};
 ;// CONCATENATED MODULE: ../base/src/common/use-clear.ts
 
 var useClear = function useClear(props) {
@@ -47789,6 +47817,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(),
@@ -47892,9 +47921,25 @@ var useForm = function useForm(props) {
   var validateFields = use_persist_fn(function (fields) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return new Promise(function (resolve, reject) {
-      var finalFields = fields ? (isArray(fields) ? fields : [fields]).filter(function (key) {
-        return context.validateMap[key];
-      }) : Object.keys(context.validateMap);
+      var finalFields = Object.keys(context.validateMap);
+      if (fields) {
+        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];
         return Array.from(validateField).map(function (validate) {
@@ -48129,7 +48174,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 = [];
@@ -48138,6 +48183,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() {
@@ -48850,7 +48904,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;
     });
   };
@@ -48908,13 +48964,15 @@ var FormFieldSet = function FormFieldSet(props) {
         value: v,
         index: i,
         error: errorList,
-        onChange: function onChange(val) {
+        onChange: function onChange(val, options) {
           var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
           var newValue = form_fieldset_produce(oldValue, function (draft) {
             draft[i] = val;
           });
           _onChange(newValue);
-          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);
@@ -53278,7 +53336,7 @@ function Select(props0) {
   });
   var rootClass = classnames_default()(className, styles === null || styles === void 0 ? void 0 : styles.rootClass, styles === null || styles === void 0 ? void 0 : styles.wrapper, isEmpty && styles.wrapperEmpty, open && (styles === null || styles === void 0 ? void 0 : styles.wrapperOpen), open && trigger === 'hover' && (styles === null || styles === void 0 ? void 0 : styles.triggerHover), disabled === true && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), disabled !== true && focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), clearable && (styles === null || styles === void 0 ? void 0 : styles.clearable), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline), defineProperty_default()({}, styles === null || styles === void 0 ? void 0 : styles.multiple, multiple));
   var getRenderItem = function getRenderItem(data, index) {
-    return typeof renderItemProp === 'function' ? renderItemProp(data, index) : data[renderItemProp];
+    return typeof renderItemProp === 'function' ? renderItemProp(data, index) : (data === null || data === void 0 ? void 0 : data[renderItemProp]) || '';
   };
   var renderItem = getRenderItem;
   var handleFocus = usePersistFn(function (e) {
@@ -53419,7 +53477,8 @@ function Select(props0) {
   };
   var getRenderResult = function getRenderResult(data, index) {
     if (!renderResultProp) return renderItem(data, index);
-    return typeof renderResultProp === 'function' ? renderResultProp(data, index) : data[renderResultProp];
+    var result = typeof renderResultProp === 'function' ? renderResultProp(data, index) : data[renderResultProp];
+    return result !== null && result !== void 0 ? result : null;
   };
   var getDataByValues = function getDataByValues(values) {
     return datum.getDataByValues(values, {
@@ -67331,7 +67390,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.6'
+  version: '3.5.7-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;