shineout 3.5.4-beta.15 → 3.5.4-beta.16

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.4-beta.15'
+  version: '3.5.4-beta.16'
 };

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.4-beta.15');
+/* harmony default export */ var version = ('3.5.4-beta.16');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -33919,6 +33919,7 @@ var useInputFormat = function useInputFormat(props) {
 
 
 
+
 function insertPoint(name) {
   var reg = /(\[\d+\])/gi;
   return name.replace(reg, function (s, m, i) {
@@ -34172,12 +34173,31 @@ var removeProps = function removeProps(target, remove) {
   }
   return a;
 };
+
+/**
+ * 获取数据对象的全量key路径
+ * @param obj 数据对象
+ * @param parentKey 父级key
+ * @returns 全量key路径
+ * @example
+ * const obj = { a: { b: { c: 1 } } };
+ * const keys = getAllKeyPaths(obj);
+ * console.log(keys); // ['a.b.c', 'a.b', 'a']
+ */
 var getAllKeyPaths = function getAllKeyPaths(obj) {
   var parentKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   return Object.keys(obj).reduce(function (keys, key) {
     var newKey = parentKey ? "".concat(parentKey, ".").concat(key) : key;
     if (Array.isArray(obj[key])) {
-      return keys.concat(newKey);
+      var childrenKeys = obj[key].map(function (item, index) {
+        if (item !== null && typeof_default()(item) === 'object') {
+          return getAllKeyPaths(item, "".concat(newKey, "[").concat(index, "]"));
+        }
+        return null;
+      }).filter(function (item) {
+        return item !== null;
+      });
+      return keys.concat.apply(keys, toConsumableArray_default()(childrenKeys)).concat(newKey);
     }
     return keys.concat(obj[key] !== null && typeof_default()(obj[key]) === 'object' ? getAllKeyPaths(obj[key], newKey) : newKey);
   }, []);
@@ -48176,14 +48196,12 @@ function useFormInstance() {
 ;// CONCATENATED MODULE: ../base/src/form/form.tsx
 
 
-
 var form_excluded = ["jssStyle", "className", "style", "children", "formRef"];
 
 
 
 
 
-
 var Form = function Form(props) {
   var _jssStyle$form;
   var jssStyle = props.jssStyle,
@@ -48224,16 +48242,6 @@ var Form = function Form(props) {
       type: 'withValue'
     });
   });
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
-    _useState2 = slicedToArray_default()(_useState, 2),
-    renderKey = _useState2[0],
-    setRenderKey = _useState2[1];
-  var handleOuterSet = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function (vals) {
-    formFunc.setValue(vals);
-    setRenderKey(function (prev) {
-      return prev + 1;
-    });
-  }, [formFunc]);
   var formRefObj = useLatestObj({
     clearValidate: formFunc.clearValidate,
     getValue: formFunc.getValue,
@@ -48243,7 +48251,7 @@ var Form = function Form(props) {
     validateFields: validateFields,
     validateFieldsWithValue: validateFieldsWithValue,
     validateFieldsWithError: formFunc.validateFields,
-    set: handleOuterSet,
+    set: formFunc.setValue,
     scrollToField: formFunc.scrollToField
   });
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -48292,17 +48300,17 @@ var Form = function Form(props) {
       }
     };
   }, [formProps.onSubmit]);
-  return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
     onSubmit: true
   })), {}, {
     ref: formElRef,
-    key: renderKey
-  }), /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
-      value: formRefObj,
-      children: children
-    })
-  })));
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
+        value: formRefObj,
+        children: children
+      })
+    }))
+  }));
 };
 /* harmony default export */ var base_src_form_form = (Form);
 ;// CONCATENATED MODULE: ./src/form/form.tsx
@@ -48672,14 +48680,12 @@ var useFormFieldSet = function useFormFieldSet(props) {
 
 
 
-
 var form_fieldset_produce = utils_immer_produce;
 var FormFieldSet = function FormFieldSet(props) {
   var children = props.children,
     empty = props.empty;
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
-      ids: [],
-      lastValues: []
+      ids: []
     }),
     context = _React$useRef.current;
   var formFunc = useFormFunc();
@@ -48714,9 +48720,8 @@ var FormFieldSet = function FormFieldSet(props) {
   }
   var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
   valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
-  var result = [];
   if (valueArr.length === 0 && valueArr && empty) {
-    result.push( /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
+    return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: empty(function (val) {
         var newValue = form_fieldset_produce(valueArr, function (draft) {
           draft.push(val);
@@ -48725,7 +48730,7 @@ var FormFieldSet = function FormFieldSet(props) {
         context.ids.push(generateUUID());
         formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
       })
-    }, 'empty'));
+    }, 'empty');
   }
   var errorList = (Array.isArray(error) ? error : [error]).filter(Boolean);
   if (context.ids.length !== valueArr.length) {
@@ -48733,11 +48738,9 @@ var FormFieldSet = function FormFieldSet(props) {
       return generateUUID();
     });
   }
-  valueArr.forEach(function (v, i) {
-    if (context.lastValues.length !== valueArr.length) {
-      context.ids[i] = generateUUID();
-    }
-    result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
+  return valueArr.map(function (v, i) {
+    var _context$ids$i;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: {
         path: "".concat(ProviderValue.path, "[").concat(i, "]"),
         validateFieldSet: validateFieldSet
@@ -48783,13 +48786,7 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, context.ids[i]));
-  });
-
-  // 更新 lastValues
-  context.lastValues = valueArr;
-  return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
-    children: result
+    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i);
   });
 };
 /* harmony default export */ var form_fieldset = (FormFieldSet);
@@ -67168,7 +67165,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.15'
+  version: '3.5.4-beta.16'
 });
 }();
 /******/ 	return __webpack_exports__;