shineout 3.5.4-beta.12 → 3.5.4-beta.14

package/cjs/index.js

@@ -507,5 +507,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.12'
+  version: '3.5.4-beta.14'
 };

package/dist/shineout.js

@@ -12031,7 +12031,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.12');
+/* harmony default export */ var version = ('3.5.4-beta.14');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -37292,7 +37292,7 @@ var Scroll = function Scroll(props) {
   var containerStyle = defineProperty_default()(defineProperty_default()({
     height: '100%',
     width: '100%',
-    display: 'inline-flex',
+    display: 'inline-block',
     overflow: 'hidden',
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
@@ -37380,12 +37380,7 @@ var Scroll = function Scroll(props) {
         style: containerStyle,
         ref: containerRef,
         onScroll: handleInnerScroll,
-        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          style: objectSpread2_default()({
-            flexGrow: 1
-          }, props.childrenStyle),
-          children: props.children
-        })
+        children: props.children
       })), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         style: placeStyle,
         children: "\xA0"
@@ -37564,9 +37559,6 @@ var VirtualList = function VirtualList(props) {
       scrollWidth: 0,
       scrollHeight: scrollHeight,
       wrapperRef: wrapperRef,
-      childrenStyle: {
-        width: '100%'
-      },
       onScroll: handleScroll,
       onMouseMove: handleMouseMove,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(Tag, {
@@ -58927,7 +58919,7 @@ var useTableVirtual = function useTableVirtual(props) {
       context.rowSpanRows = 0;
       var currentRowHeight = context.cachedHeight[i] || props.rowHeight;
       sum += currentRowHeight;
-      var rowSpanHeight = currentRowHeight;
+      var rowSpanHeight = 0;
       if (rowSpanInfo) {
         var siblingsIndexs = [];
         for (var k = i; k < rowSpanInfo.maxRowSpan + i; k++) {
@@ -58953,6 +58945,14 @@ var useTableVirtual = function useTableVirtual(props) {
     }
     if (currentIndex !== startIndex) {
       setStartIndex(currentIndex);
+
+      // startIndex处于上方某个合并行的中间一行时，可能引起translate闪烁
+      if (startIndex < currentIndex) {
+        context.autoAddRows = currentIndex - startIndex;
+        setTimeout(function () {
+          context.autoAddRows = 0;
+        }, 300);
+      }
     }
     setTop(top);
   };
@@ -67152,7 +67152,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.12'
+  version: '3.5.4-beta.14'
 });
 }();
 /******/ 	return __webpack_exports__;