shineout 3.6.1-beta.1 → 3.6.1-beta.3

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

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.1');
+/* harmony default export */ var version = ('3.6.1-beta.3');
 ;// 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 {
@@ -55639,11 +55644,12 @@ var PaginationJumper = function PaginationJumper(props) {
     pageSize = props.pageSize,
     disabled = props.disabled,
     text = props.text,
+    current = props.current,
     onChange = props.onChange;
   var paginationStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$pagination = jssStyle.pagination) === null || _jssStyle$pagination === void 0 ? void 0 : _jssStyle$pagination.call(jssStyle);
   var rootClasses = classnames_default()(paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.section, paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.jumper);
   var txt = text.jumper ? text.jumper.split('{input}') : [];
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(String(current)),
     _useState2 = slicedToArray_default()(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
@@ -55651,23 +55657,28 @@ var PaginationJumper = function PaginationJumper(props) {
     return Math.ceil(total / pageSize) || 1;
   };
   var cleatInternalState = function cleatInternalState() {
+    if (simple) return;
     setValue('');
   };
   var handleKeyDown = function handleKeyDown(e) {
     if (e.key === 'Enter' || e.keyCode === 13) {
-      var current = parseInt(e.target.value, 10);
-      if (!Number.isFinite(current)) return;
-      if (current < 1) current = 1;
+      var _current = parseInt(e.target.value, 10);
+      if (!Number.isFinite(_current)) return;
+      if (_current < 1) _current = 1;
       var max = getMax();
-      if (current > max) current = max;
-      onChange(current);
-      setValue(String(current));
+      if (_current > max) _current = max;
+      onChange(_current);
+      setValue(String(_current));
       setTimeout(cleatInternalState, 20);
     }
   };
   var handleChange = function handleChange(v) {
     setValue(v || '');
   };
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!simple) return;
+    setValue(String(current));
+  }, [current, simple]);
   var renderInput = function renderInput() {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_input_input, {
       jssStyle: jssStyle,
@@ -56075,6 +56086,7 @@ var PaginationSimple = function PaginationSimple(props) {
       total: total,
       text: text,
       size: size,
+      current: current,
       pageSize: pageSize,
       onChange: onChange
     });
@@ -56232,6 +56244,7 @@ var Pagination = function Pagination(props) {
           return /*#__PURE__*/(0,jsx_runtime.jsx)(pagination_jumper, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
             text: text,
             total: total,
+            current: current,
             pageSize: pageSize,
             onChange: onChange
           }), i);
@@ -60595,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,
@@ -69660,7 +69676,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.1-beta.1'
+  version: '3.6.1-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;