@zhenliang/sheet 0.1.6 → 0.1.7-3.beta.1

package/dist/core/shell/draggableShell/index.js

@@ -1,15 +1,15 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useEffect, useMemo, useRef } from 'react';
-import { useSetState, useWidth } from "../../../hooks";
+import { createElement, useEffect, useMemo, useRef } from 'react';
+import { useSetState, useSheetEvent, useWidth } from "../../../hooks";
 import { classNames } from "../../util";
 import { CheckViewer } from "../../viewer/checkViewer";
 import { GroupViewer } from "../../viewer/groupViewer";
@@ -26,7 +26,9 @@ export var DraggableShell = function DraggableShell(_ref) {
     _ref$controlWidth = _ref.controlWidth,
     controlWidth = _ref$controlWidth === void 0 ? 30 : _ref$controlWidth;
   var TableShell = function TableShell(_ref2) {
-    var children = _ref2.children;
+    var children = _ref2.children,
+      isScrolledOver = _ref2.isScrolledOver,
+      isScrolledToEnd = _ref2.isScrolledToEnd;
     var headRef = useRef(null);
     var downRef = useRef(null);
     var _useSetState = useSetState({}),
@@ -36,11 +38,54 @@ export var DraggableShell = function DraggableShell(_ref) {
     var _useWidth = useWidth(),
       contextWidths = _useWidth.widths,
       contextSetWidth = _useWidth.onChange;
+    var eventBus = useSheetEvent();
     var setWidth = contextSetWidth || _setWidth;
     var widths = contextWidths || _widths;
     var hasControl = showGroup || showSelect;
+    var offset = 1 + (hasControl ? 1 : 0);
+    var colItems = useMemo(function () {
+      var cols = [/*#__PURE__*/_jsx("col", {
+        className: classNames('sheet-control sheet-row-cursor'),
+        style: {
+          width: 0,
+          border: 'none'
+        }
+      }, "sheet-row-cursor")];
+      if (hasControl) {
+        cols.push( /*#__PURE__*/_jsx("col", {
+          className: classNames('sheet-control'),
+          style: {
+            width: controlWidth
+          }
+        }, "sheet-control"));
+      }
+      var i = 0;
+      columns.forEach(function (item, index) {
+        var _item$titleConfig, _item$dataIndex;
+        var currentWidth = item.width || 'unset';
+        if (((_item$titleConfig = item.titleConfig) === null || _item$titleConfig === void 0 ? void 0 : _item$titleConfig.colSpan) !== 0) {
+          currentWidth = widths[i] || item.width || 'unset';
+          i++;
+        }
+        cols.push( /*#__PURE__*/_jsx("col", {
+          className: classNames('cell'),
+          style: {
+            width: currentWidth,
+            border: 'none'
+          }
+        }, (_item$dataIndex = item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : index));
+      });
+      return cols;
+    }, [widths, hasControl, columns]);
     var thItems = useMemo(function () {
-      var ths = [];
+      var ths = [/*#__PURE__*/_jsx("th", {
+        className: "cell cell-title read-only sheet-control sheet-row-cursor"
+      }, -2)];
+      var positionArr = [{
+        isLastFixedLeft: false,
+        isFirstFixedRight: false,
+        fixPosition: 0
+      }];
       if (hasControl) {
         var _controlProps$group, _controlProps$check, _controlProps$check2, _controlProps$check3;
         ths.push( /*#__PURE__*/_jsxs("th", {
@@ -50,30 +95,69 @@ export var DraggableShell = function DraggableShell(_ref) {
             col: -1,
             value: true,
             record: {
-              open: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$group = controlProps.group) === null || _controlProps$group === void 0 ? void 0 : _controlProps$group.open,
+              open: controlProps === null || controlProps === void 0 || (_controlProps$group = controlProps.group) === null || _controlProps$group === void 0 ? void 0 : _controlProps$group.open,
               isHeader: true
             }
           }), showSelect && /*#__PURE__*/_jsx(CheckViewer, {
             row: -1,
             col: -1,
-            value: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$check = controlProps.check) === null || _controlProps$check === void 0 ? void 0 : _controlProps$check.checked,
+            value: controlProps === null || controlProps === void 0 || (_controlProps$check = controlProps.check) === null || _controlProps$check === void 0 ? void 0 : _controlProps$check.checked,
             record: {
-              open: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$check2 = controlProps.check) === null || _controlProps$check2 === void 0 ? void 0 : _controlProps$check2.checked,
+              open: controlProps === null || controlProps === void 0 || (_controlProps$check2 = controlProps.check) === null || _controlProps$check2 === void 0 ? void 0 : _controlProps$check2.checked,
               isHeader: true,
-              indeterminate: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$check3 = controlProps.check) === null || _controlProps$check3 === void 0 ? void 0 : _controlProps$check3.indeterminate
+              indeterminate: controlProps === null || controlProps === void 0 || (_controlProps$check3 = controlProps.check) === null || _controlProps$check3 === void 0 ? void 0 : _controlProps$check3.indeterminate
             }
           })]
         }, "-1"));
+        positionArr.push({
+          isLastFixedLeft: false,
+          isFirstFixedRight: false,
+          fixPosition: 0
+        });
       }
+      var fixLeftPosition = 0;
+      var fixRightPosition = columns.reduce(function (pre, cur, index) {
+        if (cur.fixed === 'right') {
+          var positionIndex = hasControl ? index + 2 : index + 1;
+          return pre + colItems[positionIndex].props.style.width;
+        }
+        return pre + 0;
+      }, 0);
       columns.forEach(function (item, index) {
-        var _item$titleConfig, _item$titleConfig2, _item$titleConfig3, _item$dataIndex, _ref3;
-        ((_item$titleConfig = item.titleConfig) === null || _item$titleConfig === void 0 ? void 0 : _item$titleConfig.colSpan) !== 0 && ths.push( /*#__PURE__*/_jsx("th", {
-          className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed), (_item$titleConfig2 = item.titleConfig) === null || _item$titleConfig2 === void 0 ? void 0 : _item$titleConfig2.className),
-          colSpan: (_item$titleConfig3 = item.titleConfig) === null || _item$titleConfig3 === void 0 ? void 0 : _item$titleConfig3.colSpan,
+        var _item$titleConfig2, _item$titleConfig3, _item$titleConfig4, _item$dataIndex2, _ref3;
+        var positionIndex = hasControl ? index + 2 : index + 1;
+        if (item.fixed === 'right') {
+          fixRightPosition -= colItems[positionIndex].props.style.width;
+        }
+        var isLastFixedLeft = item.fixed === 'left' && !columns.slice(index + 1).some(function (item) {
+          return item.fixed === 'left';
+        });
+        var isFirstFixedRight = item.fixed === 'right' && !columns.slice(0, index).some(function (item) {
+          return item.fixed === 'right';
+        });
+        positionArr.push({
+          isLastFixedLeft: isLastFixedLeft,
+          isFirstFixedRight: isFirstFixedRight,
+          fixPosition: item.fixed === 'right' ? fixRightPosition : fixLeftPosition
+        });
+        ((_item$titleConfig2 = item.titleConfig) === null || _item$titleConfig2 === void 0 ? void 0 : _item$titleConfig2.colSpan) !== 0 && ths.push( /*#__PURE__*/_jsx("th", {
+          className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed), (_item$titleConfig3 = item.titleConfig) === null || _item$titleConfig3 === void 0 ? void 0 : _item$titleConfig3.className, isLastFixedLeft && isScrolledOver ? "last-fixed-left" : '', isFirstFixedRight && !isScrolledToEnd ? "first-fixed-right" : ''),
+          colSpan: (_item$titleConfig4 = item.titleConfig) === null || _item$titleConfig4 === void 0 ? void 0 : _item$titleConfig4.colSpan,
+          onClick: function onClick(e) {
+            if (item.fixed) return;
+            var target = e.target;
+            if (e.nativeEvent.offsetX <= target.offsetWidth - 8) {
+              var _item$titleConfig5;
+              eventBus.emit('col-select', {
+                col: positionIndex,
+                colSpan: (_item$titleConfig5 = item.titleConfig) === null || _item$titleConfig5 === void 0 ? void 0 : _item$titleConfig5.colSpan
+              });
+            }
+          },
           style: {
             textAlign: (_ref3 = item.align) !== null && _ref3 !== void 0 ? _ref3 : 'unset',
-            left: item.fixed === 'left' ? 0 : 'unset',
-            right: item.fixed === 'right' ? 0 : 'unset'
+            left: item.fixed === 'left' ? fixLeftPosition : 'unset',
+            right: item.fixed === 'right' ? fixRightPosition : 'unset'
           },
           onMouseDown: function onMouseDown(e) {
             var target = e.target;
@@ -82,16 +166,23 @@ export var DraggableShell = function DraggableShell(_ref) {
               downRef.current.mouseDown = true;
               downRef.current.oldX = e.nativeEvent.x;
               downRef.current.oldWidth = downRef.current.offsetWidth;
+              e.preventDefault();
             } else {
               downRef.current = null;
             }
           },
           onMouseMove: function onMouseMove(e) {
             var target = e.target;
-            if (e.nativeEvent.offsetX > target.offsetWidth - 10) {
+            if (target instanceof HTMLSpanElement) {
+              if (target.parentElement instanceof HTMLTableCellElement) {
+                target.parentElement.style.cursor = '';
+              }
+              return;
+            }
+            if (e.nativeEvent.offsetX > target.offsetWidth - 8) {
               target.style.cursor = 'col-resize';
             } else {
-              target.style.cursor = 'default';
+              target.style.cursor = item.fixed ? 'default' : '';
             }
             //取出暂存的Table Cell
             if (downRef.current === undefined) downRef.current = target;
@@ -99,33 +190,18 @@ export var DraggableShell = function DraggableShell(_ref) {
           },
           children: /*#__PURE__*/_jsx("span", {
             className: "value-viewer",
-            children: item.title
+            children: typeof item.title === 'function' ? /*#__PURE__*/createElement(item.title) : item.title
           })
-        }, (_item$dataIndex = item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : index));
-      });
-      return ths;
-    }, [columns]);
-    var colItems = useMemo(function () {
-      var cols = [];
-      if (hasControl) {
-        cols.push( /*#__PURE__*/_jsx("col", {
-          className: classNames('sheet-control'),
-          style: {
-            width: controlWidth
-          }
-        }, "sheet-control"));
-      }
-      columns.forEach(function (item, index) {
-        var _item$dataIndex2;
-        cols.push( /*#__PURE__*/_jsx("col", {
-          className: classNames('cell'),
-          style: {
-            width: widths[index] || item.width || 'unset'
-          }
         }, (_item$dataIndex2 = item.dataIndex) !== null && _item$dataIndex2 !== void 0 ? _item$dataIndex2 : index));
+        if (item.fixed === 'left') {
+          fixLeftPosition += colItems[positionIndex].props.style.width;
+        }
       });
-      return cols;
-    }, [widths, hasControl, columns]);
+      setTimeout(function () {
+        eventBus.emit('change-fixed-position', positionArr);
+      }, 16);
+      return ths;
+    }, [columns, colItems, isScrolledOver, isScrolledToEnd]);
     useEffect(function () {
       var handleMouseUp = function handleMouseUp() {
         //结束宽度调整
@@ -141,14 +217,18 @@ export var DraggableShell = function DraggableShell(_ref) {
           var _downRef$current$oldW, _downRef$current$oldX;
           downRef.current.style.cursor = 'default';
           if (((_downRef$current$oldW = downRef.current.oldWidth) !== null && _downRef$current$oldW !== void 0 ? _downRef$current$oldW : 0) + (e.x - ((_downRef$current$oldX = downRef.current.oldX) !== null && _downRef$current$oldX !== void 0 ? _downRef$current$oldX : 0)) > 0) {
-            var _downRef$current$oldW2, _downRef$current$oldX2, _headRef$current;
+            var _downRef$current$oldW2, _downRef$current$oldX2, _headRef$current, _columns$actualIndex;
             var newWidth = Math.max(Number(((_downRef$current$oldW2 = downRef.current.oldWidth) !== null && _downRef$current$oldW2 !== void 0 ? _downRef$current$oldW2 : 0) + (e.x - ((_downRef$current$oldX2 = downRef.current.oldX) !== null && _downRef$current$oldX2 !== void 0 ? _downRef$current$oldX2 : 0))), 50);
             var cellList = [].slice.call((_headRef$current = headRef.current) === null || _headRef$current === void 0 ? void 0 : _headRef$current.cells);
             var changeIndex = cellList.indexOf(downRef.current);
+            var actualIndex = changeIndex - offset;
+            var isDoubleSpan = (((_columns$actualIndex = columns[actualIndex]) === null || _columns$actualIndex === void 0 || (_columns$actualIndex = _columns$actualIndex.titleConfig) === null || _columns$actualIndex === void 0 ? void 0 : _columns$actualIndex.colSpan) || 0) > 1;
+            var nextColumn = columns[actualIndex + 1] || {};
+            var nextWidth = +String(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.width).replace('px', '');
             //调整该列中的每个Cell
             var _widths2 = _defineProperty({
               length: columns.length
-            }, hasControl ? changeIndex - 1 : changeIndex, newWidth);
+            }, actualIndex, isDoubleSpan ? newWidth - nextWidth : newWidth);
             setWidth(_widths2);
           }
         }
@@ -159,7 +239,7 @@ export var DraggableShell = function DraggableShell(_ref) {
         document.removeEventListener('mouseup', handleMouseUp);
         document.removeEventListener('mousemove', handleMouseMove);
       };
-    }, [hasControl]);
+    }, [hasControl, offset]);
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("table", {
         className: classNames('header', 'harvest-sheet', className),
@@ -171,6 +251,9 @@ export var DraggableShell = function DraggableShell(_ref) {
         children: [/*#__PURE__*/_jsx("colgroup", {
           children: colItems
         }), /*#__PURE__*/_jsx("thead", {
+          style: {
+            pointerEvents: 'all'
+          },
           children: /*#__PURE__*/_jsx("tr", {
             ref: headRef,
             children: thItems

package/dist/core/shell/tableShell.d.ts

@@ -1,5 +1,8 @@
+/// <reference types="react" />
 import type { SheetType } from "../../type";
 import './draggableShell/index.less';
 export declare const TableShell: ({ columns, className, showGroup, showSelect, controlProps, controlWidth, }: SheetType.SheetShell) => import("react").FC<{
     children: React.ReactElement;
+    isScrolledOver: boolean;
+    isScrolledToEnd: boolean;
 }>;

package/dist/core/shell/tableShell.js

@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+import { useSheetEvent } from "../../hooks";
 import { classNames } from "../util";
 import { CheckViewer } from "../viewer/checkViewer";
 import { GroupViewer } from "../viewer/groupViewer";
@@ -15,10 +16,37 @@ export var TableShell = function TableShell(_ref) {
     _ref$controlWidth = _ref.controlWidth,
     controlWidth = _ref$controlWidth === void 0 ? 30 : _ref$controlWidth;
   var TableShell = function TableShell(_ref2) {
-    var children = _ref2.children;
+    var children = _ref2.children,
+      isScrolledOver = _ref2.isScrolledOver,
+      isScrolledToEnd = _ref2.isScrolledToEnd;
+    var eventBus = useSheetEvent();
+    var colItems = useMemo(function () {
+      var cols = [];
+      if (showGroup || showSelect) {
+        cols.push( /*#__PURE__*/_jsx("col", {
+          className: classNames('sheet-control'),
+          style: {
+            width: controlWidth,
+            border: 'none'
+          }
+        }, "sheet-control"));
+      }
+      columns.forEach(function (item, index) {
+        cols.push( /*#__PURE__*/_jsx("col", {
+          className: classNames('cell'),
+          style: {
+            width: item.width || 'unset',
+            border: 'none'
+          }
+        }, item.dataIndex || index));
+      });
+      return cols;
+    }, [columns, showGroup || showSelect, controlWidth]);
     var thItems = useMemo(function () {
       var ths = [];
-      if (showGroup || showSelect) {
+      var hasControl = showGroup || showSelect;
+      var positionArr = [];
+      if (hasControl) {
         var _controlProps$group, _controlProps$check, _controlProps$check2, _controlProps$check3;
         ths.push( /*#__PURE__*/_jsxs("th", {
           className: "cell cell-title read-only sheet-control",
@@ -27,59 +55,79 @@ export var TableShell = function TableShell(_ref) {
             col: -1,
             value: true,
             record: {
-              open: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$group = controlProps.group) === null || _controlProps$group === void 0 ? void 0 : _controlProps$group.open,
+              open: controlProps === null || controlProps === void 0 || (_controlProps$group = controlProps.group) === null || _controlProps$group === void 0 ? void 0 : _controlProps$group.open,
               isHeader: true
             }
           }), showSelect && /*#__PURE__*/_jsx(CheckViewer, {
             row: -1,
             col: -1,
-            value: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$check = controlProps.check) === null || _controlProps$check === void 0 ? void 0 : _controlProps$check.checked,
+            value: controlProps === null || controlProps === void 0 || (_controlProps$check = controlProps.check) === null || _controlProps$check === void 0 ? void 0 : _controlProps$check.checked,
             record: {
-              open: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$check2 = controlProps.check) === null || _controlProps$check2 === void 0 ? void 0 : _controlProps$check2.checked,
+              open: controlProps === null || controlProps === void 0 || (_controlProps$check2 = controlProps.check) === null || _controlProps$check2 === void 0 ? void 0 : _controlProps$check2.checked,
               isHeader: true,
-              indeterminate: controlProps === null || controlProps === void 0 ? void 0 : (_controlProps$check3 = controlProps.check) === null || _controlProps$check3 === void 0 ? void 0 : _controlProps$check3.indeterminate
+              indeterminate: controlProps === null || controlProps === void 0 || (_controlProps$check3 = controlProps.check) === null || _controlProps$check3 === void 0 ? void 0 : _controlProps$check3.indeterminate
             }
           })]
         }, "-1"));
+        positionArr.push({
+          isLastFixedLeft: false,
+          isFirstFixedRight: false,
+          fixPosition: 0
+        });
       }
+      var fixLeftPosition = 0;
+      var fixRightPosition = columns.reduce(function (pre, cur, index) {
+        if (cur.fixed === 'right') {
+          var positionIndex = hasControl ? index + 1 : index;
+          return pre + colItems[positionIndex].props.style.width;
+        }
+        return pre + 0;
+      }, 0);
       columns.forEach(function (item, index) {
         var _item$titleConfig, _item$titleConfig2, _ref3;
+        var positionIndex = hasControl ? index + 1 : index;
+        if (item.fixed === 'right') {
+          fixRightPosition -= colItems[positionIndex].props.style.width;
+        }
+        var isLastFixedLeft = item.fixed === 'left' && !columns.slice(index + 1).some(function (item) {
+          return item.fixed === 'left';
+        });
+        var isFirstFixedRight = item.fixed === 'right' && !columns.slice(0, index).some(function (item) {
+          return item.fixed === 'right';
+        });
+        positionArr.push({
+          isLastFixedLeft: isLastFixedLeft,
+          isFirstFixedRight: isFirstFixedRight,
+          fixPosition: item.fixed === 'right' ? fixRightPosition : fixLeftPosition
+        });
         ((_item$titleConfig = item.titleConfig) === null || _item$titleConfig === void 0 ? void 0 : _item$titleConfig.colSpan) !== 0 && ths.push( /*#__PURE__*/_jsx("th", {
-          className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed)),
+          className: classNames('cell', 'cell-title', 'read-only', item.fixed && 'fixed', item.fixed && "fixed-".concat(item.fixed), isLastFixedLeft && isScrolledOver ? "last-fixed-left" : '', isFirstFixedRight && !isScrolledToEnd ? "first-fixed-right" : ''),
           colSpan: (_item$titleConfig2 = item.titleConfig) === null || _item$titleConfig2 === void 0 ? void 0 : _item$titleConfig2.colSpan,
+          onClick: function onClick() {
+            eventBus.emit('col-select', {
+              col: index
+            });
+          },
           style: {
             textAlign: (_ref3 = item.align) !== null && _ref3 !== void 0 ? _ref3 : 'unset',
-            left: item.fixed === 'left' ? 0 : 'unset',
-            right: item.fixed === 'right' ? 0 : 'unset'
+            cursor: 'e-resizer',
+            left: item.fixed === 'left' ? fixLeftPosition : 'unset',
+            right: item.fixed === 'right' ? fixRightPosition : 'unset'
           },
           children: /*#__PURE__*/_jsx("span", {
             className: "value-viewer",
             children: item.title
           })
         }, item.dataIndex || index));
+        if (item.fixed === 'left') {
+          fixLeftPosition += colItems[positionIndex].props.style.width;
+        }
       });
+      setTimeout(function () {
+        eventBus.emit('change-fixed-position', positionArr);
+      }, 16);
       return ths;
-    }, [columns, showGroup || showSelect, controlProps]);
-    var colItems = useMemo(function () {
-      var cols = [];
-      if (showGroup || showSelect) {
-        cols.push( /*#__PURE__*/_jsx("col", {
-          className: classNames('sheet-control'),
-          style: {
-            width: controlWidth
-          }
-        }, "sheet-control"));
-      }
-      columns.forEach(function (item, index) {
-        cols.push( /*#__PURE__*/_jsx("col", {
-          className: classNames('cell'),
-          style: {
-            width: item.width || 'unset'
-          }
-        }, item.dataIndex || index));
-      });
-      return cols;
-    }, [columns, showGroup || showSelect, controlWidth]);
+    }, [columns, showGroup || showSelect, controlProps, isScrolledOver, isScrolledToEnd]);
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("table", {
         className: classNames('header', 'harvest-sheet', className),

package/dist/core/table/addButton.d.ts

@@ -0,0 +1,6 @@
+import React from "react";
+import './index.less';
+export declare const AddButton: React.FC<{
+    handleAdd?: () => void;
+    handleBatchAdd?: (count: number) => void;
+}>;

package/dist/core/table/addButton.js

@@ -0,0 +1,103 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { MoreOutlined } from "@ant-design/icons";
+import { Form, InputNumber, Popover, Button } from "antd";
+import React, { useEffect, useRef, useState } from "react";
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var RowPop = function RowPop(props) {
+  var handleBatchAdd = props.handleBatchAdd;
+  var inputRef = useRef(null);
+  useEffect(function () {
+    var interval = setInterval(function () {
+      var _inputRef$current;
+      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
+    }, 200);
+    return function () {
+      clearInterval(interval);
+    };
+  }, []);
+  if (!handleBatchAdd) {
+    return null;
+  }
+  return /*#__PURE__*/_jsx(Form, {
+    initialValues: {
+      count: 10
+    },
+    onFinish: function onFinish(values) {
+      handleBatchAdd && handleBatchAdd(values.count);
+    },
+    children: /*#__PURE__*/_jsx(Form.Item, {
+      style: {
+        marginBottom: 0
+      },
+      label: "\u884C\u6570",
+      name: "count",
+      children: /*#__PURE__*/_jsx(InputNumber, {
+        style: {
+          width: 100
+        },
+        ref: inputRef,
+        min: 1,
+        max: 100,
+        onClick: function onClick(e) {
+          e.stopPropagation();
+        }
+      })
+    })
+  });
+};
+export var AddButton = function AddButton(props) {
+  var handleAdd = props.handleAdd,
+    _handleBatchAdd = props.handleBatchAdd;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  if (!handleAdd && !_handleBatchAdd) {
+    return null;
+  }
+  return /*#__PURE__*/_jsxs(Button, {
+    type: "dashed",
+    style: {
+      width: '100%',
+      height: 32,
+      backgroundColor: '#fff'
+    },
+    onClick: function onClick() {
+      handleAdd && handleAdd();
+    },
+    children: ["+ \u6DFB\u52A0", _handleBatchAdd && /*#__PURE__*/_jsx(Popover, {
+      open: open,
+      onOpenChange: setOpen,
+      trigger: ['click'],
+      destroyTooltipOnHide: true,
+      overlayClassName: "batch-add-pop",
+      content: /*#__PURE__*/_jsx("div", {
+        className: "batch-add-pop-content",
+        onClick: function onClick(e) {
+          return e.stopPropagation();
+        },
+        children: /*#__PURE__*/_jsx(RowPop, {
+          handleBatchAdd: function handleBatchAdd(value) {
+            _handleBatchAdd && _handleBatchAdd(value);
+            setOpen(false);
+          }
+        })
+      }),
+      children: /*#__PURE__*/_jsx(MoreOutlined, {
+        style: {
+          marginLeft: 0
+        },
+        onClick: function onClick(e) {
+          e.stopPropagation();
+        }
+      })
+    })]
+  });
+};

package/dist/core/table/events.d.ts

@@ -7,9 +7,7 @@ export declare const SelectionEvent: FC<{
 }>;
 export declare const GroupEvent: FC<{
     hasChildren: boolean;
-    rowGroupConfig: SheetType.RowGroupConfig;
     data: SheetType.Cell[][];
     sheetInstance: SheetType.SheetInstance | null;
-    onGroupChange: (value: SheetType.RowGroupConfig) => void;
     onGridChange: (value: SheetType.Cell[][]) => void;
 }>;