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

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";
@@ -56,6 +58,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 +68,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],
@@ -199,6 +204,8 @@ var Sheet = function Sheet(props) {
   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 () {
@@ -235,6 +242,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'
@@ -322,6 +336,7 @@ var Sheet = function Sheet(props) {
       handleScroll();
     }
   }, []);
+  console.log(menu.showMenu);
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
     children: /*#__PURE__*/_jsxs(_Fragment, {
@@ -356,6 +371,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,120 @@
+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 { useCallback, useEffect } from 'react';
+import { debounce } from 'lodash';
+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 = debounce(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;
+      console.log('io-ratio', ratio);
+      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;

package/dist/core/table/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "handleBatchAdd", "draggable", "eventHandler"];
+var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "handleBatchAdd", "draggable", "eventHandler", "remarkRender", "handleAddRemark", "showRemark"];
 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; }
@@ -23,6 +23,8 @@ import { DraggableShell } from "../shell/draggableShell";
 import { TableShell } from "../shell/tableShell";
 import { AddButton } from "./addButton";
 import { GroupEvent, SelectionEvent } from "./events";
+import "./index.less";
+import { RemarkEvent } from "./remarkEvent";
 import { formatGroupData, useGroupConfig } from "./useGroupConfig";
 import { formatSelectionData, useRowSelection } from "./useRowSelection";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -39,6 +41,10 @@ var Table = function Table(_ref) {
     handleBatchAdd = _ref.handleBatchAdd,
     draggable = _ref.draggable,
     eventHandler = _ref.eventHandler,
+    remarkRender = _ref.remarkRender,
+    handleAddRemark = _ref.handleAddRemark,
+    _ref$showRemark = _ref.showRemark,
+    showRemark = _ref$showRemark === void 0 ? false : _ref$showRemark,
     args = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState([[]]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -74,9 +80,10 @@ var Table = function Table(_ref) {
     setData(formatGroupData({
       dataSource: dataSource,
       columns: columns,
-      rowKey: rowKey
+      rowKey: rowKey,
+      showRemark: showRemark
     }));
-  }, [dataSource, columns, hasChildren, rowKey]);
+  }, [dataSource, columns, hasChildren, rowKey, showRemark]);
   useEffect(function () {
     if (hasChildren) return;
     if (!dataSource || !columns) return;
@@ -85,9 +92,10 @@ var Table = function Table(_ref) {
       columns: columns,
       checked: checkedRow,
       rowKey: rowKey,
-      rowSelection: rowSelection
+      rowSelection: rowSelection,
+      showRemark: showRemark
     }));
-  }, [dataSource, columns, checkedRow, hasChildren, rowKey, rowSelection]);
+  }, [dataSource, columns, checkedRow, hasChildren, rowKey, rowSelection, showRemark]);
   useEffect(function () {
     if (!dataSource || !columns) {
       setData([[]]);
@@ -167,6 +175,69 @@ var Table = function Table(_ref) {
       }
     });
   }, [columns.length, columnsTitle, draggable, headSelection, hasChildren]);
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showRemarkPop = _useState4[0],
+    setShowRemark = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    remarkInfo = _useState6[0],
+    setRemarkInfo = _useState6[1];
+  var handleCellClick = useCallback(function (cell) {
+    var _columns$dataIndex, _data$row, _data$row2;
+    var _ref4 = cell !== null && cell !== void 0 ? cell : {},
+      col = _ref4.col,
+      row = _ref4.row;
+    if (!cell || !(columns !== null && columns !== void 0 && columns.length) || !(data !== null && data !== void 0 && data.length) || !columns[col - offset]) {
+      //remove pop
+      setShowRemark(false);
+      return;
+    }
+    var columnKey = (_columns$dataIndex = columns[col - offset].dataIndex) !== null && _columns$dataIndex !== void 0 ? _columns$dataIndex : '';
+    setRemarkInfo({
+      cell: cell,
+      columnKey: columnKey,
+      id: data === null || data === void 0 || (_data$row = data[row]) === null || _data$row === void 0 || (_data$row = _data$row[col]) === null || _data$row === void 0 || (_data$row = _data$row.record) === null || _data$row === void 0 ? void 0 : _data$row.id
+    });
+    setShowRemark(!!(data !== null && data !== void 0 && (_data$row2 = data[row]) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2[col]) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2.record) !== null && _data$row2 !== void 0 && (_data$row2 = _data$row2.remarks) !== null && _data$row2 !== void 0 && _data$row2.includes(columnKey)));
+  }, [offset, columns, data]);
+  var remarkElement = useMemo(function () {
+    if (!showRemark || !remarkInfo) {
+      return null;
+    }
+    return remarkRender === null || remarkRender === void 0 ? void 0 : remarkRender(remarkInfo);
+  }, [remarkRender, remarkInfo, showRemark]);
+  var menuRenderer = args.menuRenderer;
+  var wrappMenuRenderer = useMemo(function () {
+    var remarkMenu = /*#__PURE__*/_jsx("div", {
+      className: "harvest-menu-item",
+      onClick: function onClick() {
+        return remarkInfo && (handleAddRemark === null || handleAddRemark === void 0 ? void 0 : handleAddRemark(remarkInfo));
+      },
+      children: "\u6DFB\u52A0\u8BC4\u8BBA"
+    });
+    if (!menuRenderer) {
+      if (showRemark) {
+        return function (props) {
+          return /*#__PURE__*/_jsx("div", {
+            className: "harvest-menu",
+            style: _objectSpread({}, props.position),
+            children: remarkMenu
+          });
+        };
+      }
+      return undefined;
+    } else {
+      return function (props) {
+        var MenuFC = menuRenderer;
+        return /*#__PURE__*/_jsxs(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+          children: [remarkMenu, /*#__PURE__*/_jsx("div", {
+            className: "harvest-menu-divider"
+          })]
+        }));
+      };
+    }
+  }, [showRemark, showRemarkPop, menuRenderer, remarkInfo]);
   return /*#__PURE__*/_jsx(ConfigProvider, {
     renderEmpty: function renderEmpty() {
       return /*#__PURE__*/_jsx(Empty, {
@@ -184,11 +255,14 @@ var Table = function Table(_ref) {
           onChange: setGroupConfig
         },
         children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
+          menuRenderer: wrappMenuRenderer,
+          showRemark: showRemarkPop,
           sheetInstance: sheetInstance,
           sheetRenderer: WrappedTableShell,
           data: data,
           onCellsChanged: handleChanges,
           handleAdd: handleAdd,
+          remarkElement: remarkElement,
           children: [/*#__PURE__*/_jsx(SelectionEvent, {
             hasChildren: hasChildren,
             rowSelection: rowSelection,
@@ -201,7 +275,9 @@ var Table = function Table(_ref) {
           }), /*#__PURE__*/_jsx(SheetEvent, {
             name: "reverse",
             handler: handleReverse
-          }, "_reverse"), Object.keys(eventHandler || {}).map(function (key) {
+          }, "_reverse"), /*#__PURE__*/_jsx(RemarkEvent, {
+            handler: handleCellClick
+          }), Object.keys(eventHandler || {}).map(function (key) {
             return /*#__PURE__*/_jsx(SheetEvent, {
               name: key,
               handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]

package/dist/core/table/index.less

@@ -9,4 +9,23 @@
       }
     }
   }
+}
+.remark-cell{
+  position: relative !important;
+  overflow: hidden;
+  &::before{
+    position: absolute;
+    transform: translate(6px,-6px);
+    content: '';
+    top:4px;
+    right:4px;
+    border:4px solid transparent;
+    border-top-color: red;
+    border-right-color: red;
+  }
+}
+.harvest-menu-divider{
+  margin: 5px 8px;
+  height: 1px;
+  background-color: rgb(235, 235, 235);
 }

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { SheetType } from "../../type";
+export declare const RemarkEvent: React.FC<{
+    handler: (value: SheetType.CellPosition) => void;
+}>;

package/dist/core/table/remarkEvent.js

@@ -0,0 +1,13 @@
+import { SheetEvent } from "../sheet/Event";
+import { jsx as _jsx } from "react/jsx-runtime";
+export var RemarkEvent = function RemarkEvent(_ref) {
+  var handler = _ref.handler;
+  // const handleClick = useCallback((value: SheetType.CellPosition) => {
+  //   if (!value) return;
+  //   console.log(value);
+  // }, []);
+  return /*#__PURE__*/_jsx(SheetEvent, {
+    name: "cell-select-single",
+    handler: handler
+  }, "cell-select-single");
+};

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

@@ -2,4 +2,4 @@ import type { SheetTableType, SheetType } from "../../type";
 export declare const useGroupConfig: (dataSource: Record<string, unknown>[], tableGroupConfig?: SheetTableType.TableGroupConfig, hasChildren?: boolean) => [SheetType.RowGroupConfig & {
     configMap: SheetType.GroupMap;
 }, (value: SheetType.RowGroupConfig) => void];
-export declare const formatGroupData: (param: Pick<SheetTableType.TableProps, 'dataSource' | 'columns' | 'rowKey'>) => SheetType.Cell[][];
+export declare const formatGroupData: (param: Pick<SheetTableType.TableProps, 'dataSource' | 'columns' | 'rowKey' | 'showRemark'>) => SheetType.Cell[][];

package/dist/core/table/useGroupConfig.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { flatten, isNil } from 'lodash';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { groupConfigToGroupMap } from "../util";
+import { classNames, groupConfigToGroupMap } from "../util";
 import { GroupViewer } from "../viewer";
 import { dataSourceToRowConfig } from "./util";
 export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig, hasChildren) {
@@ -104,7 +104,8 @@ export var useGroupConfig = function useGroupConfig(dataSource, tableGroupConfig
 export var formatGroupData = function formatGroupData(param) {
   var dataSource = param.dataSource,
     columns = param.columns,
-    rowKey = param.rowKey;
+    rowKey = param.rowKey,
+    showRemark = param.showRemark;
   var data = [];
   var currentIndex = 0;
   dataSource.forEach(function (item, row) {
@@ -147,8 +148,9 @@ export var formatGroupData = function formatGroupData(param) {
         className: 'sheet-control'
       });
       columns.forEach(function (colInfo, col) {
-        var _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
+        var _itemRow$remarks, _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
         var value = itemRow[colInfo.dataIndex || ''];
+        var hasRemark = showRemark && (itemRow === null || itemRow === void 0 || (_itemRow$remarks = itemRow.remarks) === null || _itemRow$remarks === void 0 ? void 0 : _itemRow$remarks.includes(colInfo.dataIndex));
         dataRow.push({
           id: rowId,
           value: value,
@@ -161,7 +163,7 @@ export var formatGroupData = function formatGroupData(param) {
           dataEditor: colInfo.editor ? colInfo.editor : undefined,
           searchKey: colInfo.searchKey,
           row: currentIndex,
-          className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, itemRow, currentIndex),
+          className: classNames(!(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, itemRow, currentIndex), hasRemark ? 'remark-cell' : null),
           dataIndex: colInfo.dataIndex,
           key: colInfo.key,
           allowClear: colInfo.allowClear,

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

@@ -1,5 +1,5 @@
 import { SheetTableType } from "../..";
 export declare const useRowSelection: (dataSource: Record<string, unknown>[], rowSelection?: SheetTableType.TableRowSelection, hasChildren?: boolean) => [boolean[], (value: boolean[]) => void];
-export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "rowSelection"> & {
+export declare const formatSelectionData: (param: Pick<SheetTableType.TableProps, "columns" | "dataSource" | "rowKey" | "showRemark" | "rowSelection"> & {
     checked: boolean[];
 }) => any[][];

package/dist/core/table/useRowSelection.js

@@ -6,6 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { CheckViewer } from "../..";
 import { useEffect, useRef, useState } from 'react';
+import { classNames } from "../util";
 export var useRowSelection = function useRowSelection(dataSource, rowSelection, hasChildren) {
   var _dataSource$length;
   var _useState = useState(Array((_dataSource$length = dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) !== null && _dataSource$length !== void 0 ? _dataSource$length : 0).fill(false)),
@@ -28,7 +29,8 @@ export var formatSelectionData = function formatSelectionData(param) {
     columns = param.columns,
     checked = param.checked,
     rowKey = param.rowKey,
-    rowSelection = param.rowSelection;
+    rowSelection = param.rowSelection,
+    showRemark = param.showRemark;
   return dataSource.map(function (item, row) {
     var rowId = item.id || item.key || String(row);
     if (rowKey) {
@@ -64,8 +66,9 @@ export var formatSelectionData = function formatSelectionData(param) {
       });
     }
     columns.forEach(function (colInfo, col) {
-      var _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
+      var _item$remarks, _colInfo$readonly, _colInfo$editable, _colInfo$cellConfig, _colInfo$cellConfig2, _colInfo$cellConfig3;
       var value = item[colInfo.dataIndex || ''];
+      var hasRemark = showRemark && (item === null || item === void 0 || (_item$remarks = item.remarks) === null || _item$remarks === void 0 ? void 0 : _item$remarks.includes(colInfo.dataIndex));
       rows.push({
         id: rowId,
         value: value,
@@ -77,7 +80,7 @@ export var formatSelectionData = function formatSelectionData(param) {
         valueViewer: colInfo.render ? colInfo.render : undefined,
         dataEditor: colInfo.editor ? colInfo.editor : undefined,
         searchKey: colInfo.searchKey,
-        className: !(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, item, row),
+        className: classNames(!(((_colInfo$cellConfig = colInfo.cellConfig) === null || _colInfo$cellConfig === void 0 ? void 0 : _colInfo$cellConfig.className) instanceof Function) ? (_colInfo$cellConfig2 = colInfo.cellConfig) === null || _colInfo$cellConfig2 === void 0 ? void 0 : _colInfo$cellConfig2.className : (_colInfo$cellConfig3 = colInfo.cellConfig) === null || _colInfo$cellConfig3 === void 0 ? void 0 : _colInfo$cellConfig3.className(value, item, row), hasRemark ? 'remark-cell' : null),
         row: row,
         col: col,
         dataIndex: colInfo.dataIndex,

package/dist/example/valuationAnalyze.js

@@ -1,16 +1,28 @@
+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; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
 import { getNumberEditor, getSelectEditor, Table } from "./..";
-import { Button } from 'antd';
+import { Button, message } from 'antd';
 import { isNil } from 'lodash';
-import { useCallback, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { SwitchViewer } from "../core/viewer";
 import { SheetType } from "../type";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var RateValueInput = getNumberEditor({
   addonAfter: '%',
   min: 0,
@@ -38,7 +50,8 @@ var data = [{
   gfaUnitPrice: 107350.31545913525,
   nlaUnitPrice: 90130.38038659678,
   totalValuation: 1622707368.4802885,
-  isEnabled: true
+  isEnabled: true,
+  remarks: ['valuationType', 'vacancyDiscountRate']
 }, {
   id: 2444,
   draftId: '101601',
@@ -51,8 +64,165 @@ var data = [{
   gfaUnitPrice: 89327.04427210477,
   nlaUnitPrice: 89327.04427210477,
   totalValuation: 1429232708.3536763,
+  remarks: ['termDiscountRate', 'vacancyDiscountRate'],
   isEnabled: false
-}];
+}, {
+  id: 2445,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['reversionDiscountRate', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2446,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2447,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['discountRate', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2448,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['exitCapRate', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2449,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['gfaUnitPrice', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2450,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['nlaUnitPrice', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2451,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['totalValuation', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2452,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['termDiscountRate', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2453,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['termDiscountRate', 'vacancyDiscountRate'],
+  isEnabled: false
+}, {
+  id: 2454,
+  draftId: '101601',
+  valuationType: 5,
+  termDiscountRate: 4.5,
+  reversionDiscountRate: 5.5,
+  vacancyDiscountRate: 5.5,
+  discountRate: null,
+  exitCapRate: null,
+  gfaUnitPrice: 89327.04427210477,
+  nlaUnitPrice: 89327.04427210477,
+  totalValuation: 1429232708.3536763,
+  remarks: ['termDiscountRate', 'vacancyDiscountRate'],
+  isEnabled: false
+}].concat(_toConsumableArray(Array(100).fill(0).map(function (item, i) {
+  return {
+    id: 2455 + i,
+    draftId: '101601',
+    valuationType: 5,
+    termDiscountRate: 4.5,
+    reversionDiscountRate: 5.5,
+    vacancyDiscountRate: 5.5,
+    discountRate: null,
+    exitCapRate: null,
+    gfaUnitPrice: 89327.04427210477,
+    nlaUnitPrice: 89327.04427210477,
+    totalValuation: 1429232708.3536763,
+    remarks: ['termDiscountRate', 'vacancyDiscountRate'],
+    isEnabled: false
+  };
+})));
 var evaluateMethods = [{
   label: 'DCF',
   value: 2
@@ -168,6 +338,36 @@ export default (function () {
     width: 134,
     editor: ValueInput,
     readonly: true
+  }, {
+    title: 'id-1',
+    dataIndex: 'id-1',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: 'id-2',
+    dataIndex: 'id-2',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: 'id-3',
+    dataIndex: 'id-3',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: 'id-4',
+    dataIndex: 'id-4',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
+  }, {
+    title: 'id-5',
+    dataIndex: 'id-5',
+    width: 134,
+    editor: ValueInput,
+    readonly: true
   }, {
     title: '操作',
     width: 62,
@@ -217,10 +417,85 @@ export default (function () {
     //   return <div className="value-viewer number-value-viewer" />;
     // },
   }];
+  var sheetInstance = useRef(null);
   var handleChange = useCallback(function () {}, [state]);
-  return /*#__PURE__*/_jsx(Table, {
-    columns: columns,
-    dataSource: state,
-    onChange: handleChange
+  useEffect(function () {
+    setTimeout(function () {
+      var _sheetInstance$curren;
+      (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 || _sheetInstance$curren.select({
+        start: {
+          row: 1,
+          col: 3
+        },
+        end: {
+          row: 1,
+          col: 3
+        }
+      });
+    }, 3);
+  }, []);
+  var renderRemark = useCallback(function (value) {
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsxs("p", {
+        children: [" columns:", value.columnKey]
+      }), /*#__PURE__*/_jsxs("p", {
+        children: [" id:", value.id]
+      }), /*#__PURE__*/_jsx("p", {
+        children: " bugs --"
+      })]
+    });
+  }, []);
+  return /*#__PURE__*/_jsxs("div", {
+    style: {
+      height: '100vh',
+      padding: '29vh 0',
+      overflow: 'auto',
+      background: 'rgba(255,255,0,.2)'
+    },
+    children: [/*#__PURE__*/_jsx(Table, {
+      virtualized: true,
+      draggable: true,
+      sheetInstance: sheetInstance,
+      columns: columns,
+      showRemark: true,
+      remarkRender: renderRemark,
+      handleAddRemark: function handleAddRemark(value) {
+        message.info("".concat(value.id, "\uFF1A").concat(value.columnKey));
+        console.log(value.id, value.columnKey);
+      },
+      dataSource: state,
+      onChange: handleChange,
+      onContextMenu: function onContextMenu() {},
+      menuRenderer: function menuRenderer(props) {
+        var handleMenu = props.onContextMenu,
+          cell = props.cell,
+          position = props.position,
+          children = props.children;
+        if (!cell || !handleMenu || cell.col < 1 || !position) {
+          return null;
+        }
+        return /*#__PURE__*/_jsxs("div", {
+          className: "harvest-menu",
+          style: _objectSpread(_objectSpread({}, position), {}, {
+            background: 'white'
+          }),
+          children: [children, /*#__PURE__*/_jsx("div", {
+            className: "harvest-menu-item",
+            children: "\u5411\u4E0B\u586B\u5145"
+          }), /*#__PURE__*/_jsx("div", {
+            className: "harvest-menu-item",
+            children: "\u5411\u53F3\u586B\u5145"
+          }), /*#__PURE__*/_jsx("div", {
+            className: "harvest-menu-item",
+            children: "\u5168\u90E8\u586B\u5145"
+          })]
+        });
+      }
+    }), /*#__PURE__*/_jsx("div", {
+      style: {
+        height: '100vh'
+      },
+      children: " empty"
+    })]
   });
 });

package/dist/type/sheet.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type { EventEmitter } from 'events';
-import { CSSProperties } from 'react';
+import { CSSProperties, ReactNode } from 'react';
 import { SheetTableType, SheetType } from '.';
 export declare enum CellAlign {
     left = "left",
@@ -92,6 +92,7 @@ export type MenuRenderProps = {
     };
     cell?: CellPosition;
     onContextMenu?: (event: any) => void;
+    children?: ReactNode | ReactNode[];
 };
 export type SheetInstance = {
     zoomTo: (row?: number) => void;
@@ -119,6 +120,7 @@ export type SheetProps = {
     searchStyle?: Partial<CSSProperties>;
     sticky?: boolean;
     groupConfig?: RowGroupConfig;
+    remarkElement?: ReactNode;
     onCellsChanged?: CellChangeHandler;
     menuRenderer?: React.FC<MenuRenderProps>;
     onContextMenu?: (event: any) => void;
@@ -132,6 +134,7 @@ export type SheetProps = {
     boldScroll?: boolean;
     hideColBar?: boolean;
     showQuickLocationBtn?: boolean;
+    showRemark?: boolean;
     ControlContainer?: React.FC;
 };
 export type WidthConfigContext = {
@@ -146,6 +149,7 @@ export type GroupConfigContext = {
 };
 export type SheetShell = Pick<SheetTableType.TableProps, 'columns'> & {
     className?: string;
+    dragable?: boolean;
     showGroup?: boolean;
     showSelect?: boolean;
     controlWidth?: number;

package/dist/type/sheetTable.d.ts

@@ -80,7 +80,19 @@ export type TableProps = {
     sticky?: boolean;
     draggable?: boolean;
     freePaste?: boolean;
+    freeze?: boolean;
     showBackEdit?: boolean;
+    showRemark?: boolean;
+    remarkRender?: (props: {
+        cell: SheetType.CellPosition;
+        columnKey: string;
+        id?: string | number;
+    }) => ReactNode;
+    handleAddRemark?: (value: {
+        cell: SheetType.CellPosition;
+        columnKey: string;
+        id?: string | number;
+    }) => void;
     backEditStyle?: Partial<CSSProperties>;
     searchStyle?: Partial<CSSProperties>;
     rowSelection?: TableRowSelection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.73.beta.1",
+  "version": "0.1.73.beta.2",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",