shineout 3.7.8-beta.8 → 3.7.8-fix.1

package/cjs/index.js

@@ -522,5 +522,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.7.8-beta.8'
+  version: '3.7.8-fix.1'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.7.8-beta.8');
+/* harmony default export */ var version = ('3.7.8-fix.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -23692,7 +23692,6 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     height: 32,
     padding: "".concat(src.selectHeaderPaddingY, " ").concat(src.selectHeaderPaddingX),
     borderBottom: "1px solid ".concat(src.selectHeaderBorderColor),
-    marginBottom: 4,
     '& $columnsCheckbox': {
       marginRight: 0,
       marginLeft: 4,
@@ -31081,6 +31080,23 @@ var getCurrentCSSZoom = function getCurrentCSSZoom() {
 //     height: rect.height * zoomRatio,
 //   }
 // }
+
+var getScrollPosition = function getScrollPosition(element) {
+  if (!element) return {
+    scrollTop: 0,
+    scrollLeft: 0
+  };
+  if (element === document.documentElement || element === document.body) {
+    return {
+      scrollTop: document.documentElement.scrollTop || document.body.scrollTop,
+      scrollLeft: document.documentElement.scrollLeft || document.body.scrollLeft
+    };
+  }
+  return {
+    scrollTop: element.scrollTop,
+    scrollLeft: element.scrollLeft
+  };
+};
 ;// CONCATENATED MODULE: ../hooks/src/common/use-position-style/index.ts
 
 
@@ -31324,17 +31340,18 @@ var usePositionStyle = function usePositionStyle(config) {
     };
   };
   var getAbsoluteStyle = function getAbsoluteStyle(position) {
-    var _scrollElRef$current, _scrollElRef$current2, _scrollElRef$current3;
+    var _scrollElRef$current;
     if (!parentElRef.current) return {
       style: hideStyle
     };
     var rect = context.parentRect;
     var needCheck = !show || !shallow_equal(context.prevParentPosition, parentElNewPosition);
-    var scrollTop = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current = scrollElRef.current) === null || _scrollElRef$current === void 0 ? void 0 : _scrollElRef$current.scrollTop) || 0;
-    var scrollLeft = (scrollElRef === null || scrollElRef === void 0 || (_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.scrollLeft) || 0;
-    if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current3 = scrollElRef.current) !== null && _scrollElRef$current3 !== void 0 && _scrollElRef$current3.contains(parentElRef.current)) {
-      var _scrollElRef$current4;
-      var visibleRect = ((_scrollElRef$current4 = scrollElRef.current) === null || _scrollElRef$current4 === void 0 ? void 0 : _scrollElRef$current4.getBoundingClientRect()) || {};
+    var _getScrollPosition = getScrollPosition(scrollElRef === null || scrollElRef === void 0 ? void 0 : scrollElRef.current),
+      scrollTop = _getScrollPosition.scrollTop,
+      scrollLeft = _getScrollPosition.scrollLeft;
+    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 + scrollTop || rect.right < visibleRect.left || rect.left > visibleRect.right + scrollLeft) {
         return {
           style: hideStyle
@@ -31408,7 +31425,9 @@ var usePositionStyle = function usePositionStyle(config) {
     }
 
     // 当父元素的滚动容器滚动时，判断是否需要更新弹出层位置，包括是否隐藏弹出层（通过hideStyle隐藏，不是show状态）
-    context.prevParentPosition = parentElNewPosition;
+    if (show) {
+      context.prevParentPosition = parentElNewPosition;
+    }
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(updateStyle, [show, position, absolute, updateKey, fixedWidth, parentElNewPosition, popupElSize]);
   return {
@@ -35813,19 +35832,18 @@ function useInputAble(props) {
   var render = useRender(syncValue);
   var shouldUseState = delay || !control;
   var value = shouldUseState ? stateValue : valuePo;
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (context.timer) {
-      clearTimeout(context.timer);
-      context.timer = null;
-    }
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (delay && control && props.value !== stateValue) {
       changeStateValue(props.value);
+    } else if (context.timer) {
+      clearTimeout(context.timer);
+      context.timer = null;
     }
   }, [props.value, delay, control]);
   var forceDelayChange = use_persist_fn(function () {
-    if (context.timer && context.delayChange) {
+    if (context.delayChange) context.delayChange();
+    if (context.timer) {
       clearTimeout(context.timer);
-      context.delayChange();
       context.timer = null;
       context.delayChange = null;
     }
@@ -50855,7 +50873,7 @@ var useForm = function useForm(props) {
     var _props$onChange;
     var newValue = typeof change === 'function' ? utils_immer_produce(context.value, change) : change;
     context.value = newValue;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, deepClone(context.value));
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newValue);
   });
   var scrollToField = use_persist_fn(function (name) {
     var _document;
@@ -55393,7 +55411,8 @@ var VirtualNode = function VirtualNode(props) {
     className: rootClass,
     dir: config.direction,
     style: {
-      paddingLeft: level * indent
+      paddingLeft: level * indent,
+      height: props.lineHeight
     },
     children: [$indents, /*#__PURE__*/(0,jsx_runtime.jsx)(tree_content, {
       virtual: true,
@@ -55677,7 +55696,8 @@ var TreeVirtual = function TreeVirtual(props) {
       onNodeClick: onNodeClick,
       onToggle: onToggle,
       onChange: onChange,
-      size: datum.size
+      size: datum.size,
+      lineHeight: lineHeight
     }, id);
   };
   return /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
@@ -56360,7 +56380,8 @@ var ColumnsList = function ColumnsList(props) {
       colNum: columns,
       lineHeight: lineHeight,
       rowsInView: itemsInView,
-      renderItem: renderItem
+      renderItem: renderItem,
+      paddingY: 4
     });
   };
   var renderSelectAll = function renderSelectAll() {
@@ -71859,7 +71880,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.8-beta.8'
+  version: '3.7.8-fix.1'
 });
 }();
 /******/ 	return __webpack_exports__;