@zhenliang/sheet 0.1.87-beta → 0.1.87-beta.0

package/dist/core/reducers/sideEffectReducer.js

@@ -35,7 +35,11 @@ export var sideEffectReducer = {
             cell: cell
           }
         });
-        cellChangeHandler && cellChangeHandler([cell], undefined, 'Edit');
+        // 这里需要使用 Promise.resolve() 来确保 cellChangeHandler 在微任务队列中执行
+        // 以确保里面的 history 对象是最新
+        Promise.resolve().then(function () {
+          cellChangeHandler && cellChangeHandler([cell], undefined, 'Edit');
+        });
       });
     });
     eventBus.on('cell-create', function (_ref) {
@@ -143,17 +147,12 @@ export var sideEffectReducer = {
       });
     }
   },
-  emitOpenGroup: function emitOpenGroup(d, getState) {
-    var _getState7 = getState(),
-      eventBus = _getState7.eventBus;
-    eventBus === null || eventBus === void 0 || eventBus.emit('group-open-title', true);
-  },
   copy: function copy(d, getState) {
-    var _getState8 = getState(),
-      start = _getState8.start,
-      end = _getState8.end,
-      data = _getState8.data,
-      groupConfig = _getState8.groupConfig;
+    var _getState7 = getState(),
+      start = _getState7.start,
+      end = _getState7.end,
+      data = _getState7.data,
+      groupConfig = _getState7.groupConfig;
     if (!start || !end) {
       return;
     }
@@ -211,11 +210,11 @@ export var sideEffectReducer = {
   paste: function paste(dispatch, getState) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _extChanges$;
-      var _getState9, start, end, cellChangeHandler, history, _getState9$freePaste, freePaste, data, freeze, 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:
-            _getState9 = getState(), start = _getState9.start, end = _getState9.end, cellChangeHandler = _getState9.cellChangeHandler, history = _getState9.history, _getState9$freePaste = _getState9.freePaste, freePaste = _getState9$freePaste === void 0 ? false : _getState9$freePaste, data = _getState9.data, freeze = _getState9.freeze, groupConfig = _getState9.groupConfig;
+            _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;
@@ -321,14 +320,14 @@ export var sideEffectReducer = {
     }))();
   },
   delete: function _delete(dispatch, getState) {
-    var _getState10 = getState(),
-      cellChangeHandler = _getState10.cellChangeHandler,
-      start = _getState10.start,
-      end = _getState10.end,
-      data = _getState10.data,
-      history = _getState10.history,
-      groupConfig = _getState10.groupConfig,
-      editing = _getState10.editing;
+    var _getState9 = getState(),
+      cellChangeHandler = _getState9.cellChangeHandler,
+      start = _getState9.start,
+      end = _getState9.end,
+      data = _getState9.data,
+      history = _getState9.history,
+      groupConfig = _getState9.groupConfig,
+      editing = _getState9.editing;
     if (editing) return;
     var groupMap = groupConfigToGroupMap(groupConfig);
     var cellIndex = flatRowColIndex(start, end);
@@ -373,15 +372,15 @@ export var sideEffectReducer = {
     cellChangeHandler && cellChangeHandler(changes, undefined, 'Delete');
   },
   reverse: function reverse(dispatch, getState) {
-    var _getState11 = getState(),
-      start = _getState11.start,
-      end = _getState11.end,
-      history = _getState11.history,
-      _getState11$recoverHi = _getState11.recoverHistory,
-      recoverHistory = _getState11$recoverHi === void 0 ? [] : _getState11$recoverHi,
-      cellChangeHandler = _getState11.cellChangeHandler,
-      eventBus = _getState11.eventBus,
-      data = _getState11.data;
+    var _getState10 = getState(),
+      start = _getState10.start,
+      end = _getState10.end,
+      history = _getState10.history,
+      _getState10$recoverHi = _getState10.recoverHistory,
+      recoverHistory = _getState10$recoverHi === void 0 ? [] : _getState10$recoverHi,
+      cellChangeHandler = _getState10.cellChangeHandler,
+      eventBus = _getState10.eventBus,
+      data = _getState10.data;
     if (!(history !== null && history !== void 0 && history.length)) return;
     var changeHistory = _toConsumableArray(history);
     var change = changeHistory.pop();
@@ -421,16 +420,16 @@ export var sideEffectReducer = {
     });
   },
   recover: function recover(dispatch, getState) {
-    var _getState12 = getState(),
-      eventBus = _getState12.eventBus,
-      _getState12$recoverHi = _getState12.recoverHistory,
-      recoverHistory = _getState12$recoverHi === void 0 ? [] : _getState12$recoverHi,
-      _getState12$history = _getState12.history,
-      history = _getState12$history === void 0 ? [] : _getState12$history,
-      cellChangeHandler = _getState12.cellChangeHandler,
-      start = _getState12.start,
-      end = _getState12.end,
-      data = _getState12.data;
+    var _getState11 = getState(),
+      eventBus = _getState11.eventBus,
+      _getState11$recoverHi = _getState11.recoverHistory,
+      recoverHistory = _getState11$recoverHi === void 0 ? [] : _getState11$recoverHi,
+      _getState11$history = _getState11.history,
+      history = _getState11$history === void 0 ? [] : _getState11$history,
+      cellChangeHandler = _getState11.cellChangeHandler,
+      start = _getState11.start,
+      end = _getState11.end,
+      data = _getState11.data;
     if (!(recoverHistory !== null && recoverHistory !== void 0 && recoverHistory.length)) return;
     var changeHistory = _toConsumableArray(recoverHistory);
     var change = changeHistory.pop();

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

@@ -8,6 +8,8 @@ interface ControlProps {
     backToEditRow: () => void;
     toTop: () => void;
     toBottom: () => void;
+    reverse: () => void;
+    recover: () => void;
     backEditStyle?: Partial<CSSProperties>;
     ControlContainer?: React.FC<any>;
     showBackEdit?: boolean;
@@ -16,6 +18,9 @@ interface ControlProps {
         end?: CellPosition;
         selecting?: boolean;
     };
+    showRecoverBtn: boolean;
+    recoverLength: number;
+    reverseLength: number;
 }
 export declare const Control: React.FC<ControlProps>;
 export {};

package/dist/core/sheet/Control.js

@@ -1,4 +1,4 @@
-import { EditOutlined, VerticalAlignBottomOutlined, VerticalAlignTopOutlined } from '@ant-design/icons';
+import { EditOutlined, RedoOutlined, UndoOutlined, VerticalAlignBottomOutlined, VerticalAlignTopOutlined } from '@ant-design/icons';
 import { Button, Tooltip } from 'antd';
 import React, { useMemo } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -16,14 +16,35 @@ export var Control = function Control(props) {
     toTop = props.toTop,
     toBottom = props.toBottom,
     backToEditRow = props.backToEditRow,
+    reverse = props.reverse,
+    recover = props.recover,
     _props$backEditStyle = props.backEditStyle,
     backEditStyle = _props$backEditStyle === void 0 ? {
       bottom: 0,
       right: 0
     } : _props$backEditStyle,
-    ControlContainer = props.ControlContainer;
+    ControlContainer = props.ControlContainer,
+    showRecoverBtn = props.showRecoverBtn,
+    recoverLength = props.recoverLength,
+    reverseLength = props.reverseLength;
   var btns = useMemo(function () {
     var tempBtns = [{
+      title: '撤销',
+      disabled: reverseLength === 0,
+      event: reverse,
+      icon: /*#__PURE__*/_jsx(UndoOutlined, {
+        style: itemStyle
+      }),
+      isShow: showRecoverBtn
+    }, {
+      title: '恢复',
+      disabled: recoverLength === 0,
+      event: recover,
+      icon: /*#__PURE__*/_jsx(RedoOutlined, {
+        style: itemStyle
+      }),
+      isShow: showRecoverBtn
+    }, {
       title: '置顶',
       disabled: firstRowVisible,
       event: toTop,
@@ -51,7 +72,7 @@ export var Control = function Control(props) {
     return tempBtns.filter(function (item) {
       return item.isShow;
     });
-  }, [firstRowVisible, showQuickLocationBtn, lastRowVisible, startRowVisible, showBackEdit]);
+  }, [firstRowVisible, showQuickLocationBtn, lastRowVisible, startRowVisible, showBackEdit, recoverLength, reverseLength, reverse, recover]);
   if (!showBackEdit && !showQuickLocationBtn) return null;
   if (ControlContainer) {
     return /*#__PURE__*/_jsx(ControlContainer, {

package/dist/core/sheet/index.js

@@ -20,6 +20,7 @@ import { Empty } from 'antd';
 import { isEmpty, isNil, isNumber } from 'lodash';
 import { SheetEventContext, useEventBus, useMiddlewareReducer } from "../../hooks";
 import sheetReducer from "../reducers";
+import { sideEffectReducer } from "../reducers/sideEffectReducer";
 import { classNames, getRowHeight, rowToActualRow } from "../util";
 import { Control } from "./Control";
 import { DefaultRowMapper } from "./DefaultRowMapper";
@@ -394,6 +395,18 @@ var Sheet = function Sheet(props) {
       handleScroll();
     }
   }, []);
+  var _useMemo = useMemo(function () {
+      var history = state.history,
+        recoverHistory = state.recoverHistory;
+      var reverseLength = history ? history.length : 0;
+      var recoverLength = recoverHistory ? recoverHistory.length : 0;
+      return {
+        reverseLength: reverseLength,
+        recoverLength: recoverLength
+      };
+    }, [state]),
+    reverseLength = _useMemo.reverseLength,
+    recoverLength = _useMemo.recoverLength;
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
     children: /*#__PURE__*/_jsxs(_Fragment, {
@@ -432,6 +445,15 @@ var Sheet = function Sheet(props) {
         }), /*#__PURE__*/_jsxs("div", {
           className: "harvest-sheet-control",
           children: [/*#__PURE__*/_jsx(Control, {
+            showRecoverBtn: !freeze,
+            reverse: function reverse() {
+              dispatch(sideEffectReducer.reverse);
+            },
+            recover: function recover() {
+              dispatch(sideEffectReducer.recover);
+            },
+            reverseLength: reverseLength,
+            recoverLength: recoverLength,
             showBackEdit: showBackEdit,
             startRowVisible: startRowVisible,
             backToEditRow: function backToEditRow() {

package/dist/core/sheet/useKeyBoardEvent.js

@@ -82,7 +82,6 @@ export var useKeyBoardEvent = function useKeyBoardEvent(dispatch, elementRef) {
     },
     search: function search(e) {
       e.preventDefault();
-      // dispatch(sideEffectReducer.emitOpenGroup)
       dispatch({
         type: 'openSearch'
       });

package/dist/core/sheet/useSearchInput.js

@@ -6,7 +6,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { pick } from 'lodash';
 import { useCallback, useEffect } from 'react';
-import { sideEffectReducer } from "../reducers";
 export var useSearchInput = function useSearchInput(state, dispatch, handlerRef) {
   var goSearchResult = useCallback(function (value) {
     var _state$searchResultLi;
@@ -15,8 +14,8 @@ export var useSearchInput = function useSearchInput(state, dispatch, handlerRef)
     var index = (value < 0 ? value + searchTotal : value) % (searchTotal || 1);
     var result = (_state$searchResultLi = state.searchResultList) === null || _state$searchResultLi === void 0 ? void 0 : _state$searchResultLi[index];
     if (result) {
-      var _handlerRef$current;
-      dispatch(sideEffectReducer.emitOpenGroup);
+      var _state$eventBus, _handlerRef$current, _handlerRef$current2;
+      (_state$eventBus = state.eventBus) === null || _state$eventBus === void 0 || _state$eventBus.emit('group-open-title', true);
       dispatch({
         type: 'changes',
         payload: {
@@ -27,11 +26,7 @@ export var useSearchInput = function useSearchInput(state, dispatch, handlerRef)
         start: result,
         end: result
       });
-      // 分组展开未更新到页面，需要当前事件循环结束再更新
-      Promise.resolve().then(function () {
-        var _handlerRef$current2;
-        handlerRef === null || handlerRef === void 0 || (_handlerRef$current2 = handlerRef.current) === null || _handlerRef$current2 === void 0 || _handlerRef$current2.zoomTo();
-      });
+      handlerRef === null || handlerRef === void 0 || (_handlerRef$current2 = handlerRef.current) === null || _handlerRef$current2 === void 0 || _handlerRef$current2.zoomTo();
     }
   }, [state.searchTotal, state.searchResultList]);
   var goNext = useCallback(function () {

package/dist/type/sheet.d.ts

@@ -108,6 +108,7 @@ export type SheetInstance = {
     }) => void;
     popHistory: () => OperateHistory;
     dropHistory: () => OperateHistory[];
+    dropRecover: () => OperateHistory[];
     call: (caller: (...args: any) => void, ...args: any) => void;
 };
 export type SheetProps = {
@@ -141,6 +142,7 @@ export type SheetProps = {
     showQuickLocationBtn?: boolean;
     showRemark?: boolean;
     ControlContainer?: React.FC;
+    showRecoverBtn?: boolean;
 };
 export type WidthConfigContext = {
     onChange?: (value: Record<number | string, number>) => void;

package/package.json

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