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

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/index.js

@@ -51,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,
@@ -131,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);
@@ -142,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) {
@@ -196,10 +211,11 @@ 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);
@@ -211,9 +227,9 @@ var Sheet = function Sheet(props) {
   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);
@@ -336,7 +352,6 @@ var Sheet = function Sheet(props) {
       handleScroll();
     }
   }, []);
-  console.log(menu.showMenu);
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
     children: /*#__PURE__*/_jsxs(_Fragment, {
@@ -371,13 +386,6 @@ 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",
@@ -408,6 +416,13 @@ var Sheet = function Sheet(props) {
             }
           }), children]
         })]
+      }), /*#__PURE__*/_jsx(Remark, {
+        showRemark: remarkInfo.show && !menu.showMenu,
+        position: {
+          left: remarkInfo.position.left,
+          top: remarkInfo.position.top
+        },
+        children: remarkElement
       }), /*#__PURE__*/_jsx(SearchInput, {
         style: props.searchStyle,
         value: state.searchText,

package/dist/core/sheet/index.less

@@ -378,7 +378,7 @@ span.harvest-sheet-container:focus {
     color: #a4a9b2;
   }
 }
-.harvest-sheet-container .harvest-remark-container{
+.harvest-remark-container{
   opacity: 1;
   border:1px solid #E5E5E5;
   border-radius: 2px;

package/dist/core/sheet/useRemarkContainer.js

@@ -11,8 +11,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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';
-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({
@@ -62,7 +62,7 @@ export var useRemarkContainer = function useRemarkContainer(elementRef, start, e
   }, [showRemark, editing]);
   useEffect(function () {
     var _elementRef$current, _elementRef$current2;
-    var remarkScroll = debounce(function () {
+    var remarkScroll = throttle(function () {
       setRemarkInfo({
         show: false
       });
@@ -96,10 +96,11 @@ export var useRemarkContainer = function useRemarkContainer(elementRef, start, e
     }
     var io = new IntersectionObserver(function (entries) {
       var ratio = entries[0].intersectionRatio;
-      console.log('io-ratio', ratio);
-      if (ratio < 1) setRemarkInfo({
-        show: false
-      });
+      if (ratio < 1) {
+        setRemarkInfo({
+          show: false
+        });
+      }
     }, {
       threshold: 1
     });

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", "remarkRender", "handleAddRemark", "showRemark"];
+var _excluded = ["sheetInstance", "columns", "dataSource", "rowKey", "rowSelection", "groupConfig", "onChange", "handleAdd", "handleBatchAdd", "draggable", "eventHandler", "remarkRender", "handleAddRemark", "showRemark", "freeze"];
 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; }
@@ -45,6 +45,8 @@ var Table = function Table(_ref) {
     handleAddRemark = _ref.handleAddRemark,
     _ref$showRemark = _ref.showRemark,
     showRemark = _ref$showRemark === void 0 ? false : _ref$showRemark,
+    _ref$freeze = _ref.freeze,
+    freeze = _ref$freeze === void 0 ? false : _ref$freeze,
     args = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState([[]]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -102,6 +104,7 @@ var Table = function Table(_ref) {
     }
   }, [dataSource, columns]);
   var handleChanges = useCallback(function (changes, extChange) {
+    if (freeze) return;
     onChange && onChange(changes.map(function (item) {
       return {
         col: item.col,
@@ -119,7 +122,7 @@ var Table = function Table(_ref) {
         value: item.value
       };
     }));
-  }, [columns, onChange, hasControl]);
+  }, [columns, onChange, hasControl, freeze]);
   var handleReverse = useCallback(function (value) {
     var _ref2 = value,
       type = _ref2.type,
@@ -206,38 +209,66 @@ var Table = function Table(_ref) {
       return null;
     }
     return remarkRender === null || remarkRender === void 0 ? void 0 : remarkRender(remarkInfo);
-  }, [remarkRender, remarkInfo, showRemark]);
+  }, [remarkRender, remarkInfo, showRemark, data]);
+  var addRemark = useCallback(function (value) {
+    handleAddRemark === null || handleAddRemark === void 0 || handleAddRemark(value);
+    setShowRemark(true);
+  }, [handleAddRemark]);
   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));
+        return addRemark(remarkInfo);
       },
       children: "\u6DFB\u52A0\u8BC4\u8BBA"
-    });
+    }, "remark");
     if (!menuRenderer) {
       if (showRemark) {
         return function (props) {
-          return /*#__PURE__*/_jsx("div", {
-            className: "harvest-menu",
-            style: _objectSpread({}, props.position),
-            children: remarkMenu
-          });
+          var _data$row3;
+          var cell = props.cell;
+          var _ref5 = cell !== null && cell !== void 0 ? cell : {},
+            _ref5$col = _ref5.col,
+            col = _ref5$col === void 0 ? -1 : _ref5$col,
+            _ref5$row = _ref5.row,
+            row = _ref5$row === void 0 ? -1 : _ref5$row;
+          var target = data === null || data === void 0 || (_data$row3 = data[row]) === null || _data$row3 === void 0 ? void 0 : _data$row3[col + 1];
+          console.log(data, target, row, col);
+          if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+            return /*#__PURE__*/_jsx("div", {
+              className: "harvest-menu",
+              style: _objectSpread({}, props.position),
+              children: remarkMenu
+            });
+          }
+          return null;
         };
       }
       return undefined;
     } else {
       return function (props) {
+        var _data$row4;
+        var cell = props.cell;
+        var _ref6 = cell !== null && cell !== void 0 ? cell : {},
+          _ref6$col = _ref6.col,
+          col = _ref6$col === void 0 ? -1 : _ref6$col,
+          _ref6$row = _ref6.row,
+          row = _ref6$row === void 0 ? -1 : _ref6$row;
+        var target = data === null || data === void 0 || (_data$row4 = data[row]) === null || _data$row4 === void 0 ? void 0 : _data$row4[col + 1];
         var MenuFC = menuRenderer;
-        return /*#__PURE__*/_jsxs(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
-          children: [remarkMenu, /*#__PURE__*/_jsx("div", {
-            className: "harvest-menu-divider"
-          })]
+        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+          return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+            target: target,
+            children: remarkMenu
+          }));
+        }
+        return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
+          target: target
         }));
       };
     }
-  }, [showRemark, showRemarkPop, menuRenderer, remarkInfo]);
+  }, [showRemark, showRemarkPop, menuRenderer, remarkInfo, addRemark, data]);
   return /*#__PURE__*/_jsx(ConfigProvider, {
     renderEmpty: function renderEmpty() {
       return /*#__PURE__*/_jsx(Empty, {
@@ -255,6 +286,7 @@ var Table = function Table(_ref) {
           onChange: setGroupConfig
         },
         children: /*#__PURE__*/_jsxs(Sheet, _objectSpread(_objectSpread({}, args), {}, {
+          freeze: freeze,
           menuRenderer: wrappMenuRenderer,
           showRemark: showRemarkPop,
           sheetInstance: sheetInstance,
@@ -282,7 +314,7 @@ var Table = function Table(_ref) {
               name: key,
               handler: eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler[key]
             }, key);
-          }), /*#__PURE__*/_jsx(AddButton, {
+          }), freeze ? null : /*#__PURE__*/_jsx(AddButton, {
             handleAdd: handleAdd,
             handleBatchAdd: handleBatchAdd
           })]

package/dist/core/table/remarkEvent.js

@@ -2,10 +2,6 @@ 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

package/dist/example/valuationAnalyze.js

@@ -15,14 +15,13 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 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, message } from 'antd';
+import { Button, Input } from 'antd';
 import { isNil } from 'lodash';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, 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,
@@ -421,8 +420,9 @@ export default (function () {
   var handleChange = useCallback(function () {}, [state]);
   useEffect(function () {
     setTimeout(function () {
-      var _sheetInstance$curren;
-      (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 || _sheetInstance$curren.select({
+      var _sheetInstance$curren, _sheetInstance$curren2;
+      (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 || _sheetInstance$curren.zoomTo(1);
+      (_sheetInstance$curren2 = sheetInstance.current) === null || _sheetInstance$curren2 === void 0 || _sheetInstance$curren2.select({
         start: {
           row: 1,
           col: 3
@@ -434,17 +434,45 @@ export default (function () {
       });
     }, 3);
   }, []);
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    currentRemark = _useState4[0],
+    setCurrentRemark = _useState4[1];
   var renderRemark = useCallback(function (value) {
-    return /*#__PURE__*/_jsxs(_Fragment, {
+    return /*#__PURE__*/_jsxs("div", {
+      style: {
+        background: 'white'
+      },
       children: [/*#__PURE__*/_jsxs("p", {
         children: [" columns:", value.columnKey]
       }), /*#__PURE__*/_jsxs("p", {
         children: [" id:", value.id]
       }), /*#__PURE__*/_jsx("p", {
         children: " bugs --"
+      }), /*#__PURE__*/_jsx(Input, {
+        onPressEnter: function onPressEnter(e) {
+          setCurrentRemark([{
+            id: value.id,
+            remarks: [value.columnKey]
+          }]);
+        }
       })]
     });
   }, []);
+  var wrapData = useMemo(function () {
+    return state.map(function (d) {
+      var _currentRemark$find;
+      var remarks = currentRemark === null || currentRemark === void 0 || (_currentRemark$find = currentRemark.find(function (r) {
+        return r.id === d.id;
+      })) === null || _currentRemark$find === void 0 ? void 0 : _currentRemark$find.remarks;
+      if (remarks) {
+        return _objectSpread(_objectSpread({}, d), {}, {
+          remarks: remarks
+        });
+      }
+      return d;
+    });
+  }, [state, currentRemark]);
   return /*#__PURE__*/_jsxs("div", {
     style: {
       height: '100vh',
@@ -454,16 +482,15 @@ export default (function () {
     },
     children: [/*#__PURE__*/_jsx(Table, {
       virtualized: true,
+      freeze: 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,
+      remarkRender: renderRemark
+      // handleAddRemark={handleAddRemark}
+      ,
+      dataSource: wrapData,
       onChange: handleChange,
       onContextMenu: function onContextMenu() {},
       menuRenderer: function menuRenderer(props) {

package/dist/type/sheet.d.ts

@@ -93,6 +93,7 @@ export type MenuRenderProps = {
     cell?: CellPosition;
     onContextMenu?: (event: any) => void;
     children?: ReactNode | ReactNode[];
+    target?: any;
 };
 export type SheetInstance = {
     zoomTo: (row?: number) => void;
@@ -119,6 +120,7 @@ export type SheetProps = {
     backEditStyle?: Partial<CSSProperties>;
     searchStyle?: Partial<CSSProperties>;
     sticky?: boolean;
+    freeze?: boolean;
     groupConfig?: RowGroupConfig;
     remarkElement?: ReactNode;
     onCellsChanged?: CellChangeHandler;
@@ -214,6 +216,7 @@ export type UpdateStateType = {
     data: Cell[][];
     mouseDown: boolean;
     isIndex: boolean;
+    freeze: boolean;
     lastSelected?: {
         start?: CellPosition;
         end?: CellPosition;

package/dist/type/sheetTable.d.ts

@@ -56,6 +56,11 @@ export type TableGroupConfig = {
     onChange?: (value: SheetType.RowGroupConfig) => void;
 };
 export type EventHandler = (value: any) => void;
+export type RemarkProps = {
+    cell: SheetType.CellPosition;
+    columnKey: string;
+    id?: string | number;
+};
 export type TableProps = {
     /**
      * @description 表格类名
@@ -83,16 +88,8 @@ export type TableProps = {
     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;
+    remarkRender?: (props: RemarkProps) => ReactNode;
+    handleAddRemark?: (value: RemarkProps) => void;
     backEditStyle?: Partial<CSSProperties>;
     searchStyle?: Partial<CSSProperties>;
     rowSelection?: TableRowSelection;

package/package.json

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