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

package/dist/core/reducers/keyboardReducer.js

@@ -71,7 +71,8 @@ export var keyboardReducer = {
       end = state.end,
       editing = state.editing,
       data = state.data;
-    if (!start || !end || data !== null && data !== void 0 && (_data$start$row = data[start.row]) !== null && _data$start$row !== void 0 && _data$start$row[start.col].readonly || !(data !== null && data !== void 0 && (_data$start$row2 = data[start.row]) !== null && _data$start$row2 !== void 0 && _data$start$row2[start.col].editable)) {
+    var freeze = state.freeze;
+    if (!start || !end || data !== null && data !== void 0 && (_data$start$row = data[start.row]) !== null && _data$start$row !== void 0 && _data$start$row[start.col].readonly || !(data !== null && data !== void 0 && (_data$start$row2 = data[start.row]) !== null && _data$start$row2 !== void 0 && _data$start$row2[start.col].editable) || freeze) {
       return state;
     }
     if (!editing) {

package/dist/core/reducers/mouseReducer.js

@@ -164,8 +164,9 @@ export var mouseReducer = {
     var _ref4 = payload,
       row = _ref4.row,
       col = _ref4.col;
-    var data = state.data;
-    if (data !== null && data !== void 0 && (_data$row$col = data[row][col]) !== null && _data$row$col !== void 0 && _data$row$col.readonly) {
+    var data = state.data,
+      freeze = state.freeze;
+    if (data !== null && data !== void 0 && (_data$row$col = data[row][col]) !== null && _data$row$col !== void 0 && _data$row$col.readonly || freeze) {
       return state;
     }
     return _objectSpread(_objectSpread({}, state), {}, {

package/dist/core/reducers/sideEffectReducer.js

@@ -206,12 +206,12 @@ export var sideEffectReducer = {
   paste: function paste(dispatch, getState) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _extChanges$;
-      var _getState8, start, end, cellChangeHandler, history, _getState8$freePaste, freePaste, data, groupConfig, pasteData, changeInfo, changes, extChanges, legalChanges, lastRow, lastIndex, legalExtChanges, newHistory;
+      var _getState8, start, end, cellChangeHandler, history, _getState8$freePaste, freePaste, data, freeze, groupConfig, pasteData, changeInfo, changes, extChanges, legalChanges, lastRow, lastIndex, legalExtChanges, newHistory;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _getState8 = getState(), start = _getState8.start, end = _getState8.end, cellChangeHandler = _getState8.cellChangeHandler, history = _getState8.history, _getState8$freePaste = _getState8.freePaste, freePaste = _getState8$freePaste === void 0 ? false : _getState8$freePaste, data = _getState8.data, groupConfig = _getState8.groupConfig;
-            if (!(!start || !end)) {
+            _getState8 = getState(), start = _getState8.start, end = _getState8.end, cellChangeHandler = _getState8.cellChangeHandler, history = _getState8.history, _getState8$freePaste = _getState8.freePaste, freePaste = _getState8$freePaste === void 0 ? false : _getState8$freePaste, data = _getState8.data, freeze = _getState8.freeze, groupConfig = _getState8.groupConfig;
+            if (!(!start || !end || freeze)) {
               _context.next = 3;
               break;
             }

package/dist/core/sheet/Remark.d.ts

@@ -0,0 +1,9 @@
+import { ReactNode } from 'react';
+export declare const Remark: import("react").ForwardRefExoticComponent<{
+    children?: ReactNode;
+    showRemark: boolean;
+    position: {
+        top: number;
+        left: number;
+    };
+} & import("react").RefAttributes<HTMLDivElement>>;

package/dist/core/sheet/Remark.js

@@ -0,0 +1,29 @@
+import { forwardRef, useMemo } from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+export var Remark = /*#__PURE__*/forwardRef(function (props, ref) {
+  var showRemark = props.showRemark,
+    children = props.children,
+    position = props.position;
+  var transform = useMemo(function () {
+    if (document.body.clientWidth - position.left < 200) {
+      return 'translate(-100%,40px)';
+    }
+    return '';
+  }, [position.left]);
+  return /*#__PURE__*/_jsx("div", {
+    ref: ref,
+    children: /*#__PURE__*/_jsx("div", {
+      className: "harvest-remark-container",
+      style: {
+        position: 'fixed',
+        top: position.top,
+        left: position.left,
+        transform: transform,
+        opacity: showRemark ? 1 : 0,
+        pointerEvents: showRemark ? 'all' : 'none',
+        minWidth: showRemark ? 200 : 0
+      },
+      children: showRemark ? children : null
+    })
+  });
+});

package/dist/core/sheet/index.js

@@ -18,12 +18,14 @@ import { classNames, getRowHeight, rowToActualRow } from "../util";
 import { Control } from "./Control";
 import { DefaultRowMapper } from "./DefaultRowMapper";
 import { Menu } from "./Menu";
+import { Remark } from "./Remark";
 import "./index.less";
 import { SearchInput } from "./searchInput";
 import { useCellEvent } from "./useCellEvent";
 import { useContextMenu } from "./useContextMenu";
 import { useKeyBoardEvent } from "./useKeyBoardEvent";
 import { useMouseEvent } from "./useMouseEvent";
+import { useRemarkContainer } from "./useRemarkContainer";
 import { useSearchInput } from "./useSearchInput";
 import { useSelectVisible } from "./useSelectVisible";
 import { VirtualizeEnd, VirtualizeStart, useVirtualList } from "./useVirtualList";
@@ -49,6 +51,7 @@ var Sheet = function Sheet(props) {
     virtualized = _props$virtualized === void 0 ? false : _props$virtualized,
     className = props.className,
     data = props.data,
+    freeze = props.freeze,
     _props$freePaste = props.freePaste,
     freePaste = _props$freePaste === void 0 ? false : _props$freePaste,
     onCellsChanged = props.onCellsChanged,
@@ -56,6 +59,7 @@ var Sheet = function Sheet(props) {
     rowClassName = props.rowClassName,
     scroll = props.scroll,
     children = props.children,
+    ControlContainer = props.ControlContainer,
     _props$showBackEdit = props.showBackEdit,
     showBackEdit = _props$showBackEdit === void 0 ? true : _props$showBackEdit,
     backEditStyle = props.backEditStyle,
@@ -65,7 +69,9 @@ var Sheet = function Sheet(props) {
     hideColBar = _props$hideColBar === void 0 ? true : _props$hideColBar,
     _props$showQuickLocat = props.showQuickLocationBtn,
     showQuickLocationBtn = _props$showQuickLocat === void 0 ? false : _props$showQuickLocat,
-    ControlContainer = props.ControlContainer;
+    _props$showRemark = props.showRemark,
+    showRemark = _props$showRemark === void 0 ? false : _props$showRemark,
+    remarkElement = props.remarkElement;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isScrolledOver = _useState2[0],
@@ -126,10 +132,16 @@ var Sheet = function Sheet(props) {
       },
       goTo: function goTo(row, col) {
         dispatch(function (d, getState) {
-          var _sheetWrapperRef$curr4;
           var _getState2 = getState(),
             groupConfig = _getState2.groupConfig,
-            data = _getState2.data;
+            data = _getState2.data,
+            eventBus = _getState2.eventBus;
+          var nextLoop = groupConfig === null || groupConfig === void 0 ? void 0 : groupConfig.groupOpen.some(function (v) {
+            return !v;
+          });
+          if (nextLoop) {
+            eventBus === null || eventBus === void 0 || eventBus.emit('group-open-title', true);
+          }
           var container = sheetWrapperRef.current;
           if (isNil(row) || isNil(col)) return;
           var actual = rowToActualRow(row, groupConfig, data.length);
@@ -137,7 +149,15 @@ var Sheet = function Sheet(props) {
           var firstRowCell = container.querySelector("td.cell[data-col='".concat(col, "']"));
           var colPosition = firstRowCell ? firstRowCell.offsetLeft - firstRowCell.clientWidth : 0;
           var scrollHeight = actual * rowHeight;
-          (_sheetWrapperRef$curr4 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr4 === void 0 || _sheetWrapperRef$curr4.scrollTo(colPosition, scrollHeight);
+          if (nextLoop) {
+            setTimeout(function () {
+              var _sheetWrapperRef$curr4;
+              (_sheetWrapperRef$curr4 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr4 === void 0 || _sheetWrapperRef$curr4.scrollTo(colPosition, scrollHeight);
+            }, 1);
+          } else {
+            var _sheetWrapperRef$curr5;
+            (_sheetWrapperRef$curr5 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr5 === void 0 || _sheetWrapperRef$curr5.scrollTo(colPosition, scrollHeight);
+          }
         });
       },
       pushToHistory: function pushToHistory(config) {
@@ -191,22 +211,25 @@ var Sheet = function Sheet(props) {
         cellChangeHandler: onCellsChanged,
         data: data,
         freePaste: freePaste,
-        groupConfig: groupConfig
+        groupConfig: groupConfig,
+        freeze: freeze
       }
     });
-  }, [onCellsChanged, data, freePaste, groupConfig]);
+  }, [onCellsChanged, data, freePaste, groupConfig, freeze]);
   useCellEvent(dispatch, state);
   useMouseEvent(dispatch, sheetWrapperRef);
   useKeyBoardEvent(dispatch, sheetWrapperRef);
   var menu = useContextMenu(dispatch, sheetWrapperRef, !!ContextMenu, contextMenuRef);
+  var _useRemarkContainer = useRemarkContainer(sheetWrapperRef, state.start, state.editing, showRemark),
+    remarkInfo = _useRemarkContainer.remarkInfo;
 
   // timeout 的副作用不适合放reducer里面
   useEffect(function () {
     if (!state.editing && state.start) {
       setTimeout(function () {
-        var _sheetWrapperRef$curr5;
+        var _sheetWrapperRef$curr6;
         // 表格获取焦点 + 接收keyboard event
-        (_sheetWrapperRef$curr5 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr5 === void 0 || _sheetWrapperRef$curr5.focus({
+        (_sheetWrapperRef$curr6 = sheetWrapperRef.current) === null || _sheetWrapperRef$curr6 === void 0 || _sheetWrapperRef$curr6.focus({
           preventScroll: true
         });
       }, 1);
@@ -235,6 +258,13 @@ var Sheet = function Sheet(props) {
     changeSearch = _useSearchInput.changeSearch,
     goNext = _useSearchInput.goNext,
     goLast = _useSearchInput.goLast;
+  useEffect(function () {
+    if (!state.mouseDown && state.start && state.end && state.start.row === state.end.row && state.start.col === state.end.col) {
+      eventBus.emit('cell-select-single', state.start);
+    } else {
+      eventBus.emit('cell-select-single', null);
+    }
+  }, [state.start, state.end, state.mouseDown]);
   useEffect(function () {
     dispatch({
       type: 'clearEdit'
@@ -356,6 +386,13 @@ var Sheet = function Sheet(props) {
             showMenu: menu.showMenu,
             contextMenu: ContextMenu,
             onContextMenu: onContextMenu
+          }), /*#__PURE__*/_jsx(Remark, {
+            showRemark: remarkInfo.show && !menu.showMenu,
+            position: {
+              left: remarkInfo.position.left,
+              top: remarkInfo.position.top
+            },
+            children: remarkElement
           }), EmptyElement]
         }), /*#__PURE__*/_jsxs("div", {
           className: "harvest-sheet-control",

package/dist/core/sheet/index.less

@@ -378,3 +378,16 @@ span.harvest-sheet-container:focus {
     color: #a4a9b2;
   }
 }
+.harvest-sheet-container .harvest-remark-container{
+  opacity: 1;
+  border:1px solid #E5E5E5;
+  border-radius: 2px;
+  z-index: 10;
+  margin-left: 5px;
+  transition: min-height .2s linear,height .2s linear;
+  padding: 8px;
+  overflow: hidden;
+  background: rgb(255,255,255);
+  // box-shadow: 2px 2px 5px #888888;
+  box-shadow: 0 4px 8px rgba(216,223,235,.5);
+}

package/dist/core/sheet/useContextMenu.js

@@ -37,10 +37,10 @@ export var useContextMenu = function useContextMenu(dispatch, elementRef) {
     if (!currentCell) return;
     var currentPos = extractDataRowAndCol(currentCell);
     dispatch({
-      type: 'mouseDown',
+      type: 'select',
       payload: {
-        pos: currentPos,
-        shiftKey: e.shiftKey
+        start: currentPos,
+        end: currentPos
       }
     });
     var _calcMenuPosition = calcMenuPosition({

package/dist/core/sheet/useRemarkContainer.d.ts

@@ -0,0 +1,14 @@
+import { SheetType } from "../../type";
+export declare const useRemarkContainer: (elementRef: React.RefObject<SheetType.refAssertion>, start?: SheetType.CellPosition, editing?: SheetType.CellPosition, showRemark?: boolean) => {
+    remarkInfo: {
+        position: {
+            top: number;
+            left: number;
+        };
+        cellPosition: {
+            row: number;
+            col: number;
+        };
+        show: boolean;
+    };
+};

package/dist/core/sheet/useRemarkContainer.js

@@ -0,0 +1,121 @@
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(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(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 { useSetState } from "../../hooks";
+import { throttle } from 'lodash';
+import { useCallback, useEffect } from 'react';
+export var useRemarkContainer = function useRemarkContainer(elementRef, start, editing) {
+  var showRemark = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var _useSetState = useSetState({
+      position: {
+        top: 0,
+        left: 0
+      },
+      cellPosition: {
+        row: 0,
+        col: 0
+      },
+      show: showRemark
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    remarkInfo = _useSetState2[0],
+    setRemarkInfo = _useSetState2[1];
+  var calcPosition = useCallback(function () {
+    if (!start || !showRemark || !elementRef.current) {
+      return;
+    }
+    var cell = elementRef.current.querySelector("td[data-row=\"".concat(start.row, "\"][data-col=\"").concat(start.col, "\"]"));
+    if (!cell) {
+      return;
+    }
+    var containerRect = elementRef.current.getBoundingClientRect();
+    var cellRect = cell.getBoundingClientRect();
+    var visible = containerRect.top < cellRect.top && containerRect.left < cellRect.left && containerRect.top + (containerRect === null || containerRect === void 0 ? void 0 : containerRect.height) > cellRect.bottom && containerRect.left + (containerRect === null || containerRect === void 0 ? void 0 : containerRect.width) > (cellRect === null || cellRect === void 0 ? void 0 : cellRect.right);
+    return {
+      top: cellRect.y,
+      left: cellRect.x + cellRect.width,
+      visible: visible
+    };
+  }, [start, showRemark]);
+  useEffect(function () {
+    var position = calcPosition();
+    if (!position) {
+      return;
+    }
+    setRemarkInfo({
+      position: position
+    });
+  }, [start, showRemark]);
+  useEffect(function () {
+    setRemarkInfo({
+      show: showRemark && !editing
+    });
+  }, [showRemark, editing]);
+  useEffect(function () {
+    var _elementRef$current, _elementRef$current2;
+    var remarkScroll = throttle(function () {
+      setRemarkInfo({
+        show: false
+      });
+    }, 50);
+    var remarkScrollEnd = function remarkScrollEnd() {
+      var position = calcPosition();
+      if (!position) {
+        return;
+      }
+      setRemarkInfo({
+        position: position,
+        show: position.visible && showRemark && !editing && position.left > 0 && position.top > 0
+      });
+    };
+    (_elementRef$current = elementRef.current) === null || _elementRef$current === void 0 || _elementRef$current.addEventListener('scroll', remarkScroll);
+    (_elementRef$current2 = elementRef.current) === null || _elementRef$current2 === void 0 || _elementRef$current2.addEventListener('scrollend', remarkScrollEnd);
+    return function () {
+      var _elementRef$current3, _elementRef$current4;
+      (_elementRef$current3 = elementRef.current) === null || _elementRef$current3 === void 0 || _elementRef$current3.removeEventListener('scroll', remarkScroll);
+      (_elementRef$current4 = elementRef.current) === null || _elementRef$current4 === void 0 || _elementRef$current4.removeEventListener('scrollend', remarkScrollEnd);
+    };
+  }, [start, showRemark, editing]);
+  useEffect(function () {
+    var _elementRef$current5;
+    if (!start) return;
+    var cell = (_elementRef$current5 = elementRef.current) === null || _elementRef$current5 === void 0 ? void 0 : _elementRef$current5.querySelector("td[data-row=\"".concat(start.row, "\"][data-col=\"").concat(start.col, "\"]"));
+    if (!cell) return;
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    if (!cell) {
+      return function () {};
+    }
+    var io = new IntersectionObserver(function (entries) {
+      var ratio = entries[0].intersectionRatio;
+      if (ratio < 1) {
+        setRemarkInfo({
+          show: false
+        });
+      }
+    }, {
+      threshold: 1
+    });
+    io.observe(cell);
+    return function () {
+      var _io2;
+      if (cell) {
+        var _io;
+        (_io = io) === null || _io === void 0 || _io.unobserve(cell);
+      }
+      (_io2 = io) === null || _io2 === void 0 || _io2.disconnect();
+      io = undefined;
+    };
+  }, [start]);
+  return {
+    remarkInfo: _objectSpread({}, remarkInfo)
+  };
+};

package/dist/core/shell/draggableShell/index.d.ts

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

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

@@ -23,6 +23,8 @@ export var DraggableShell = function DraggableShell(_ref) {
     showGroup = _ref.showGroup,
     showSelect = _ref.showSelect,
     controlProps = _ref.controlProps,
+    _ref$dragable = _ref.dragable,
+    dragable = _ref$dragable === void 0 ? true : _ref$dragable,
     _ref$controlWidth = _ref.controlWidth,
     controlWidth = _ref$controlWidth === void 0 ? 30 : _ref$controlWidth;
   var TableShell = function TableShell(_ref2) {
@@ -203,6 +205,9 @@ export var DraggableShell = function DraggableShell(_ref) {
       return ths;
     }, [columns, colItems, isScrolledOver, isScrolledToEnd]);
     useEffect(function () {
+      if (!dragable) {
+        return;
+      }
       var handleMouseUp = function handleMouseUp() {
         //结束宽度调整
         if (downRef.current) {

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

@@ -1,8 +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;
+export declare const TableShell: (props: SheetType.SheetShell) => import("react").FC<{
+    children: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     isScrolledOver: boolean;
     isScrolledToEnd: boolean;
 }>;

package/dist/core/shell/tableShell.js

@@ -1,157 +1,13 @@
-import { useMemo } from 'react';
-import { useSheetEvent } from "../../hooks";
-import { classNames } from "../util";
-import { CheckViewer } from "../viewer/checkViewer";
-import { GroupViewer } from "../viewer/groupViewer";
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(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); }
 import "./draggableShell/index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-export var TableShell = function TableShell(_ref) {
-  var columns = _ref.columns,
-    className = _ref.className,
-    showGroup = _ref.showGroup,
-    showSelect = _ref.showSelect,
-    controlProps = _ref.controlProps,
-    _ref$controlWidth = _ref.controlWidth,
-    controlWidth = _ref$controlWidth === void 0 ? 30 : _ref$controlWidth;
-  var TableShell = function TableShell(_ref2) {
-    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 = [];
-      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",
-          children: [showGroup && /*#__PURE__*/_jsx(GroupViewer, {
-            row: -1,
-            col: -1,
-            value: true,
-            record: {
-              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 || (_controlProps$check = controlProps.check) === null || _controlProps$check === void 0 ? void 0 : _controlProps$check.checked,
-            record: {
-              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 || (_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), 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',
-            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, isScrolledOver, isScrolledToEnd]);
-    return /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsxs("table", {
-        className: classNames('header', 'harvest-sheet', className),
-        style: {
-          position: 'sticky',
-          top: 0,
-          zIndex: 3
-        },
-        children: [/*#__PURE__*/_jsx("colgroup", {
-          children: colItems
-        }), /*#__PURE__*/_jsx("thead", {
-          children: /*#__PURE__*/_jsx("tr", {
-            children: thItems
-          })
-        })]
-      }, "header"), /*#__PURE__*/_jsxs("table", {
-        className: classNames('body', 'harvest-sheet'),
-        children: [/*#__PURE__*/_jsx("colgroup", {
-          children: colItems
-        }), /*#__PURE__*/_jsx("tbody", {
-          children: children
-        }, "tbody")]
-      }, "body")]
-    });
-  };
-  return TableShell;
+import { DraggableShell } from "./draggableShell";
+export var TableShell = function TableShell(props) {
+  return DraggableShell(_objectSpread(_objectSpread({}, props), {}, {
+    dragable: false
+  }));
 };

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

@@ -1,5 +1,4 @@
 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

@@ -7,7 +7,6 @@ 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) {

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
 import { SheetTableType } from "../../type";
+import './index.less';
 declare const Table: React.FC<SheetTableType.TableProps>;
 export default Table;