shineout 3.9.3-beta.14 → 3.9.3-beta.16

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.9.3-beta.14'
+  version: '3.9.3-beta.16'
 };

package/dist/shineout.js

@@ -12401,7 +12401,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.9.3-beta.14');
+/* harmony default export */ var version = ('3.9.3-beta.16');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -64653,7 +64653,7 @@ var useColumns = function useColumns(props) {
       sum += curCol.width || 100;
       if (scrollLeft < sum) {
         // 计算可视区域内需要渲染的列数
-        for (var j = i + 1; j < len; j++) {
+        for (var j = i + 1; j <= len; j++) {
           var _props$scrollRef$curr;
           var nextCol = middleColumns[j];
           sum += nextCol.width || 100;
@@ -64662,6 +64662,11 @@ var useColumns = function useColumns(props) {
             var visibleCount = j - i;
             setRenderedCount(Math.min(visibleCount + overscan * 2, len));
             break;
+          } else if (j === len) {
+            // 到达最后一列
+            var _visibleCount = j - i + 1;
+            setRenderedCount(Math.min(_visibleCount + overscan * 2, len));
+            break;
           }
         }
 
@@ -64680,14 +64685,14 @@ var useColumns = function useColumns(props) {
     });
   }, []);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    var _props$scrollRef$curr2;
     if (!props.virtualColumn) return;
-    if (((_props$scrollRef$curr2 = props.scrollRef.current) === null || _props$scrollRef$curr2 === void 0 ? void 0 : _props$scrollRef$curr2.scrollLeft) === 0) {
+    if (props.scrollRef.current) {
+      var _props$scrollRef$curr2;
       handleScroll({
-        scrollLeft: 0
+        scrollLeft: (_props$scrollRef$curr2 = props.scrollRef.current) === null || _props$scrollRef$curr2 === void 0 ? void 0 : _props$scrollRef$curr2.scrollLeft
       });
     }
-  }, [(_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length]);
+  }, [(_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.length, columns]);
   var processedColumns = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     if (!props.virtualColumn) return columns;
     return columns.map(function (col, index) {
@@ -64696,14 +64701,21 @@ var useColumns = function useColumns(props) {
       }
       if (index < startIndex || index > startIndex + renderedCount) {
         var colSpan;
+        var colSpanWidth;
         if (index > startIndex + renderedCount && index === startIndex + renderedCount + 1) {
           colSpan = function colSpan() {
-            return middleColumns.length - (startIndex + renderedCount) + 1;
+            return middleColumns.length - index;
           };
+          colSpanWidth = middleColumns.slice(index).reduce(function (sum, c) {
+            return sum + (c.width || 0);
+          }, 0);
         } else if (index < startIndex && index === leftFixedColumns.length && startIndex > 0) {
           colSpan = function colSpan() {
             return startIndex;
           };
+          colSpanWidth = middleColumns.slice(0, startIndex).reduce(function (sum, c) {
+            return sum + (c.width || 0);
+          }, 0);
         }
         var hiddenTitle = context.groupLevel > 0 ? col.title : null;
         return objectSpread2_default()(objectSpread2_default()({}, col), {}, {
@@ -64711,7 +64723,10 @@ var useColumns = function useColumns(props) {
           render: function render() {
             return null;
           },
-          title: hiddenTitle
+          title: hiddenTitle,
+          style: {
+            width: colSpanWidth
+          }
         });
       }
       return col;
@@ -74731,7 +74746,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.3-beta.14'
+  version: '3.9.3-beta.16'
 });
 }();
 /******/ 	return __webpack_exports__;