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

package/dist/core/reducers/sideEffectReducer.js

@@ -35,7 +35,7 @@ export var sideEffectReducer = {
             cell: cell
           }
         });
-        cellChangeHandler && cellChangeHandler([cell]);
+        cellChangeHandler && cellChangeHandler([cell], undefined, 'Edit');
       });
     });
     eventBus.on('cell-create', function (_ref) {
@@ -307,7 +307,7 @@ export var sideEffectReducer = {
                 }
               }
             });
-            cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : []);
+            cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : [], 'Paste');
           case 18:
           case "end":
             return _context.stop();
@@ -364,7 +364,7 @@ export var sideEffectReducer = {
         history: newHistory
       }
     });
-    cellChangeHandler && cellChangeHandler(changes);
+    cellChangeHandler && cellChangeHandler(changes, undefined, 'Delete');
   },
   reverse: function reverse(dispatch, getState) {
     var _getState10 = getState(),
@@ -391,7 +391,7 @@ export var sideEffectReducer = {
       });
       return;
     }
-    cellChangeHandler && cellChangeHandler(change.changes);
+    cellChangeHandler && cellChangeHandler(change.changes, undefined, 'Reverse');
     var recoverChange = _objectSpread(_objectSpread({}, change), {}, {
       changes: change.changes.map(function (item) {
         var _item$row, _item$col;
@@ -448,7 +448,7 @@ export var sideEffectReducer = {
         });
       })
     });
-    cellChangeHandler && cellChangeHandler(change.changes);
+    cellChangeHandler && cellChangeHandler(change.changes, undefined, 'Recover');
     dispatch({
       type: 'changes',
       payload: {

package/dist/core/sheet/Remark.js

@@ -8,9 +8,9 @@ export var Remark = /*#__PURE__*/forwardRef(function (props, ref) {
     var rightOverflow = document.body.clientWidth - position.left < 400;
     var bottomOverflow = document.body.clientHeight - position.top < 400;
     if (rightOverflow && bottomOverflow) {
-      return "translate(-100%, -100%)";
+      return "translate(calc(-100% - 4px), calc(-100% - 4px))";
     } else if (rightOverflow && !bottomOverflow) {
-      return "translate(-100%, 40px)";
+      return "translate(calc(-100% - 4px), 44px)";
     } else if (!rightOverflow && bottomOverflow) {
       return "translate(0, calc(40px - 100%))";
     }

package/dist/core/sheet/index.js

@@ -201,6 +201,16 @@ var Sheet = function Sheet(props) {
           }
         });
         return history !== null && history !== void 0 ? history : [];
+      },
+      call: function call(caller) {
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = arguments[_key];
+        }
+        return dispatch(function (d, getState) {
+          var _getState3 = getState(),
+            data = _getState3.data;
+          caller === null || caller === void 0 || caller.apply(void 0, args.concat([data]));
+        });
       }
     };
   }, [state.history]);

package/dist/core/sheet/index.less

@@ -386,9 +386,11 @@ span.harvest-sheet-container:focus {
   z-index: 10;
   margin-left: 5px;
   overflow: auto;
+  scroll-behavior: smooth;
   padding: 0;
   background: rgb(255,255,255);
   box-shadow: 0 4px 8px rgba(216,223,235,.5);
+  transition: top .1s linear,left .1s linear,transform .05s linear;
 }
 .harvest-remark-container::-webkit-scrollbar{
   display: none;

package/dist/core/sheet/useMouseEvent.js

@@ -188,7 +188,9 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     });
   }, []);
   var mouseUp = useCallback(function (e) {
-    e.preventDefault();
+    // input select 问题
+    // e.preventDefault();
+
     resetInterval();
     var currentCell = findParentTd(e.target);
     if (!currentCell || currentCell.classList.contains('fixed')) {
@@ -287,7 +289,7 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
   }, []);
   useEffect(function () {
     if (elementRef.current) {
-      if (navigator.appVersion.indexOf("Mac") !== -1) {
+      if (navigator.appVersion.indexOf('Mac') !== -1) {
         elementRef.current.style.setProperty('--arrow-down', 'var(--arrow-mac-down)');
         elementRef.current.style.setProperty('--arrow-right', 'var(--arrow-mac-right)');
       }

package/dist/core/sheet/useRemarkContainer.js

@@ -62,21 +62,44 @@ export var useRemarkContainer = function useRemarkContainer(elementRef, start, e
   }, [showRemark, editing]);
   useEffect(function () {
     var _elementRef$current, _elementRef$current2;
-    var remarkScroll = throttle(function () {
-      setRemarkInfo({
-        show: false
-      });
-    }, 50);
+    var scrollTimer;
     var remarkScrollEnd = function remarkScrollEnd() {
       var position = calcPosition();
       if (!position) {
         return;
       }
+      // end called
+      if (scrollTimer) {
+        clearTimeout(scrollTimer);
+      }
       setRemarkInfo({
         position: position,
         show: position.visible && showRemark && !editing && position.left > 0 && position.top > 0
       });
     };
+    var remarkScroll = throttle(function () {
+      var _ref = elementRef.current || {},
+        _ref$scrollTop = _ref.scrollTop,
+        scrollTop = _ref$scrollTop === void 0 ? 0 : _ref$scrollTop,
+        _ref$scrollHeight = _ref.scrollHeight,
+        scrollHeight = _ref$scrollHeight === void 0 ? 0 : _ref$scrollHeight,
+        _ref$clientHeight = _ref.clientHeight,
+        clientHeight = _ref$clientHeight === void 0 ? 0 : _ref$clientHeight;
+      // 滚动条抖动导致的
+      if (Math.abs(clientHeight + scrollTop - scrollHeight) <= 1) {
+        return;
+      }
+      setRemarkInfo({
+        show: false
+      });
+      if (scrollTimer) {
+        clearTimeout(scrollTimer);
+      }
+      scrollTimer = setTimeout(function () {
+        remarkScrollEnd();
+        clearTimeout(scrollTimer);
+      }, 100);
+    }, 50);
     (_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 () {
@@ -96,13 +119,13 @@ export var useRemarkContainer = function useRemarkContainer(elementRef, start, e
     }
     var io = new IntersectionObserver(function (entries) {
       var ratio = entries[0].intersectionRatio;
-      if (ratio < 1) {
+      if (ratio < 0.5) {
         setRemarkInfo({
           show: false
         });
       }
     }, {
-      threshold: 1
+      threshold: 0.5
     });
     io.observe(cell);
     return function () {

package/dist/core/table/index.js

@@ -69,14 +69,14 @@ var Table = function Table(_ref) {
   useImperativeHandle(sheetRef, function () {
     return new Proxy({}, {
       get: function get(target, property) {
-        var _sheetInstance$curren3;
+        var _sheetInstance$curren4;
         if (property === 'goToByTable') {
-          return function (id, columnKey) {
-            var _sheetInstance$curren, _sheetInstance$curren2;
-            var toCol = columns.findIndex(function (column) {
-              return column.dataIndex === columnKey;
-            }) + offset;
-            var toRow = data.findIndex(function (d) {
+          var goToByTable = function goToByTable(id, columnKey, currentData) {
+            var _currentData$, _sheetInstance$curren, _sheetInstance$curren2;
+            var toCol = currentData === null || currentData === void 0 || (_currentData$ = currentData[0]) === null || _currentData$ === void 0 ? void 0 : _currentData$.findIndex(function (d) {
+              return d.dataIndex === columnKey;
+            });
+            var toRow = currentData.findIndex(function (d) {
               return String(d === null || d === void 0 ? void 0 : d[0].id) === String(id);
             });
             (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 || _sheetInstance$curren.goTo(toRow, toCol);
@@ -91,11 +91,18 @@ var Table = function Table(_ref) {
               }
             });
           };
+          return function () {
+            var _sheetInstance$curren3;
+            for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+              args[_key] = arguments[_key];
+            }
+            (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 || _sheetInstance$curren3.call.apply(_sheetInstance$curren3, [goToByTable].concat(args));
+          };
         }
-        return (_sheetInstance$curren3 = sheetInstance.current) === null || _sheetInstance$curren3 === void 0 ? void 0 : _sheetInstance$curren3[property];
+        return (_sheetInstance$curren4 = sheetInstance.current) === null || _sheetInstance$curren4 === void 0 ? void 0 : _sheetInstance$curren4[property];
       }
     });
-  }, [columns, data]);
+  }, [columns, dataSource, offset]);
   var _useRowSelection = useRowSelection(dataSource, rowSelection, hasChildren),
     _useRowSelection2 = _slicedToArray(_useRowSelection, 2),
     checkedRow = _useRowSelection2[0],
@@ -133,7 +140,7 @@ var Table = function Table(_ref) {
       setData([[]]);
     }
   }, [dataSource, columns]);
-  var handleChanges = useCallback(function (changes, extChange) {
+  var handleChanges = useCallback(function (changes, extChange, type) {
     if (freeze) return;
     onChange && onChange(changes.map(function (item) {
       return {
@@ -151,7 +158,7 @@ var Table = function Table(_ref) {
         key: item.key || columns[item.col - offset].dataIndex,
         value: item.value
       };
-    }));
+    }), type);
   }, [columns, onChange, hasControl, freeze]);
   var handleReverse = useCallback(function (value) {
     var _ref2 = value,
@@ -260,7 +267,7 @@ var Table = function Table(_ref) {
     if (!menuRenderer) {
       if (showRemark) {
         return function (props) {
-          var _data$row3;
+          var _data$row3, _target$record, _target$record$includ;
           var cell = props.cell;
           var _ref5 = cell !== null && cell !== void 0 ? cell : {},
             _ref5$col = _ref5.col,
@@ -268,7 +275,8 @@ var Table = function Table(_ref) {
             _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];
-          if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+          var cellHasRemark = (_target$record = target.record) === null || _target$record === void 0 || (_target$record = _target$record.remarks) === null || _target$record === void 0 || (_target$record$includ = _target$record.includes) === null || _target$record$includ === void 0 ? void 0 : _target$record$includ.call(_target$record, target.dataIndex);
+          if ((target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
             return /*#__PURE__*/_jsx("div", {
               className: "harvest-menu",
               style: _objectSpread({}, props.position),
@@ -281,7 +289,7 @@ var Table = function Table(_ref) {
       return undefined;
     } else {
       return function (props) {
-        var _data$row4;
+        var _data$row4, _target$record2, _target$record2$inclu;
         var cell = props.cell;
         var _ref6 = cell !== null && cell !== void 0 ? cell : {},
           _ref6$col = _ref6.col,
@@ -290,7 +298,8 @@ var Table = function Table(_ref) {
           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;
-        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed) {
+        var cellHasRemark = (_target$record2 = target.record) === null || _target$record2 === void 0 || (_target$record2 = _target$record2.remarks) === null || _target$record2 === void 0 || (_target$record2$inclu = _target$record2.includes) === null || _target$record2$inclu === void 0 ? void 0 : _target$record2$inclu.call(_target$record2, target.dataIndex);
+        if (showRemark && (target === null || target === void 0 ? void 0 : target.readonly) !== true && !target.fixed && !cellHasRemark) {
           return /*#__PURE__*/_jsx(MenuFC, _objectSpread(_objectSpread({}, props), {}, {
             target: target,
             children: remarkMenu

package/dist/type/sheet.d.ts

@@ -69,8 +69,9 @@ export type CellData = {
     key?: string;
     value?: string;
 };
+export type ChangeType = 'Edit' | 'Paste' | 'Delete' | 'Reverse' | 'Recover';
 export type CellNavigable = (cell?: Cell, row?: number, col?: number) => boolean;
-export type CellChangeHandler = (cells: CellData[], additions?: CellData[]) => void;
+export type CellChangeHandler = (cells: CellData[], additions: CellData[] | undefined, type: ChangeType) => void;
 export type RowGroup = {
     groupName: string;
     groupStart: number;
@@ -106,6 +107,7 @@ export type SheetInstance = {
     }) => void;
     popHistory: () => OperateHistory;
     dropHistory: () => OperateHistory[];
+    call: (caller: (...args: any) => void, ...args: any) => void;
 };
 export type SheetProps = {
     sheetInstance?: React.MutableRefObject<SheetInstance | null>;
@@ -232,7 +234,7 @@ export type UpdateStateType = {
     lastEditing: CellPosition & {
         confirm?: boolean;
     };
-    cellChangeHandler: (cells: CellData[], additions?: CellData[]) => void;
+    cellChangeHandler: (cells: CellData[], additions: CellData[] | undefined, type: ChangeType) => void;
     fixedInfo: SheetType.FixedInfo[];
 } & SearchState;
 export type UpdateFocus = (start: CellPosition, end: CellPosition) => void;

package/dist/type/sheetTable.d.ts

@@ -1,5 +1,6 @@
 import { CSSProperties, ReactNode } from 'react';
 import { SheetType } from '.';
+import { ChangeType } from './sheet';
 export type refAssertion = {
     contains?: (target: EventTarget | null) => boolean;
     focus?: () => boolean;
@@ -100,7 +101,7 @@ export type TableProps = {
     groupConfig?: TableGroupConfig;
     menuRenderer?: React.FC<SheetType.MenuRenderProps>;
     onContextMenu?: (event: any) => void;
-    onChange: (changes: TableChange[], extChanges?: TableChange[]) => void;
+    onChange: (changes: TableChange[], extChanges: TableChange[] | undefined, type: ChangeType) => void;
     handleAdd?: () => void;
     handleBatchAdd?: (value: number) => void;
     eventHandler?: Record<'reverse' | 'btn-click' | 'cell-edit' | 'cell-switch' | string, undefined | EventHandler>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.73.beta.8",
+  "version": "0.1.74.beta.1",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -85,4 +85,4 @@
     "fizz.zhou@ap.jll.com"
   ],
   "preid": "beta"
-}
+}