shineout 3.5.4-beta.4 → 3.5.4-beta.5

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

package/dist/shineout.js

@@ -12030,7 +12030,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.4');
+/* harmony default export */ var version = ('3.5.4-beta.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -48043,12 +48043,14 @@ 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,
@@ -48089,6 +48091,16 @@ 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,
@@ -48098,7 +48110,7 @@ var Form = function Form(props) {
     validateFields: validateFields,
     validateFieldsWithValue: validateFieldsWithValue,
     validateFieldsWithError: formFunc.validateFields,
-    set: formFunc.setValue,
+    set: handleOuterSet,
     scrollToField: formFunc.scrollToField
   });
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -48147,17 +48159,17 @@ var Form = function Form(props) {
       }
     };
   }, [formProps.onSubmit]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+  return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
     onSubmit: true
   })), {}, {
     ref: formElRef,
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
-        value: formRefObj,
-        children: children
-      })
-    }))
-  }));
+    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
+    })
+  })));
 };
 /* harmony default export */ var base_src_form_form = (Form);
 ;// CONCATENATED MODULE: ./src/form/form.tsx
@@ -48589,8 +48601,7 @@ var FormFieldSet = function FormFieldSet(props) {
     });
   }
   valueArr.forEach(function (v, i) {
-    var _context$ids$i;
-    if (context.lastValues[i] !== v) {
+    if (context.lastValues.length !== valueArr.length) {
       context.ids[i] = generateUUID();
     }
     result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
@@ -48639,7 +48650,7 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
+    }, context.ids[i]));
   });
 
   // 更新 lastValues
@@ -58492,6 +58503,7 @@ var useTableSort = function useTableSort(props) {
 
 
 
+
 var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
@@ -58592,6 +58604,9 @@ var useTableTree = function useTableTree(props) {
     var newExpandKeys = expandKeysState.filter(function (key) {
       return !unmatchExpandKeys.includes(key);
     });
+    if (shallowEqual(newExpandKeys, expandKeysState)) {
+      return;
+    }
     setExpandKeysState(newExpandKeys);
   }, [unmatchExpandKeys, expandKeysState]);
   return {
@@ -58960,10 +58975,6 @@ var useTableVirtual = function useTableVirtual(props) {
   }, [scrollHeight]);
   var finalRowsInView = rowsInView + context.rowSpanRows + context.autoAddRows;
   var renderData = props.disabled ? props.data : toConsumableArray_default()(props.data).slice(startIndex, startIndex + finalRowsInView);
-  console.log('======================');
-  console.log('startIndex: >>', startIndex);
-  console.log('finalRowsInView: >>', finalRowsInView);
-  console.log('======================');
   return {
     scrollHeight: scrollHeight,
     startIndex: startIndex,
@@ -67001,7 +67012,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.4'
+  version: '3.5.4-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;