shineout 3.3.3-beta.2 → 3.3.3-beta.3

package/cjs/index.js

@@ -476,5 +476,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.3.3-beta.2'
+  version: '3.3.3-beta.3'
 };

package/dist/shineout.js

@@ -11968,7 +11968,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.3.3-beta.2');
+/* harmony default export */ var version = ('3.3.3-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -55366,12 +55366,13 @@ var useTableLayout = function useTableLayout(props) {
       getColgroup(adjust === 'drag');
       setAdjust(false);
     } else {
-      checkFloat();
+      // checkFloat();
       // checkScroll();
       // 拖拽列会导致 scrollWidth 变化
       syncScrollWidth();
     }
     checkScroll();
+    checkFloat();
   }, [colgroup]);
   return {
     isScrollX: !!isScrollX,
@@ -55661,6 +55662,58 @@ var useTableVirtual = function useTableVirtual(props) {
     setOffsetY = _useState10[1];
   var rowsInView = props.rowsInView === 0 ? props.data.length : props.rowsInView;
   var sleft = props.scrollLeft !== undefined ? props.scrollLeft : innerLeft;
+  var rowSpanInfos = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var rowSpanColumns = props.columns.filter(function (col) {
+      return typeof col.rowSpan === 'function';
+    });
+    if (rowSpanColumns.length === 0) return;
+    var _rowSpanInfos = [];
+    var totalLength = props.data.length;
+    var _loop = function _loop(i) {
+      var startIndex = i;
+      var rowSpanInfo = rowSpanColumns.map(function (col) {
+        var rowSpan = col.rowSpan;
+        function getRowSpanCount(index, _count) {
+          var count = _count;
+          if (index === totalLength - 1) return count;
+          var prevRowData = props.data[index];
+          var nextRowData = props.data[index + 1];
+          if (rowSpan(prevRowData, nextRowData)) {
+            count = count + 1;
+            getRowSpanCount(index + 1, count);
+          }
+          return count;
+        }
+        var count = getRowSpanCount(i, 1);
+        return [startIndex, startIndex + count - 1];
+      });
+      _rowSpanInfos.push(rowSpanInfo);
+    };
+    for (var i = 0; i < totalLength; i++) {
+      _loop(i);
+    }
+    for (var _i = 0; _i < _rowSpanInfos.length; _i++) {
+      if (_i === _rowSpanInfos.length - 1) break;
+      var spans1 = _rowSpanInfos[_i];
+      var spans2 = _rowSpanInfos[_i + 1];
+      for (var j = 0; j < spans1.length; j++) {
+        var _spans1$j = slicedToArray_default()(spans1[j], 2),
+          startIndex1 = _spans1$j[0],
+          endIndex1 = _spans1$j[1];
+        var _spans2$j = slicedToArray_default()(spans2[j], 1),
+          startIndex2 = _spans2$j[0];
+        if (endIndex1 === startIndex2) {
+          spans2[j][0] = startIndex1;
+        }
+      }
+    }
+    return _rowSpanInfos.map(function (_rowSpanInfo) {
+      var startIndexs = _rowSpanInfo.map(function (arr) {
+        return arr[0];
+      });
+      return Math.min.apply(Math, toConsumableArray_default()(startIndexs));
+    });
+  }, [props.data, props.columns]);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       cachedHeight: [],
       shouldUpdateHeight: true,
@@ -55720,7 +55773,20 @@ var useTableVirtual = function useTableVirtual(props) {
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
     for (var i = 0; i <= maxIndex; i++) {
       sum += context.cachedHeight[i] || props.rowHeight;
-      if (scrollTop < sum || i === maxIndex) {
+      var rowSpanHeight = 0;
+      if (rowSpanInfos) {
+        var siblingsIndexs = [];
+        for (var k = 0; k < rowSpanInfos.length; k++) {
+          if (rowSpanInfos[k] <= i && k !== i) {
+            siblingsIndexs.push(k);
+          }
+        }
+        for (var j = 0; j < siblingsIndexs.length; j++) {
+          var index = siblingsIndexs[j];
+          rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
+        }
+      }
+      if (scrollTop < sum + rowSpanHeight || i === maxIndex) {
         currentIndex = i;
         var beforeHeight = i === 0 ? 0 : sum - (context.cachedHeight[i] || props.rowHeight);
         top = scrollTop - beforeHeight;
@@ -57212,6 +57278,7 @@ var emptyRef = {
   var virtualInfo = use_table_virtual({
     disabled: !virtual,
     data: treeData,
+    columns: columns,
     rowsInView: props.rowsInView || 20,
     rowHeight: props.rowHeight || 40,
     scrollRef: scrollRef,
@@ -63587,7 +63654,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.3-beta.2'
+  version: '3.3.3-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;