@zhenliang/sheet 0.1.76 → 0.1.78

package/dist/core/reducers/sideEffectReducer.js

@@ -361,7 +361,8 @@ export var sideEffectReducer = {
     dispatch({
       type: 'changes',
       payload: {
-        history: newHistory
+        history: newHistory,
+        recoverHistory: []
       }
     });
     cellChangeHandler && cellChangeHandler(changes, undefined, 'Delete');
@@ -371,8 +372,8 @@ export var sideEffectReducer = {
       start = _getState10.start,
       end = _getState10.end,
       history = _getState10.history,
-      _getState10$recoverHi = _getState10.recoverHisotry,
-      recoverHisotry = _getState10$recoverHi === void 0 ? [] : _getState10$recoverHi,
+      _getState10$recoverHi = _getState10.recoverHistory,
+      recoverHistory = _getState10$recoverHi === void 0 ? [] : _getState10$recoverHi,
       cellChangeHandler = _getState10.cellChangeHandler,
       eventBus = _getState10.eventBus,
       data = _getState10.data;
@@ -386,7 +387,7 @@ export var sideEffectReducer = {
         type: 'changes',
         payload: {
           history: changeHistory,
-          recoverHisotry: [].concat(_toConsumableArray(recoverHisotry), [change])
+          recoverHistory: [].concat(_toConsumableArray(recoverHistory), [change])
         }
       });
       return;
@@ -410,23 +411,23 @@ export var sideEffectReducer = {
           end: end
         },
         history: changeHistory,
-        recoverHisotry: [].concat(_toConsumableArray(recoverHisotry), [recoverChange])
+        recoverHistory: [].concat(_toConsumableArray(recoverHistory), [recoverChange])
       }
     });
   },
   recover: function recover(dispatch, getState) {
     var _getState11 = getState(),
       eventBus = _getState11.eventBus,
-      _getState11$recoverHi = _getState11.recoverHisotry,
-      recoverHisotry = _getState11$recoverHi === void 0 ? [] : _getState11$recoverHi,
+      _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 (!(recoverHisotry !== null && recoverHisotry !== void 0 && recoverHisotry.length)) return;
-    var changeHistory = _toConsumableArray(recoverHisotry);
+    if (!(recoverHistory !== null && recoverHistory !== void 0 && recoverHistory.length)) return;
+    var changeHistory = _toConsumableArray(recoverHistory);
     var change = changeHistory.pop();
     var type = change.type;
     if (!['Edit', 'Paste', 'Delete'].includes(type)) {
@@ -434,7 +435,7 @@ export var sideEffectReducer = {
       dispatch({
         type: 'changes',
         payload: {
-          recoverHisotry: changeHistory,
+          recoverHistory: changeHistory,
           history: [].concat(_toConsumableArray(history), [change])
         }
       });
@@ -459,7 +460,7 @@ export var sideEffectReducer = {
           end: end
         },
         history: [].concat(_toConsumableArray(history), [reverseChange]),
-        recoverHisotry: changeHistory
+        recoverHistory: changeHistory
       }
     });
   }

package/dist/core/reducers/stateReducer.js

@@ -10,12 +10,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { stripRowIndex } from "../util";
+import { noramlizeSearch, searchInclude, stripRowIndex } from "../util";
 export var searchReducer = {
   changeSearch: function changeSearch(state, payload) {
     var data = state.data;
     var count = 0;
     var searchResultList = [];
+    var normalSearchText = noramlizeSearch(payload);
     payload && (data === null || data === void 0 ? void 0 : data.forEach(function (row, i) {
       return row.forEach(function (item, j) {
         var _item$dataEditor, _item$value;
@@ -24,9 +25,8 @@ export var searchReducer = {
         }
         var formatterValue;
         if (item.searchKey) {
-          var _formatterValue;
           formatterValue = item.searchKey(item.record);
-          if ((_formatterValue = formatterValue) !== null && _formatterValue !== void 0 && _formatterValue.includes(payload)) {
+          if (searchInclude(normalSearchText, formatterValue)) {
             count++;
             searchResultList.push({
               row: i,
@@ -36,9 +36,9 @@ export var searchReducer = {
             });
           }
         } else if ((_item$dataEditor = item.dataEditor) !== null && _item$dataEditor !== void 0 && _item$dataEditor.formatter) {
-          var _item$dataEditor2, _formatterValue2;
+          var _item$dataEditor2;
           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)) {
+          if (searchInclude(normalSearchText, formatterValue)) {
             count++;
             searchResultList.push({
               row: i,
@@ -47,7 +47,7 @@ export var searchReducer = {
               formatterValue: formatterValue
             });
           }
-        } else if ((_item$value = item.value) !== null && _item$value !== void 0 && _item$value.toString().includes(payload)) {
+        } else if (searchInclude(normalSearchText, (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.toString())) {
           count++;
           searchResultList.push({
             row: i,
@@ -61,7 +61,8 @@ export var searchReducer = {
       searchText: payload,
       searchTotal: count,
       searchCurrent: -1,
-      searchResultList: searchResultList
+      searchResultList: searchResultList,
+      shouldSearchUpdate: false
     });
   },
   closeSearch: function closeSearch(state) {
@@ -145,11 +146,13 @@ export var stateReducer = _objectSpread({
       return _objectSpread(_objectSpread({}, state), {}, {
         editing: undefined,
         lastEditing: state.editing,
-        history: history
+        history: history,
+        recoverHistory: []
       });
     }
     return _objectSpread(_objectSpread({}, state), {}, {
-      history: history
+      history: history,
+      recoverHistory: []
     });
   },
   popHistory: function popHistory(state) {
@@ -162,8 +165,13 @@ export var stateReducer = _objectSpread({
     });
   },
   pushHistory: function pushHistory(state, payload) {
+    var newRecoverHistory = state.recoverHistory;
+    if (['DeleteRow', 'NewRow'].includes(payload.type)) {
+      newRecoverHistory = [];
+    }
     return _objectSpread(_objectSpread({}, state), {}, {
-      history: [].concat(_toConsumableArray(state.history || []), [payload])
+      history: [].concat(_toConsumableArray(state.history || []), [payload]),
+      recoverHistory: newRecoverHistory
     });
   },
   select: function select(state, payload) {

package/dist/core/sheet/index.js

@@ -208,6 +208,16 @@ var Sheet = function Sheet(props) {
         });
         return history !== null && history !== void 0 ? history : [];
       },
+      dropRecover: function dropRecover() {
+        var recoverHistory = state.recoverHistory;
+        dispatch({
+          type: 'changes',
+          payload: {
+            recoverHistory: []
+          }
+        });
+        return recoverHistory !== null && recoverHistory !== void 0 ? recoverHistory : [];
+      },
       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];
@@ -462,6 +472,7 @@ var Sheet = function Sheet(props) {
         current: state.searchCurrent,
         calledCount: state.searchCalledCount,
         open: state.showSearch,
+        shouldUpdate: state.shouldSearchUpdate,
         goNext: goNext,
         goLast: goLast,
         onChange: changeSearch,

package/dist/core/sheet/index.less

@@ -349,16 +349,24 @@ span.harvest-sheet-container:focus {
   }
 }
 
+@keyframes pop{
+  0% {width:0px}
+  100% {width:290px}
+}
+
+
+
 .harvest-search-text {
   position: absolute;
   top: 0px;
   right: 0px;
-  width: 280px;
   z-index: 4;
   font-size: 14px;
   margin: 5px;
+  animation: pop .5s ease;
 }
 
+
 .harvest-search-text .search-text-suffix {
   .search-text-disabled {
     color: #a4a9b2;

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

@@ -1,6 +1,7 @@
 import { CSSProperties } from 'react';
 interface SearchInputProps {
     open?: boolean;
+    shouldUpdate?: boolean;
     style?: Partial<CSSProperties>;
     value?: string;
     current?: number;

package/dist/core/sheet/searchInput.js

@@ -1,6 +1,7 @@
 import { CloseOutlined, DownOutlined, UpOutlined } from '@ant-design/icons';
 import { Divider, Input } from 'antd';
-import { useEffect, useRef } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
+import { getTextWidth } from "../util";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var SearchInput = function SearchInput(props) {
@@ -12,6 +13,8 @@ export var SearchInput = function SearchInput(props) {
     value = props.value,
     _onChange = props.onChange,
     open = props.open,
+    _props$shouldUpdate = props.shouldUpdate,
+    shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
     onClose = props.onClose,
     goLast = props.goLast,
     goNext = props.goNext,
@@ -23,6 +26,21 @@ export var SearchInput = function SearchInput(props) {
       inputRef.current.focus();
     }
   }, [calledCount]);
+  var inputWidth = useMemo(function () {
+    var otherWidth = 140;
+    var textWidth = 0;
+    if (!value) {
+      textWidth = 150;
+      return otherWidth + textWidth;
+    }
+    textWidth = getTextWidth(value);
+    if (textWidth > 350) {
+      textWidth = 350;
+    } else if (textWidth < 150) {
+      textWidth = 150;
+    }
+    return textWidth + otherWidth;
+  }, [value]);
   if (!open) {
     return null;
   }
@@ -33,14 +51,23 @@ export var SearchInput = function SearchInput(props) {
       ref: inputRef,
       placeholder: "\u67E5\u627E",
       autoFocus: true,
+      onFocus: function onFocus(e) {
+        return e.target.select();
+      },
+      contentEditable: true,
       style: {
-        height: 40
+        height: 40,
+        width: inputWidth,
+        minWidth: 250
       },
       value: value,
       onChange: function onChange(e) {
         return _onChange && _onChange(e.target.value);
       },
       onPressEnter: function onPressEnter(e) {
+        if (shouldUpdate) {
+          _onChange && _onChange(e.target.value);
+        }
         if (e.shiftKey) goLast && goLast();else goNext && goNext();
         setTimeout(function () {
           var _inputRef$current;

package/dist/core/sheet/useSearchInput.js

@@ -48,6 +48,16 @@ export var useSearchInput = function useSearchInput(state, dispatch, handlerRef)
       payload: value
     });
   }, [state.data]);
+  useEffect(function () {
+    if (state.searchText) {
+      dispatch({
+        type: 'changes',
+        payload: {
+          shouldSearchUpdate: true
+        }
+      });
+    }
+  }, [state.data]);
   useEffect(function () {
     var _state$searchResultLi2;
     if (!((_state$searchResultLi2 = state.searchResultList) !== null && _state$searchResultLi2 !== void 0 && _state$searchResultLi2.length)) {

package/dist/core/util.d.ts

@@ -63,3 +63,6 @@ export declare const stripRowIndex: (data: SheetType.Cell[][]) => {
 };
 export declare const ensureFocus: (container?: HTMLElement | null) => void;
 export declare const isSearchElement: (tableRootNode: HTMLDivElement, target: HTMLElement) => boolean | undefined;
+export declare const noramlizeSearch: (target: string) => string;
+export declare const searchInclude: (search: string, compare: string) => boolean;
+export declare const getTextWidth: (text: any) => number;

package/dist/core/util.js

@@ -499,4 +499,35 @@ export var ensureFocus = function ensureFocus(container) {
 export var isSearchElement = function isSearchElement(tableRootNode, target) {
   var _tableRootNode$nextSi;
   return (_tableRootNode$nextSi = tableRootNode.nextSibling) === null || _tableRootNode$nextSi === void 0 || (_tableRootNode$nextSi = _tableRootNode$nextSi.nextSibling) === null || _tableRootNode$nextSi === void 0 ? void 0 : _tableRootNode$nextSi.contains(target);
+};
+var punctuationMap = new Map([["，", ","], ["：", ":"], ["；", ";"]]);
+export var noramlizeSearch = function noramlizeSearch(target) {
+  if (!target) {
+    return target;
+  }
+  var lower = target.toLowerCase();
+  // 逗号分号
+  punctuationMap.forEach(function (value, key) {
+    lower = lower.replace(new RegExp(key, "g"), value);
+  });
+  return lower;
+};
+export var searchInclude = function searchInclude(search, compare) {
+  if (!compare) {
+    return false;
+  }
+  var normalCompare = noramlizeSearch(compare);
+  return normalCompare.includes(search);
+};
+export var getTextWidth = function getTextWidth(text) {
+  // 创建隐藏的临时元素
+  var tempElement = document.createElement("span");
+  tempElement.style.visibility = "hidden";
+  tempElement.style.whiteSpace = "pre"; // 保持空格和换行的格式
+  tempElement.style.display = "inline-block";
+  tempElement.textContent = text;
+  document.body.appendChild(tempElement);
+  var width = tempElement.offsetWidth;
+  document.body.removeChild(tempElement);
+  return width;
 };

package/dist/example/antComponent.js

@@ -160,19 +160,22 @@ var columns = [{
   width: 200,
   dataIndex: 'address5',
   key: '6'
-}, {
-  title: 'Column 7',
-  width: 200,
-  dataIndex: 'address6',
-  key: '7',
-  fixed: 'right'
-}, {
-  title: 'Column 8',
-  width: 200,
-  dataIndex: 'address7',
-  key: '8',
-  fixed: 'right'
-}, {
+},
+// {
+//   title: 'Column 7',
+//   width: 200,
+//   dataIndex: 'address6',
+//   key: '7',
+//   fixed: 'right',
+// },
+// {
+//   title: 'Column 8',
+//   width: 200,
+//   dataIndex: 'address7',
+//   key: '8',
+//   fixed: 'right',
+// },
+{
   title: 'Action',
   align: SheetType.CellAlign.center,
   key: 'operation',
@@ -218,7 +221,6 @@ var App = function App() {
     setOptions = _useState4[1];
   var sheetInstance = useRef(null);
   var handleChange = useCallback(function (changes, extChange) {
-    // console.log(extChange);
     var newState = cloneDeep(state);
     changes.forEach(function (change) {
       var row = change.row,

package/dist/hooks/useKeyboard.js

@@ -52,11 +52,19 @@ export var useKeyBoard = function useKeyBoard(handler, listenElement) {
       handler.escape(e);
       return;
     }
+    var isEnter = keyCode === ENTER_KEY;
+    if (isEnter && !shiftKey) {
+      handler.enter(e);
+      return;
+    }
     var isSearch = ctrlKeyPressed && keyCode === F_KEY;
     if (isSearch) {
       handler.search(e);
       return;
     }
+    if (e.target !== listenElement) {
+      return;
+    }
     var isReverse = ctrlKeyPressed && keyCode === Z_KEY && !shiftKey;
     if (isReverse) {
       handler.reverse(e);
@@ -91,11 +99,6 @@ export var useKeyBoard = function useKeyBoard(handler, listenElement) {
       handler.delete(e);
       return;
     }
-    var isEnter = keyCode === ENTER_KEY;
-    if (isEnter && !shiftKey) {
-      handler.enter(e);
-      return;
-    }
     if (ctrlKeyPressed) {
       return;
     }

package/dist/type/sheet.d.ts

@@ -196,6 +196,7 @@ export type CellProps = {
 };
 export type SearchState = {
     showSearch: boolean;
+    shouldSearchUpdate: boolean;
     searchText: string;
     searchTotal: number;
     searchCurrent: number;
@@ -213,7 +214,7 @@ export type UpdateStateType = {
         value?: string;
     };
     history: OperateHistory[];
-    recoverHisotry: OperateHistory[];
+    recoverHistory: OperateHistory[];
     freePaste?: boolean;
     data: Cell[][];
     mouseDown: boolean;

package/package.json

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