shineout 3.7.0-beta.28 → 3.7.0-beta.29

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.0-beta.28'
+  version: '3.7.0-beta.29'
 };

package/dist/shineout.js

@@ -12226,7 +12226,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.0-beta.28');
+/* harmony default export */ var version = ('3.7.0-beta.29');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -61039,11 +61039,14 @@ var scroll_table_Scroll = function Scroll(props) {
   });
 
   // 非定高的Table但依旧采用了virtual渲染方式，需要渲染出全部的data
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (!props.tableRef.current) return;
     var rootTableHeight = props.tableRef.current.clientHeight;
+    var container = containerRef.current;
+    // 判断内容滚动高度是否真的超过了容器高度
+    var isRealScroll = (container === null || container === void 0 ? void 0 : container.scrollHeight) !== undefined && container.scrollHeight > rootTableHeight;
     // 判断Table的根节点dom高度是否发生变化，如果变化了，则是因为不定高，被内部元素撑高了导致的
-    if (paddingTop > 0 && context.lastTableHeight > 0 && context.lastTableHeight !== rootTableHeight) {
+    if (paddingTop > 0 && context.lastTableHeight > 0 && context.lastTableHeight !== rootTableHeight && !isRealScroll) {
       props.setFakeVirtual(true);
       context.lastTableHeight = 0;
     } else {
@@ -70937,7 +70940,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.28'
+  version: '3.7.0-beta.29'
 });
 }();
 /******/ 	return __webpack_exports__;