shineout 3.6.1-beta.2 → 3.6.1-beta.4

package/cjs/index.js

@@ -514,5 +514,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.6.1-beta.2'
+  version: '3.6.1-beta.4'
 };

package/dist/shineout.js

@@ -12139,7 +12139,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.6.1-beta.2');
+/* harmony default export */ var version = ('3.6.1-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30349,7 +30349,8 @@ var usePositionStyle = function usePositionStyle(config) {
         width: 0
       },
       popUpHeight: 0,
-      popUpWidth: 0
+      popUpWidth: 0,
+      prevParentPosition: null
     }),
     context = _React$useRef.current;
   var parentElNewPosition = useCheckElementPosition(parentElRef, {
@@ -30549,7 +30550,8 @@ var usePositionStyle = function usePositionStyle(config) {
       style: hideStyle
     };
     var rect = context.parentRect;
-    if (!show && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
+    var needCheck = !show || !shallow_equal(context.prevParentPosition, parentElNewPosition);
+    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
       var _scrollElRef$current2;
       var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom || rect.right < visibleRect.left || rect.left > visibleRect.right) {
@@ -30631,6 +30633,9 @@ var usePositionStyle = function usePositionStyle(config) {
       setStyle(newStyle);
       setArrayStyle(newArrayStyle || {});
     }
+
+    // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
+    context.prevParentPosition = parentElNewPosition;
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition]);
   return {
@@ -49723,7 +49728,6 @@ var useForm = function useForm(props) {
     }
     context.lastValue = props.value;
   };
-  updateValue();
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
     // 服务端错误更新
     if (!props.error) context.serverErrors = {};else {
@@ -49739,6 +49743,7 @@ var useForm = function useForm(props) {
 
   // 默认值更新
   external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect(function () {
+    updateValue();
     context.removeLock = false;
     // 内部 onChange 改的 value, 不需要更新
     if (props.value === context.value) return;
@@ -52062,7 +52067,7 @@ var input_input_Input = function Input(props) {
           for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
             args[_key] = arguments[_key];
           }
-          (_ref$current$propsMap = ref.current.propsMap.get(child)) === null || _ref$current$propsMap === void 0 || (_ref$current$propsMap2 = _ref$current$propsMap.onFocus) === null || _ref$current$propsMap2 === void 0 || _ref$current$propsMap2.call(_ref$current$propsMap, args);
+          (_ref$current$propsMap = ref.current.propsMap.get(child)) === null || _ref$current$propsMap === void 0 || (_ref$current$propsMap2 = _ref$current$propsMap.onFocus) === null || _ref$current$propsMap2 === void 0 || _ref$current$propsMap2.call.apply(_ref$current$propsMap2, [_ref$current$propsMap].concat(args));
         },
         onBlur: function onBlur() {
           var _ref$current$propsMap3, _ref$current$propsMap4;
@@ -52070,7 +52075,7 @@ var input_input_Input = function Input(props) {
           for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
             args[_key2] = arguments[_key2];
           }
-          (_ref$current$propsMap3 = ref.current.propsMap.get(child)) === null || _ref$current$propsMap3 === void 0 || (_ref$current$propsMap4 = _ref$current$propsMap3.onBlur) === null || _ref$current$propsMap4 === void 0 || _ref$current$propsMap4.call(_ref$current$propsMap3, args);
+          (_ref$current$propsMap3 = ref.current.propsMap.get(child)) === null || _ref$current$propsMap3 === void 0 || (_ref$current$propsMap4 = _ref$current$propsMap3.onBlur) === null || _ref$current$propsMap4 === void 0 || _ref$current$propsMap4.call.apply(_ref$current$propsMap4, [_ref$current$propsMap3].concat(args));
         }
       });
     }
@@ -60603,18 +60608,21 @@ var useTableFilter = function useTableFilter(props) {
 
   // 根据columns生成filterInfo
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    var _props$columns;
-    var _filterInfo = props === null || props === void 0 || (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.reduce(function (acc, column, index) {
-      var _column$filter;
-      if (!column.filter) return acc;
-      var columnKey = typeof column.render === 'string' ? column.render : String(index);
-      acc.set(columnKey, {
-        value: undefined,
-        onFilter: (_column$filter = column.filter) === null || _column$filter === void 0 ? void 0 : _column$filter.onFilter
-      });
-      return acc;
-    }, new Map());
-    if (_filterInfo) setFilterInfo(_filterInfo);
+    setFilterInfo(function (prev) {
+      var _props$columns;
+      var _filterInfo = props === null || props === void 0 || (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.reduce(function (acc, column, index) {
+        var _prev$get2, _column$filter;
+        if (!column.filter) return acc;
+        var columnKey = typeof column.render === 'string' ? column.render : String(index);
+        var prevValue = (_prev$get2 = prev.get(columnKey)) === null || _prev$get2 === void 0 ? void 0 : _prev$get2.value;
+        acc.set(columnKey, {
+          value: prevValue,
+          onFilter: (_column$filter = column.filter) === null || _column$filter === void 0 ? void 0 : _column$filter.onFilter
+        });
+        return acc;
+      }, new Map());
+      return _filterInfo || new Map();
+    });
   }, [props.columns]);
   return {
     filterInfo: filterInfo,
@@ -69668,7 +69676,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.1-beta.2'
+  version: '3.6.1-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;