@zhenliang/sheet 0.1.86-beta → 0.1.87-beta

package/dist/core/reducers/sideEffectReducer.js

@@ -143,12 +143,17 @@ export var sideEffectReducer = {
       });
     }
   },
-  copy: function copy(d, getState) {
+  emitOpenGroup: function emitOpenGroup(d, getState) {
     var _getState7 = getState(),
-      start = _getState7.start,
-      end = _getState7.end,
-      data = _getState7.data,
-      groupConfig = _getState7.groupConfig;
+      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;
     if (!start || !end) {
       return;
     }
@@ -206,11 +211,11 @@ 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, freeze, groupConfig, pasteData, changeInfo, changes, extChanges, legalChanges, lastRow, lastIndex, legalExtChanges, newHistory;
+      var _getState9, start, end, cellChangeHandler, history, _getState9$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, freeze = _getState8.freeze, groupConfig = _getState8.groupConfig;
+            _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;
             if (!(!start || !end || freeze)) {
               _context.next = 3;
               break;
@@ -316,14 +321,14 @@ export var sideEffectReducer = {
     }))();
   },
   delete: function _delete(dispatch, getState) {
-    var _getState9 = getState(),
-      cellChangeHandler = _getState9.cellChangeHandler,
-      start = _getState9.start,
-      end = _getState9.end,
-      data = _getState9.data,
-      history = _getState9.history,
-      groupConfig = _getState9.groupConfig,
-      editing = _getState9.editing;
+    var _getState10 = getState(),
+      cellChangeHandler = _getState10.cellChangeHandler,
+      start = _getState10.start,
+      end = _getState10.end,
+      data = _getState10.data,
+      history = _getState10.history,
+      groupConfig = _getState10.groupConfig,
+      editing = _getState10.editing;
     if (editing) return;
     var groupMap = groupConfigToGroupMap(groupConfig);
     var cellIndex = flatRowColIndex(start, end);
@@ -368,15 +373,15 @@ export var sideEffectReducer = {
     cellChangeHandler && cellChangeHandler(changes, undefined, 'Delete');
   },
   reverse: function reverse(dispatch, getState) {
-    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;
+    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;
     if (!(history !== null && history !== void 0 && history.length)) return;
     var changeHistory = _toConsumableArray(history);
     var change = changeHistory.pop();
@@ -416,16 +421,16 @@ export var sideEffectReducer = {
     });
   },
   recover: function recover(dispatch, getState) {
-    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;
+    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;
     if (!(recoverHistory !== null && recoverHistory !== void 0 && recoverHistory.length)) return;
     var changeHistory = _toConsumableArray(recoverHistory);
     var change = changeHistory.pop();

package/dist/core/sheet/useKeyBoardEvent.js

@@ -82,6 +82,7 @@ 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,6 +6,7 @@ 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;
@@ -14,8 +15,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 _state$eventBus, _handlerRef$current, _handlerRef$current2;
-      (_state$eventBus = state.eventBus) === null || _state$eventBus === void 0 || _state$eventBus.emit('group-open-title', true);
+      var _handlerRef$current;
+      dispatch(sideEffectReducer.emitOpenGroup);
       dispatch({
         type: 'changes',
         payload: {
@@ -26,7 +27,11 @@ export var useSearchInput = function useSearchInput(state, dispatch, handlerRef)
         start: result,
         end: result
       });
-      handlerRef === null || handlerRef === void 0 || (_handlerRef$current2 = handlerRef.current) === null || _handlerRef$current2 === void 0 || _handlerRef$current2.zoomTo();
+      // 分组展开未更新到页面，需要当前事件循环结束再更新
+      Promise.resolve().then(function () {
+        var _handlerRef$current2;
+        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/package.json

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