@zhenliang/sheet 0.1.49 → 0.1.51

package/dist/core/config.d.ts

@@ -8,6 +8,7 @@ export declare const DOWN_KEY = 40;
 export declare const DELETE_KEY = 46;
 export declare const BACKSPACE_KEY = 8;
 export declare const Z_KEY = 90;
+export declare const F_KEY = 70;
 export declare const C_KEY = 67;
 export declare const V_KEY = 86;
 export declare const X_KEY = 88;

package/dist/core/config.js

@@ -8,6 +8,7 @@ export var DOWN_KEY = 40;
 export var DELETE_KEY = 46;
 export var BACKSPACE_KEY = 8;
 export var Z_KEY = 90;
+export var F_KEY = 70;
 export var C_KEY = 67;
 export var V_KEY = 86;
 export var X_KEY = 88;

package/dist/core/reducers/index.d.ts

@@ -1,5 +1,5 @@
 import type { SheetType } from "../../type";
-export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'selectOneRow' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
+export type SheetAction = 'change' | 'changes' | 'rowMove' | 'colMove' | 'editFinish' | 'pushHistory' | 'popHistory' | 'select' | 'selectOneRow' | 'changeSearch' | 'closeSearch' | 'openSearch' | 'clearSelect' | 'clearSelectIfNotSingleRow' | 'clearEdit' | 'mouseDown' | 'mouseOver' | 'mouseUp' | 'selectRow' | 'selectCol' | 'loseFocus' | 'doubleClick' | 'mouseLeaveInterval' | 'move' | 'selectAll' | 'escape' | 'reverse' | 'delete' | 'enter' | 'otherInput' | 'none';
 export type reducerAction = (type: Partial<SheetType.UpdateStateType>, payload?: unknown) => Partial<SheetType.UpdateStateType>;
 declare const sheetReducer: (state: Partial<SheetType.UpdateStateType>, action: {
     type: SheetAction;

package/dist/core/reducers/index.js

@@ -15,6 +15,9 @@ var sheetReducer = function sheetReducer(state, action) {
     case 'clearSelect':
     case 'clearSelectIfNotSingleRow':
     case 'clearEdit':
+    case 'changeSearch':
+    case 'closeSearch':
+    case 'openSearch':
       return stateReducer[action.type](state, action.payload);
     case 'mouseDown':
     case 'mouseOver':

package/dist/core/reducers/mouseReducer.js

@@ -150,7 +150,13 @@ export var mouseReducer = {
       lastSelected: {
         start: state.start,
         end: state.end
-      }
+      },
+      searchText: '',
+      showSearch: false,
+      searchTotal: 0,
+      searchCurrent: 0,
+      searchCalledCount: 0,
+      searchResultList: []
     });
   },
   doubleClick: function doubleClick(state, payload) {

package/dist/core/reducers/stateReducer.d.ts

@@ -1,2 +1,3 @@
 import { reducerAction } from '.';
+export declare const searchReducer: Record<string, reducerAction>;
 export declare const stateReducer: Record<string, reducerAction>;

package/dist/core/reducers/stateReducer.js

@@ -11,7 +11,78 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { SheetType } from "../..";
-export var stateReducer = {
+export var searchReducer = {
+  changeSearch: function changeSearch(state, payload) {
+    var data = state.data;
+    var count = 0;
+    var searchResultList = [];
+    payload && (data === null || data === void 0 ? void 0 : data.forEach(function (row, i) {
+      return row.forEach(function (item, j) {
+        var _item$dataEditor, _item$value;
+        if (item.fixed) {
+          return;
+        }
+        var formatterValue;
+        if (item.searchKey) {
+          var _formatterValue;
+          formatterValue = item.searchKey(item.record);
+          if ((_formatterValue = formatterValue) !== null && _formatterValue !== void 0 && _formatterValue.includes(payload)) {
+            count++;
+            searchResultList.push({
+              row: i,
+              col: j,
+              value: item.value,
+              formatterValue: formatterValue
+            });
+          }
+        } else if ((_item$dataEditor = item.dataEditor) !== null && _item$dataEditor !== void 0 && _item$dataEditor.formatter) {
+          var _item$dataEditor2, _formatterValue2;
+          formatterValue = (_item$dataEditor2 = item.dataEditor) === null || _item$dataEditor2 === void 0 || (_item$dataEditor2 = _item$dataEditor2.formatter(item.value, item.record)) === null || _item$dataEditor2 === void 0 ? void 0 : _item$dataEditor2.toString();
+          if ((_formatterValue2 = formatterValue) !== null && _formatterValue2 !== void 0 && _formatterValue2.includes(payload)) {
+            count++;
+            searchResultList.push({
+              row: i,
+              col: j,
+              value: item.value,
+              formatterValue: formatterValue
+            });
+          }
+        } else if ((_item$value = item.value) !== null && _item$value !== void 0 && _item$value.toString().includes(payload)) {
+          count++;
+          searchResultList.push({
+            row: i,
+            col: j,
+            value: item.value
+          });
+        }
+      });
+    }));
+    return _objectSpread(_objectSpread({}, state), {}, {
+      searchText: payload,
+      searchTotal: count,
+      searchCurrent: -1,
+      searchResultList: searchResultList
+    });
+  },
+  closeSearch: function closeSearch(state) {
+    return _objectSpread(_objectSpread({}, state), {}, {
+      searchText: '',
+      showSearch: false,
+      searchTotal: 0,
+      searchCurrent: 0,
+      searchCalledCount: 0,
+      searchResultList: []
+    });
+  },
+  openSearch: function openSearch(state) {
+    var _state$searchCalledCo;
+    return _objectSpread(_objectSpread({}, state), {}, {
+      showSearch: true,
+      searchCalledCount: ((_state$searchCalledCo = state.searchCalledCount) !== null && _state$searchCalledCo !== void 0 ? _state$searchCalledCo : 0) + 1
+    });
+  }
+};
+export var stateReducer = _objectSpread({
   change: function change(state, payload) {
     var _ref = payload,
       key = _ref.key,
@@ -171,4 +242,4 @@ export var stateReducer = {
       lastEditing: editing
     });
   }
-};
+}, searchReducer);

package/dist/core/sheet/index.js

@@ -25,8 +25,11 @@ import { useKeyBoardEvent } from "./useKeyBoardEvent";
 import { useMouseEvent } from "./useMouseEvent";
 import { useSelectVisible } from "./useSelectVisible";
 import { VirtualizeEnd, VirtualizeStart, useVirtualList } from "./useVirtualList";
+import { SearchInput } from "./searchInput";
+import { useSearchInput } from "./useSearchInput";
 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 Sheet = function Sheet(props) {
   var _visibleData$length, _scroll$y, _scroll$x;
   var _props$sheetInstance = props.sheetInstance,
@@ -188,6 +191,11 @@ var Sheet = function Sheet(props) {
     virtualEnd = _useVirtualList.virtualEnd,
     paddingTop = _useVirtualList.paddingTop,
     paddingBottom = _useVirtualList.paddingBottom;
+  var _useSearchInput = useSearchInput(state, dispatch, sheetInstance),
+    closeSearch = _useSearchInput.closeSearch,
+    changeSearch = _useSearchInput.changeSearch,
+    goNext = _useSearchInput.goNext,
+    goLast = _useSearchInput.goLast;
   useEffect(function () {
     dispatch({
       type: 'clearEdit'
@@ -234,44 +242,57 @@ var Sheet = function Sheet(props) {
   var hasHorizontalScrollbar = sheetWrapperRef.current && sheetWrapperRef.current.scrollWidth > sheetWrapperRef.current.clientWidth;
   return /*#__PURE__*/_jsx(SheetEventContext.Provider, {
     value: eventBus,
-    children: /*#__PURE__*/_jsxs("span", {
+    children: /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("span", {
-        ref: sheetWrapperRef,
-        tabIndex: 0,
-        className: classNames('harvest harvest-sheet-container', className, hasHorizontalScrollbar && boldScroll ? 'tableWarpScroll' : null, hideColBar ? 'hideColBar' : null),
-        style: {
-          maxHeight: (_scroll$y = scroll === null || scroll === void 0 ? void 0 : scroll.y) !== null && _scroll$y !== void 0 ? _scroll$y : memoHeight,
-          width: (_scroll$x = scroll === null || scroll === void 0 ? void 0 : scroll.x) !== null && _scroll$x !== void 0 ? _scroll$x : '100%'
-        },
-        children: [/*#__PURE__*/_jsxs(SheetShell, {
-          className: classNames('harvest-sheet', className),
-          children: [/*#__PURE__*/_jsx(VirtualizeStart, {
-            virtualized: virtualized,
-            paddingTop: paddingTop
-          }), rowElements, /*#__PURE__*/_jsx(VirtualizeEnd, {
-            virtualized: virtualized,
-            paddingBottom: paddingBottom
-          })]
-        }, "sheet"), /*#__PURE__*/_jsx(Menu, {
-          ref: contextMenuRef,
-          position: menu.position,
-          cell: menu.cellPosition,
-          showMenu: menu.showMenu,
-          contextMenu: ContextMenu,
-          onContextMenu: onContextMenu
-        })]
-      }), EmptyElement, /*#__PURE__*/_jsxs("div", {
-        className: "harvest-sheet-control",
-        children: [children, /*#__PURE__*/_jsx(Control, {
-          showBackEdit: showBackEdit,
-          startRowVisible: startRowVisible,
-          handelClick: function handelClick() {
-            var _sheetInstance$curren;
-            return sheetInstance === null || sheetInstance === void 0 || (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 ? void 0 : _sheetInstance$curren.zoomTo();
+        children: [/*#__PURE__*/_jsxs("span", {
+          ref: sheetWrapperRef,
+          tabIndex: 0,
+          className: classNames('harvest harvest-sheet-container', className, hasHorizontalScrollbar && boldScroll ? 'tableWarpScroll' : null, hideColBar ? 'hideColBar' : null),
+          style: {
+            maxHeight: (_scroll$y = scroll === null || scroll === void 0 ? void 0 : scroll.y) !== null && _scroll$y !== void 0 ? _scroll$y : memoHeight,
+            width: (_scroll$x = scroll === null || scroll === void 0 ? void 0 : scroll.x) !== null && _scroll$x !== void 0 ? _scroll$x : '100%'
           },
-          direction: direction,
-          backEditStyle: backEditStyle
+          children: [/*#__PURE__*/_jsxs(SheetShell, {
+            className: classNames('harvest-sheet', className),
+            children: [/*#__PURE__*/_jsx(VirtualizeStart, {
+              virtualized: virtualized,
+              paddingTop: paddingTop
+            }), rowElements, /*#__PURE__*/_jsx(VirtualizeEnd, {
+              virtualized: virtualized,
+              paddingBottom: paddingBottom
+            })]
+          }, "sheet"), /*#__PURE__*/_jsx(Menu, {
+            ref: contextMenuRef,
+            position: menu.position,
+            cell: menu.cellPosition,
+            showMenu: menu.showMenu,
+            contextMenu: ContextMenu,
+            onContextMenu: onContextMenu
+          }), EmptyElement]
+        }), /*#__PURE__*/_jsxs("div", {
+          className: "harvest-sheet-control",
+          children: [children, /*#__PURE__*/_jsx(Control, {
+            showBackEdit: showBackEdit,
+            startRowVisible: startRowVisible,
+            handelClick: function handelClick() {
+              var _sheetInstance$curren;
+              return sheetInstance === null || sheetInstance === void 0 || (_sheetInstance$curren = sheetInstance.current) === null || _sheetInstance$curren === void 0 ? void 0 : _sheetInstance$curren.zoomTo();
+            },
+            direction: direction,
+            backEditStyle: backEditStyle
+          })]
         })]
+      }), /*#__PURE__*/_jsx(SearchInput, {
+        style: props.searchStyle,
+        value: state.searchText,
+        total: state.searchTotal,
+        current: state.searchCurrent,
+        calledCount: state.searchCalledCount,
+        open: state.showSearch,
+        goNext: goNext,
+        goLast: goLast,
+        onChange: changeSearch,
+        onClose: closeSearch
       })]
     })
   });

package/dist/core/sheet/index.less

@@ -336,6 +336,31 @@ span.harvest-sheet-container:focus {
   border-radius: 2px;
 }
 
+.harvest-search-text {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  width: 280px;
+  z-index: 4;
+  font-size: 14px;
+  margin: 5px;
+}
+
+.harvest-search-text .search-text-suffix {
+  .search-text-disabled {
+    color: #A4A9B2;
+  }
+
+  >span {
+    margin: 0 3px;
+  }
+}
+
+.harvest-search-text .ant-input-affix-wrapper-focused {
+  border-color: #0078E0;
+  box-shadow: 0px 0px 0px 2px rgba(24, 144, 255, 0.20);
+}
+
 :global {
   .ant-empty-description {
     color: #A4A9B2;

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

@@ -0,0 +1,15 @@
+import { CSSProperties } from 'react';
+interface SearchInputProps {
+    open?: boolean;
+    style?: Partial<CSSProperties>;
+    value?: string;
+    current?: number;
+    total?: number;
+    calledCount?: number;
+    goNext?: () => void;
+    goLast?: () => void;
+    onClose?: () => void;
+    onChange?: (value: string) => void;
+}
+export declare const SearchInput: React.FC<SearchInputProps>;
+export {};

package/dist/core/sheet/searchInput.js

@@ -0,0 +1,78 @@
+import { CloseOutlined, DownOutlined, UpOutlined } from '@ant-design/icons';
+import { Divider, Input } from 'antd';
+import { useEffect, useRef } from 'react';
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+export var SearchInput = function SearchInput(props) {
+  var inputRef = useRef(null);
+  var _props$current = props.current,
+    current = _props$current === void 0 ? 0 : _props$current,
+    _props$total = props.total,
+    total = _props$total === void 0 ? 0 : _props$total,
+    value = props.value,
+    _onChange = props.onChange,
+    open = props.open,
+    onClose = props.onClose,
+    goLast = props.goLast,
+    goNext = props.goNext,
+    _props$calledCount = props.calledCount,
+    calledCount = _props$calledCount === void 0 ? 0 : _props$calledCount,
+    style = props.style;
+  useEffect(function () {
+    if (calledCount > 0 && inputRef.current) {
+      inputRef.current.focus();
+    }
+  }, [calledCount]);
+  if (!open) {
+    return null;
+  }
+  return /*#__PURE__*/_jsx("div", {
+    className: "harvest-search-text",
+    style: style,
+    children: /*#__PURE__*/_jsx(Input, {
+      ref: inputRef,
+      placeholder: "\u67E5\u627E",
+      autoFocus: true,
+      style: {
+        height: 40
+      },
+      value: value,
+      onChange: function onChange(e) {
+        return _onChange && _onChange(e.target.value);
+      },
+      onPressEnter: function onPressEnter(e) {
+        if (e.shiftKey) goLast && goLast();else goNext && goNext();
+        setTimeout(function () {
+          var _inputRef$current;
+          (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
+        }, 100);
+      },
+      suffix: /*#__PURE__*/_jsxs("span", {
+        className: "ant-input-suffix",
+        children: [/*#__PURE__*/_jsxs("span", {
+          className: "ant-input-show-count-suffix",
+          children: [!total ? 0 : (current || 0) + 1, "/", total || 0]
+        }), /*#__PURE__*/_jsx(Divider, {
+          type: "vertical"
+        }), /*#__PURE__*/_jsxs("span", {
+          className: "search-text-suffix",
+          children: [/*#__PURE__*/_jsx(UpOutlined, {
+            className: !total ? 'search-text-disabled' : '',
+            onClick: function onClick() {
+              return goLast && goLast();
+            }
+          }), /*#__PURE__*/_jsx(DownOutlined, {
+            className: !total ? 'search-text-disabled' : '',
+            onClick: function onClick() {
+              return goNext && goNext();
+            }
+          }), /*#__PURE__*/_jsx(CloseOutlined, {
+            onClick: function onClick() {
+              return onClose && onClose();
+            }
+          })]
+        })]
+      })
+    })
+  });
+};

package/dist/core/sheet/useKeyBoardEvent.js

@@ -67,6 +67,12 @@ export var useKeyBoardEvent = function useKeyBoardEvent(dispatch, elementRef) {
     cut: function cut() {
       dispatch(sideEffectReducer.copy);
       dispatch(sideEffectReducer.delete);
+    },
+    search: function search(e) {
+      e.preventDefault();
+      dispatch({
+        type: 'openSearch'
+      });
     }
   }, elementRef.current);
 };

package/dist/core/sheet/useMouseEvent.js

@@ -264,14 +264,16 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
     });
   }, []);
   var loseFocus = useCallback(function (e) {
-    var _elementRef$current10;
-    if (!((_elementRef$current10 = elementRef.current) !== null && _elementRef$current10 !== void 0 && (_elementRef$current10 = _elementRef$current10.parentElement) !== null && _elementRef$current10 !== void 0 && _elementRef$current10.contains(e.target))) {
+    var _elementRef$current10, _elementRef$current11;
+    var isSearch = (_elementRef$current10 = elementRef.current) === null || _elementRef$current10 === void 0 || (_elementRef$current10 = _elementRef$current10.parentElement) === null || _elementRef$current10 === void 0 || (_elementRef$current10 = _elementRef$current10.nextSibling) === null || _elementRef$current10 === void 0 ? void 0 : _elementRef$current10.contains(e.target);
+    var isTableAControl = (_elementRef$current11 = elementRef.current) === null || _elementRef$current11 === void 0 || (_elementRef$current11 = _elementRef$current11.parentElement) === null || _elementRef$current11 === void 0 ? void 0 : _elementRef$current11.contains(e.target);
+    if (!(isTableAControl || isSearch)) {
       dispatch({
         type: 'loseFocus'
       });
       return;
     }
-    e.preventDefault();
+    // e.preventDefault();
     var currentCell = findParentTd(e.target);
     if (!(currentCell !== null && currentCell !== void 0 && currentCell.classList) || currentCell.classList.contains('read-only')) {
       // 只读

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

@@ -0,0 +1,11 @@
+import { Dispatch } from "../../hooks/useMiddlewareReducer";
+import type { SheetType } from "../../type";
+export declare const useSearchInput: (state: Partial<SheetType.UpdateStateType>, dispatch: Dispatch, handlerRef: React.RefObject<SheetType.SheetInstance>) => {
+    goNext: () => void;
+    goLast: () => void;
+    changeSearch: (value: string) => void;
+    closeSearch: () => void;
+    searchText?: string | undefined;
+    searchTotal?: number | undefined;
+    searchCurrent?: number | undefined;
+};

package/dist/core/sheet/useSearchInput.js

@@ -0,0 +1,65 @@
+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 { pick } from 'lodash';
+import { useCallback, useEffect } from 'react';
+export var useSearchInput = function useSearchInput(state, dispatch, handlerRef) {
+  var goSearchResult = useCallback(function (value) {
+    var _state$searchResultLi;
+    var _state$searchTotal = state.searchTotal,
+      searchTotal = _state$searchTotal === void 0 ? 0 : _state$searchTotal;
+    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);
+      dispatch({
+        type: 'changes',
+        payload: {
+          searchCurrent: index
+        }
+      });
+      (_handlerRef$current = handlerRef.current) === null || _handlerRef$current === void 0 || _handlerRef$current.select({
+        start: result,
+        end: result
+      });
+      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 () {
+    var _state$searchCurrent;
+    goSearchResult(((_state$searchCurrent = state.searchCurrent) !== null && _state$searchCurrent !== void 0 ? _state$searchCurrent : 0) + 1);
+  }, [goSearchResult, state.searchCurrent]);
+  var goLast = useCallback(function () {
+    var _state$searchCurrent2;
+    goSearchResult(((_state$searchCurrent2 = state.searchCurrent) !== null && _state$searchCurrent2 !== void 0 ? _state$searchCurrent2 : 0) - 1);
+  }, [goSearchResult, state.searchCurrent]);
+  var closeSearch = useCallback(function () {
+    dispatch({
+      type: 'closeSearch'
+    });
+  }, []);
+  var changeSearch = useCallback(function (value) {
+    dispatch({
+      type: 'changeSearch',
+      payload: value
+    });
+  }, [state.data]);
+  useEffect(function () {
+    var _state$searchResultLi2;
+    if (!((_state$searchResultLi2 = state.searchResultList) !== null && _state$searchResultLi2 !== void 0 && _state$searchResultLi2.length)) {
+      dispatch({
+        type: 'clearSelect'
+      });
+    }
+  }, [state.searchResultList, state.searchTotal]);
+  return _objectSpread(_objectSpread({}, pick(state, ['searchText', 'searchTotal', 'searchCurrent'])), {}, {
+    goNext: goNext,
+    goLast: goLast,
+    changeSearch: changeSearch,
+    closeSearch: closeSearch
+  });
+};

package/dist/core/shell/draggableShell/index.js

@@ -101,6 +101,12 @@ export var DraggableShell = function DraggableShell(_ref) {
           },
           onMouseMove: function onMouseMove(e) {
             var target = e.target;
+            if (target instanceof HTMLSpanElement) {
+              if (target.parentElement instanceof HTMLTableCellElement) {
+                target.parentElement.style.cursor = '';
+              }
+              return;
+            }
             if (e.nativeEvent.offsetX > target.offsetWidth - 8) {
               target.style.cursor = 'col-resize';
             } else {

package/dist/core/table/events.js

@@ -68,6 +68,9 @@ export var GroupEvent = function GroupEvent(props) {
     }, "group-open"), /*#__PURE__*/_jsx(SheetEvent, {
       name: "group-open-title",
       handler: function handler(value) {
+        if (!(rowGroupConfig !== null && rowGroupConfig !== void 0 && rowGroupConfig.groupOpen.some(function (item) {
+          return item !== value;
+        }))) return;
         onGroupChange && onGroupChange(_objectSpread(_objectSpread({}, rowGroupConfig), {}, {
           groupOpen: Array(rowGroupConfig === null || rowGroupConfig === void 0 ? void 0 : rowGroupConfig.groupOpen.length).fill(value),
           defaultOpen: !groups.length ? value : undefined

package/dist/core/table/useGroupConfig.js

@@ -147,6 +147,7 @@ export var formatGroupData = function formatGroupData(param) {
           editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, itemRow, currentIndex, col),
           valueViewer: colInfo.render ? colInfo.render : undefined,
           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),
           dataIndex: colInfo.dataIndex,

package/dist/core/table/useRowSelection.js

@@ -64,6 +64,7 @@ export var formatSelectionData = function formatSelectionData(param) {
         editable: !(colInfo.editable instanceof Function) ? colInfo.editable : colInfo.editable(value, item, row),
         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),
         row: row,
         col: col,

package/dist/hooks/useKeyboard.d.ts

@@ -10,6 +10,7 @@ type KeyboardHandler = {
     paste: KeyOrClipBoardEvent;
     reverse: KeyOrClipBoardEvent;
     cut: KeyOrClipBoardEvent;
+    search: KeyOrClipBoardEvent;
 };
 export declare function move(keyCode: number, isShiftKey: boolean): {
     row: number;

package/dist/hooks/useKeyboard.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect } from 'react';
-import { A_KEY, BACKSPACE_KEY, C_KEY, DELETE_KEY, DOWN_KEY, ENTER_KEY, ESCAPE_KEY, LEFT_KEY, RIGHT_KEY, TAB_KEY, UP_KEY, V_KEY, X_KEY, Z_KEY } from "../core/config";
+import { A_KEY, BACKSPACE_KEY, C_KEY, DELETE_KEY, DOWN_KEY, ENTER_KEY, ESCAPE_KEY, F_KEY, LEFT_KEY, RIGHT_KEY, TAB_KEY, UP_KEY, V_KEY, X_KEY, Z_KEY } from "../core/config";
 import { isInputKey } from "../core/util";
 var ua = window.navigator.userAgent;
 var isIE = /MSIE|Trident/.test(ua);
@@ -51,6 +51,11 @@ export var useKeyBoard = function useKeyBoard(handler, listenElement) {
       handler.escape(e);
       return;
     }
+    var isSearch = ctrlKeyPressed && keyCode === F_KEY;
+    if (isSearch) {
+      handler.search(e);
+      return;
+    }
     var isReverse = ctrlKeyPressed && keyCode === Z_KEY;
     if (isReverse) {
       handler.reverse(e);

package/dist/type/sheet.d.ts

@@ -24,6 +24,7 @@ export type Cell = {
     dataEditor?: CellEditor;
     dataIndex?: string;
     valueViewer?: CellViewer;
+    searchKey?: (value: unknown, record?: unknown) => string;
     className?: string;
     align?: CellAlign;
     fixed?: Omit<CellAlign, 'center'>;
@@ -104,6 +105,7 @@ export type SheetProps = {
     virtualized?: boolean;
     showBackEdit?: boolean;
     backEditStyle?: Partial<CSSProperties>;
+    searchStyle?: Partial<CSSProperties>;
     sticky?: boolean;
     groupConfig?: RowGroupConfig;
     onCellsChanged?: CellChangeHandler;
@@ -169,6 +171,14 @@ export type CellProps = {
     valueViewer?: React.ElementType;
     attributesRenderer?: AttributesRenderer;
 };
+export type SearchState = {
+    showSearch: boolean;
+    searchText: string;
+    searchTotal: number;
+    searchCurrent: number;
+    searchResultList?: CellPosition[];
+    searchCalledCount: number;
+};
 export type UpdateStateType = {
     eventBus: EventEmitter;
     start: CellPosition;
@@ -200,7 +210,7 @@ export type UpdateStateType = {
         confirm?: boolean;
     };
     cellChangeHandler: (cells: CellData[], additions?: CellData[]) => void;
-};
+} & SearchState;
 export type UpdateFocus = (start: CellPosition, end: CellPosition) => void;
 export type Options<T = any> = {
     value: string | number;

package/dist/type/sheetTable.d.ts

@@ -36,6 +36,7 @@ export type ColumnProps = {
     readonly?: boolean | RecordRowMap<boolean>;
     render?: SheetType.CellViewer;
     editor?: SheetType.CellEditor;
+    searchKey?: (value: unknown, record: Record<string, unknown>) => string;
 };
 export type TableChange = {
     col?: number;
@@ -80,6 +81,7 @@ export type TableProps = {
     freePaste?: boolean;
     showBackEdit?: boolean;
     backEditStyle?: Partial<CSSProperties>;
+    searchStyle?: Partial<CSSProperties>;
     rowSelection?: TableRowSelection;
     groupConfig?: TableGroupConfig;
     menuRenderer?: React.FC<SheetType.MenuRenderProps>;

package/package.json

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