shineout 3.3.6-beta.4 → 3.3.6-beta.6

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.6-beta.4'
+  version: '3.3.6-beta.6'
 };

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.6-beta.4');
+/* harmony default export */ var version = ('3.3.6-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -24444,6 +24444,14 @@ var tableStyle = objectSpread2_default()(objectSpread2_default()({}, globalStyle
       background: "".concat(src.tableTbodyHoverBackgroundColor)
     }
   },
+  rowHover: {
+    '& td': {
+      transition: 'background-color 0.2s'
+    },
+    '&&:hover td': {
+      background: "".concat(src.tableTbodyHoverBackgroundColor)
+    }
+  },
   floatLeft: {
     '& $cellFixedLast$cellFixedLeft': {
       '&::after': {
@@ -48068,6 +48076,8 @@ var usePaginationList = function usePaginationList(props) {
 
 var Scroll = function Scroll(props) {
   var containerRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var scrollRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  var wrapperRef = useForkRef(scrollRef, props.wrapperRef);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       timer: null,
       isMouseDown: false,
@@ -48141,6 +48151,13 @@ var Scroll = function Scroll(props) {
       fromDrag: context.isMouseDown
     });
   });
+  var handleInnerScroll = usePersistFn(function (e) {
+    var scrollTop = e.currentTarget.scrollTop;
+    if (scrollRef.current) {
+      e.currentTarget.scrollTop = 0;
+      scrollRef.current.scrollTop += scrollTop;
+    }
+  });
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: props.className,
     style: props.style,
@@ -48150,7 +48167,7 @@ var Scroll = function Scroll(props) {
     })), {}, {
       style: scrollerStyle,
       onScroll: handleScroll,
-      ref: props.wrapperRef,
+      ref: wrapperRef,
       onMouseDown: function onMouseDown() {
         context.isMouseDown = true;
       },
@@ -48162,6 +48179,7 @@ var Scroll = function Scroll(props) {
       })), {}, {
         style: containerStyle,
         ref: containerRef,
+        onScroll: handleInnerScroll,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           style: objectSpread2_default()({
             flexGrow: 1
@@ -55913,7 +55931,9 @@ var useTableVirtual = function useTableVirtual(props) {
       topTimer: null,
       controlScrollRate: null,
       heightCallback: null,
-      preIndex: null
+      preIndex: null,
+      rowSpanRows: 0,
+      autoAddRows: 0
     }),
     context = _useRef.current;
   var getTranslate = usePersistFn(function (left, top) {
@@ -55964,6 +55984,7 @@ var useTableVirtual = function useTableVirtual(props) {
     var top = 0;
     var maxIndex = Math.max(props.data.length - rowsInView, 0);
     for (var i = 0; i <= maxIndex; i++) {
+      context.rowSpanRows = 0;
       sum += context.cachedHeight[i] || props.rowHeight;
       var rowSpanHeight = 0;
       if (rowSpanInfos) {
@@ -55975,6 +55996,7 @@ var useTableVirtual = function useTableVirtual(props) {
         }
         for (var j = 0; j < siblingsIndexs.length; j++) {
           var index = siblingsIndexs[j];
+          context.rowSpanRows += 1;
           rowSpanHeight += context.cachedHeight[index] || props.rowHeight;
         }
       }
@@ -56065,6 +56087,24 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    var scrollRefHeight = props.scrollRef.current ? props.scrollRef.current.clientHeight : 0;
+    var tableRefHeight = props.innerRef.current ? props.innerRef.current.clientHeight : 0;
+    var remainHeight = scrollRefHeight - tableRefHeight;
+    if (remainHeight > 0) {
+      var addonHeight = 0;
+      var addonCount = 0;
+      for (var i = startIndex + rowsInView; i < props.data.length; i++) {
+        var height = context.cachedHeight[i] || props.rowHeight;
+        addonHeight += height;
+        addonCount += 1;
+        if (addonHeight >= remainHeight + context.cachedHeight[0]) break;
+      }
+      if (addonCount > 0) {
+        context.autoAddRows = addonCount;
+      }
+    }
+  }, []);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     // 记录preIndex
     context.preIndex = startIndex;
@@ -56099,7 +56139,8 @@ var useTableVirtual = function useTableVirtual(props) {
       cb();
     }
   }, [scrollHeight]);
-  var renderData = props.disabled ? props.data : toConsumableArray_default()(props.data).slice(startIndex, startIndex + rowsInView);
+  var finalRowsInView = rowsInView + context.rowSpanRows + context.autoAddRows;
+  var renderData = props.disabled ? props.data : toConsumableArray_default()(props.data).slice(startIndex, startIndex + finalRowsInView);
   return {
     scrollHeight: scrollHeight,
     startIndex: startIndex,
@@ -57018,6 +57059,9 @@ var Tr = function Tr(props) {
     var tds = [];
     var skip = 0;
     var lastRowIndex = data.length - 1;
+    var hasSiblingRowSpan = data === null || data === void 0 ? void 0 : data.some(function (item) {
+      return item === null;
+    });
     var _loop = function _loop(i) {
       if (skip > 0) {
         skip--;
@@ -57029,13 +57073,13 @@ var Tr = function Tr(props) {
         var td = /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
           colSpan: data[i].colSpan,
           rowSpan: data[i].rowSpan,
-          onMouseEnter: function onMouseEnter() {
+          onMouseEnter: props.hover && hasSiblingRowSpan ? function () {
             props.handleCellHover(props.rowIndex, data[i].rowSpan);
-          },
-          onMouseLeave: function onMouseLeave() {
+          } : undefined,
+          onMouseLeave: props.hover && hasSiblingRowSpan ? function () {
             props.handleCellHover(-1, 0);
-          },
-          className: classnames_default()(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
+          } : undefined,
+          className: classnames_default()(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
           style: getTdStyle(col, data[i].colSpan),
           dir: config.direction,
           onClick: props.onCellClick ? function () {
@@ -57101,7 +57145,7 @@ var Tr = function Tr(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("tr", objectSpread2_default()(objectSpread2_default()({
       ref: trRef,
-      className: classnames_default()(props === null || props === void 0 || (_props$rowClassName = props.rowClassName) === null || _props$rowClassName === void 0 ? void 0 : _props$rowClassName.call(props, props.rawData, props.rowIndex), props.striped && props.rowIndex % 2 === 1 && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowStriped), props.isSelect && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowChecked))
+      className: classnames_default()(props === null || props === void 0 || (_props$rowClassName = props.rowClassName) === null || _props$rowClassName === void 0 ? void 0 : _props$rowClassName.call(props, props.rawData, props.rowIndex), props.striped && props.rowIndex % 2 === 1 && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowStriped), props.isSelect && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowChecked), props.hover && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.rowHover))
     }, props.rowEvents), {}, {
       onClick: handleRowClick,
       children: renderTds(props.columns, props.row)
@@ -57172,6 +57216,7 @@ var Tr = function Tr(props) {
       striped: props.striped,
       radio: props.radio,
       isCellHover: isCellHover,
+      hover: hover,
       isSelect: props.datum.check(rowSelectMergeStartData[index]),
       handleCellHover: handleCellHover
       // to update
@@ -63886,7 +63931,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.6-beta.4'
+  version: '3.3.6-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;