@leankylin-sheet/react 5.2.59 → 5.2.60

package/dist/index.css

@@ -1579,8 +1579,9 @@ html::-webkit-scrollbar-button {
   color: #555;
 }
 
-/* 搜索范围下拉 - 与查找/替换输入行同样的布局，select 展开至 input 相同宽度 */
-#leankylin-search-replace #searchTypeSelect {
+/* 搜索范围/搜索区域下拉 - 与查找/替换输入行同样的布局，select 展开至 input 相同宽度 */
+#leankylin-search-replace #searchTypeSelect,
+#leankylin-search-replace #searchRangeSelect {
   display: flex;
   align-items: center;
   gap: 8px;
@@ -1589,11 +1590,13 @@ html::-webkit-scrollbar-button {
   white-space: nowrap;
 }
 
-#leankylin-search-replace #searchTypeSelect > span {
+#leankylin-search-replace #searchTypeSelect > span,
+#leankylin-search-replace #searchRangeSelect > span {
   flex-shrink: 0;
 }
 
-#leankylin-search-replace #searchTypeSelect select {
+#leankylin-search-replace #searchTypeSelect select,
+#leankylin-search-replace #searchRangeSelect select {
   flex: 1;
   width: auto;
   height: 32px;
@@ -1615,11 +1618,13 @@ html::-webkit-scrollbar-button {
   box-sizing: border-box;
 }
 
-#leankylin-search-replace #searchTypeSelect select:hover {
+#leankylin-search-replace #searchTypeSelect select:hover,
+#leankylin-search-replace #searchRangeSelect select:hover {
   border-color: #b0aefe;
 }
 
-#leankylin-search-replace #searchTypeSelect select:focus {
+#leankylin-search-replace #searchTypeSelect select:focus,
+#leankylin-search-replace #searchRangeSelect select:focus {
   border-color: #8C89FE;
   box-shadow: 0 0 0 3px rgba(140, 137, 254, 0.12);
 }
@@ -1650,10 +1655,14 @@ html::-webkit-scrollbar-button {
   background-color: #f9f9ff;
 }
 
-/* 关闭按钮 */
+/* 关闭按钮：始终固定于弹窗右下角，宽度紧凑 */
 #leankylin-search-replace .close-button {
+  position: sticky;
+  bottom: 12px;
+  align-self: flex-end;
+  flex-shrink: 0;
   margin: 12px 0 0;
-  padding: 6px 20px;
+  padding: 6px 14px;
   border-radius: 6px;
   font-size: 13px;
   transition: all 0.15s;

package/dist/index.esm.css

@@ -1579,8 +1579,9 @@ html::-webkit-scrollbar-button {
   color: #555;
 }
 
-/* 搜索范围下拉 - 与查找/替换输入行同样的布局，select 展开至 input 相同宽度 */
-#leankylin-search-replace #searchTypeSelect {
+/* 搜索范围/搜索区域下拉 - 与查找/替换输入行同样的布局，select 展开至 input 相同宽度 */
+#leankylin-search-replace #searchTypeSelect,
+#leankylin-search-replace #searchRangeSelect {
   display: flex;
   align-items: center;
   gap: 8px;
@@ -1589,11 +1590,13 @@ html::-webkit-scrollbar-button {
   white-space: nowrap;
 }
 
-#leankylin-search-replace #searchTypeSelect > span {
+#leankylin-search-replace #searchTypeSelect > span,
+#leankylin-search-replace #searchRangeSelect > span {
   flex-shrink: 0;
 }
 
-#leankylin-search-replace #searchTypeSelect select {
+#leankylin-search-replace #searchTypeSelect select,
+#leankylin-search-replace #searchRangeSelect select {
   flex: 1;
   width: auto;
   height: 32px;
@@ -1615,11 +1618,13 @@ html::-webkit-scrollbar-button {
   box-sizing: border-box;
 }
 
-#leankylin-search-replace #searchTypeSelect select:hover {
+#leankylin-search-replace #searchTypeSelect select:hover,
+#leankylin-search-replace #searchRangeSelect select:hover {
   border-color: #b0aefe;
 }
 
-#leankylin-search-replace #searchTypeSelect select:focus {
+#leankylin-search-replace #searchTypeSelect select:focus,
+#leankylin-search-replace #searchRangeSelect select:focus {
   border-color: #8C89FE;
   box-shadow: 0 0 0 3px rgba(140, 137, 254, 0.12);
 }
@@ -1650,10 +1655,14 @@ html::-webkit-scrollbar-button {
   background-color: #f9f9ff;
 }
 
-/* 关闭按钮 */
+/* 关闭按钮：始终固定于弹窗右下角，宽度紧凑 */
 #leankylin-search-replace .close-button {
+  position: sticky;
+  bottom: 12px;
+  align-self: flex-end;
+  flex-shrink: 0;
   margin: 12px 0 0;
-  padding: 6px 20px;
+  padding: 6px 14px;
   border-radius: 6px;
   font-size: 13px;
   transition: all 0.15s;

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, functionHTMLGenerate, locale, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, isShowHidenCR, cancelNormalSelected, moveHighlightCell, updateCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, changeSheet, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellAreaDragOver, handleCellDrop, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, onCellsMoveStart, createDropCellRange, handleDropCellDoubleClick, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getDataBySelectionNoCopy, getInlineStringNoStyle, rangeHightlightselected, editSheetName, setNextSheet, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, insertRowCol, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, cancelActiveImgItem, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePasteByLeanklin, groupValuesRefresh } from '@leankylin-sheet/core';
+import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, functionHTMLGenerate, locale, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, isShowHidenCR, cancelNormalSelected, moveHighlightCell, updateCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, changeSheet, normalizeSelection, scrollToHighlightCell, chatatABC, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellAreaDragOver, handleCellDrop, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, onCellsMoveStart, createDropCellRange, handleDropCellDoubleClick, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getDataBySelectionNoCopy, getInlineStringNoStyle, rangeHightlightselected, editSheetName, setNextSheet, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, insertRowCol, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, cancelActiveImgItem, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePasteByLeanklin, groupValuesRefresh } from '@leankylin-sheet/core';
 import React, { useContext, useRef, useState, useMemo, useCallback, useEffect, useLayoutEffect, useImperativeHandle } from 'react';
 import produce, { applyPatches, enablePatches, produceWithPatches } from 'immer';
 import _ from 'lodash';
@@ -1585,6 +1585,29 @@ function useAlert() {
   };
 }
 
+function getSelectionRangeName(selection) {
+  if (selection == null || selection.length === 0) return null;
+  var names = [];
+  var _iterator = _createForOfIteratorHelper(selection),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      var row = item.row,
+        column = item.column;
+      var row1 = Math.min(row[0], row[1]);
+      var row2 = Math.max(row[0], row[1]);
+      var col1 = Math.min(column[0], column[1]);
+      var col2 = Math.max(column[0], column[1]);
+      names.push(row1 === row2 && col1 === col2 ? "".concat(chatatABC(col1)).concat(row1 + 1) : "".concat(chatatABC(col1)).concat(row1 + 1, ":").concat(chatatABC(col2)).concat(row2 + 1));
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return names.join(",");
+}
 var SearchReplace = function SearchReplace() {
   var _useContext = useContext(WorkbookContext),
     context = _useContext.context,
@@ -1627,6 +1650,33 @@ var SearchReplace = function SearchReplace() {
     _useState14 = _slicedToArray(_useState13, 2),
     searchType = _useState14[0],
     setSearchType = _useState14[1];
+  var _useState15 = useState("currentSheet"),
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchRange = _useState16[0],
+    setSearchRange = _useState16[1];
+  var _useState17 = useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    searchSelection = _useState18[0],
+    setSearchSelection = _useState18[1];
+  var sheetIndex = getSheetIndex(context, context.currentSheetId);
+  var currentSheetName = sheetIndex == null ? null : context.luckysheetfile[sheetIndex].name;
+  var isRealSelection = useMemo(function () {
+    var selection = context.luckysheet_select_save;
+    return selection != null && selection.length > 0 && !(selection.length === 1 && selection[0].row[0] === selection[0].row[1] && selection[0].column[0] === selection[0].column[1]);
+  }, [context.luckysheet_select_save]);
+  useEffect(function () {
+    if (searchRange !== "selection") return;
+    if (isRealSelection) {
+      setSearchSelection(_.assign([], context.luckysheet_select_save));
+    } else {
+      setSearchRange("currentSheet");
+    }
+  }, [isRealSelection, searchRange, context.luckysheet_select_save]);
+  var selectionRangeName = getSelectionRangeName(context.luckysheet_select_save);
+  var selectionRangeDisplay = findAndReplace.searchRangeSelection;
+  if (selectionRangeName != null) {
+    selectionRangeDisplay = currentSheetName ? "".concat(findAndReplace.searchRangeSelection, " (").concat(currentSheetName, "!").concat(selectionRangeName, ")") : "".concat(findAndReplace.searchRangeSelection, " (").concat(selectionRangeName, ")");
+  }
   var closeDialog = useCallback(function () {
     _.set(refs.globalCache, "searchDialog.mouseEnter", false);
     setContext(function (draftCtx) {
@@ -1724,6 +1774,23 @@ var SearchReplace = function SearchReplace() {
   }, findAndReplace.searchTypeFormula), /*#__PURE__*/React.createElement("option", {
     value: "m"
   }, findAndReplace.searchTypeDisplay))), /*#__PURE__*/React.createElement("div", {
+    id: "searchRangeSelect"
+  }, /*#__PURE__*/React.createElement("span", null, findAndReplace.searchRangeLabel, "\uFF1A"), /*#__PURE__*/React.createElement("select", {
+    value: searchRange,
+    onChange: function onChange(e) {
+      var value = e.target.value;
+      setSearchRange(value);
+      if (value === "selection") {
+        setSearchSelection(_.assign([], context.luckysheet_select_save));
+      }
+    }
+  }, /*#__PURE__*/React.createElement("option", {
+    value: "currentSheet"
+  }, currentSheetName ? "".concat(findAndReplace.searchRangeCurrentSheet, "\uFF08").concat(currentSheetName, "\uFF09") : findAndReplace.searchRangeCurrentSheet), isRealSelection && ( /*#__PURE__*/React.createElement("option", {
+    value: "selection"
+  }, selectionRangeDisplay)), /*#__PURE__*/React.createElement("option", {
+    value: "all"
+  }, findAndReplace.searchRangeAllSheet))), /*#__PURE__*/React.createElement("div", {
     className: "textboxs",
     id: "searchInput"
   }, findAndReplace.findTextbox, "\uFF1A", /*#__PURE__*/React.createElement("input", {
@@ -1787,7 +1854,7 @@ var SearchReplace = function SearchReplace() {
     onClick: function onClick() {
       setContext(function (draftCtx) {
         setSelectedCell(undefined);
-        var alertMsg = replaceAll(draftCtx, searchText, replaceText, checkMode, searchType);
+        var alertMsg = replaceAll(draftCtx, searchText, replaceText, checkMode, searchType, searchRange, searchSelection);
         showAlert(alertMsg);
       });
     }
@@ -1797,7 +1864,7 @@ var SearchReplace = function SearchReplace() {
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSelectedCell(undefined);
-        var alertMsg = replace(draftCtx, searchText, replaceText, checkMode, searchType);
+        var alertMsg = replace(draftCtx, searchText, replaceText, checkMode, searchType, searchRange, searchSelection);
         if (alertMsg != null) {
           showAlert(alertMsg);
         }
@@ -1810,7 +1877,7 @@ var SearchReplace = function SearchReplace() {
       return setContext(function (draftCtx) {
         setSelectedCell(undefined);
         if (!searchText) return;
-        var res = searchAll(draftCtx, searchText, checkMode, searchType);
+        var res = searchAll(draftCtx, searchText, checkMode, searchType, searchRange, searchSelection);
         setSearchResult(res);
         if (_.isEmpty(res)) showAlert(findAndReplace.noFindTip);
       });
@@ -1821,14 +1888,11 @@ var SearchReplace = function SearchReplace() {
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSearchResult([]);
-        var alertMsg = searchNext(draftCtx, searchText, checkMode, searchType);
+        var alertMsg = searchNext(draftCtx, searchText, checkMode, searchType, searchRange, searchSelection);
         if (alertMsg != null) showAlert(alertMsg);
       });
     }
-  }, findAndReplace.findBtn))), /*#__PURE__*/React.createElement("div", {
-    className: "close-button leankylin-message-box-button button-default",
-    onClick: closeDialog
-  }, button.close), searchResult.length > 0 && ( /*#__PURE__*/React.createElement("div", {
+  }, findAndReplace.findBtn))), searchResult.length > 0 && ( /*#__PURE__*/React.createElement("div", {
     id: "searchAllbox",
     onScroll: function onScroll(e) {
       return e.stopPropagation();
@@ -1861,7 +1925,10 @@ var SearchReplace = function SearchReplace() {
         });
       }
     }, /*#__PURE__*/React.createElement("span", null, v.sheetName), /*#__PURE__*/React.createElement("span", null, v.cellPosition), /*#__PURE__*/React.createElement("span", null, v.value), /*#__PURE__*/React.createElement("span", null, v.formula), /*#__PURE__*/React.createElement("span", null, v.displayValue));
-  })))))), body);
+  })))), /*#__PURE__*/React.createElement("div", {
+    className: "close-button leankylin-message-box-button button-default",
+    onClick: closeDialog
+  }, button.close))), body);
 };
 
 var LinkEditCard = function LinkEditCard(_ref) {

package/dist/index.js

@@ -1595,6 +1595,29 @@ function useAlert() {
   };
 }
 
+function getSelectionRangeName(selection) {
+  if (selection == null || selection.length === 0) return null;
+  var names = [];
+  var _iterator = _createForOfIteratorHelper(selection),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      var row = item.row,
+        column = item.column;
+      var row1 = Math.min(row[0], row[1]);
+      var row2 = Math.max(row[0], row[1]);
+      var col1 = Math.min(column[0], column[1]);
+      var col2 = Math.max(column[0], column[1]);
+      names.push(row1 === row2 && col1 === col2 ? "".concat(core.chatatABC(col1)).concat(row1 + 1) : "".concat(core.chatatABC(col1)).concat(row1 + 1, ":").concat(core.chatatABC(col2)).concat(row2 + 1));
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return names.join(",");
+}
 var SearchReplace = function SearchReplace() {
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context,
@@ -1637,6 +1660,33 @@ var SearchReplace = function SearchReplace() {
     _useState14 = _slicedToArray(_useState13, 2),
     searchType = _useState14[0],
     setSearchType = _useState14[1];
+  var _useState15 = React.useState("currentSheet"),
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchRange = _useState16[0],
+    setSearchRange = _useState16[1];
+  var _useState17 = React.useState([]),
+    _useState18 = _slicedToArray(_useState17, 2),
+    searchSelection = _useState18[0],
+    setSearchSelection = _useState18[1];
+  var sheetIndex = core.getSheetIndex(context, context.currentSheetId);
+  var currentSheetName = sheetIndex == null ? null : context.luckysheetfile[sheetIndex].name;
+  var isRealSelection = React.useMemo(function () {
+    var selection = context.luckysheet_select_save;
+    return selection != null && selection.length > 0 && !(selection.length === 1 && selection[0].row[0] === selection[0].row[1] && selection[0].column[0] === selection[0].column[1]);
+  }, [context.luckysheet_select_save]);
+  React.useEffect(function () {
+    if (searchRange !== "selection") return;
+    if (isRealSelection) {
+      setSearchSelection(___default['default'].assign([], context.luckysheet_select_save));
+    } else {
+      setSearchRange("currentSheet");
+    }
+  }, [isRealSelection, searchRange, context.luckysheet_select_save]);
+  var selectionRangeName = getSelectionRangeName(context.luckysheet_select_save);
+  var selectionRangeDisplay = findAndReplace.searchRangeSelection;
+  if (selectionRangeName != null) {
+    selectionRangeDisplay = currentSheetName ? "".concat(findAndReplace.searchRangeSelection, " (").concat(currentSheetName, "!").concat(selectionRangeName, ")") : "".concat(findAndReplace.searchRangeSelection, " (").concat(selectionRangeName, ")");
+  }
   var closeDialog = React.useCallback(function () {
     ___default['default'].set(refs.globalCache, "searchDialog.mouseEnter", false);
     setContext(function (draftCtx) {
@@ -1734,6 +1784,23 @@ var SearchReplace = function SearchReplace() {
   }, findAndReplace.searchTypeFormula), /*#__PURE__*/React__default['default'].createElement("option", {
     value: "m"
   }, findAndReplace.searchTypeDisplay))), /*#__PURE__*/React__default['default'].createElement("div", {
+    id: "searchRangeSelect"
+  }, /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchRangeLabel, "\uFF1A"), /*#__PURE__*/React__default['default'].createElement("select", {
+    value: searchRange,
+    onChange: function onChange(e) {
+      var value = e.target.value;
+      setSearchRange(value);
+      if (value === "selection") {
+        setSearchSelection(___default['default'].assign([], context.luckysheet_select_save));
+      }
+    }
+  }, /*#__PURE__*/React__default['default'].createElement("option", {
+    value: "currentSheet"
+  }, currentSheetName ? "".concat(findAndReplace.searchRangeCurrentSheet, "\uFF08").concat(currentSheetName, "\uFF09") : findAndReplace.searchRangeCurrentSheet), isRealSelection && ( /*#__PURE__*/React__default['default'].createElement("option", {
+    value: "selection"
+  }, selectionRangeDisplay)), /*#__PURE__*/React__default['default'].createElement("option", {
+    value: "all"
+  }, findAndReplace.searchRangeAllSheet))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "textboxs",
     id: "searchInput"
   }, findAndReplace.findTextbox, "\uFF1A", /*#__PURE__*/React__default['default'].createElement("input", {
@@ -1797,7 +1864,7 @@ var SearchReplace = function SearchReplace() {
     onClick: function onClick() {
       setContext(function (draftCtx) {
         setSelectedCell(undefined);
-        var alertMsg = core.replaceAll(draftCtx, searchText, replaceText, checkMode, searchType);
+        var alertMsg = core.replaceAll(draftCtx, searchText, replaceText, checkMode, searchType, searchRange, searchSelection);
         showAlert(alertMsg);
       });
     }
@@ -1807,7 +1874,7 @@ var SearchReplace = function SearchReplace() {
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSelectedCell(undefined);
-        var alertMsg = core.replace(draftCtx, searchText, replaceText, checkMode, searchType);
+        var alertMsg = core.replace(draftCtx, searchText, replaceText, checkMode, searchType, searchRange, searchSelection);
         if (alertMsg != null) {
           showAlert(alertMsg);
         }
@@ -1820,7 +1887,7 @@ var SearchReplace = function SearchReplace() {
       return setContext(function (draftCtx) {
         setSelectedCell(undefined);
         if (!searchText) return;
-        var res = core.searchAll(draftCtx, searchText, checkMode, searchType);
+        var res = core.searchAll(draftCtx, searchText, checkMode, searchType, searchRange, searchSelection);
         setSearchResult(res);
         if (___default['default'].isEmpty(res)) showAlert(findAndReplace.noFindTip);
       });
@@ -1831,14 +1898,11 @@ var SearchReplace = function SearchReplace() {
     onClick: function onClick() {
       return setContext(function (draftCtx) {
         setSearchResult([]);
-        var alertMsg = core.searchNext(draftCtx, searchText, checkMode, searchType);
+        var alertMsg = core.searchNext(draftCtx, searchText, checkMode, searchType, searchRange, searchSelection);
         if (alertMsg != null) showAlert(alertMsg);
       });
     }
-  }, findAndReplace.findBtn))), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "close-button leankylin-message-box-button button-default",
-    onClick: closeDialog
-  }, button.close), searchResult.length > 0 && ( /*#__PURE__*/React__default['default'].createElement("div", {
+  }, findAndReplace.findBtn))), searchResult.length > 0 && ( /*#__PURE__*/React__default['default'].createElement("div", {
     id: "searchAllbox",
     onScroll: function onScroll(e) {
       return e.stopPropagation();
@@ -1871,7 +1935,10 @@ var SearchReplace = function SearchReplace() {
         });
       }
     }, /*#__PURE__*/React__default['default'].createElement("span", null, v.sheetName), /*#__PURE__*/React__default['default'].createElement("span", null, v.cellPosition), /*#__PURE__*/React__default['default'].createElement("span", null, v.value), /*#__PURE__*/React__default['default'].createElement("span", null, v.formula), /*#__PURE__*/React__default['default'].createElement("span", null, v.displayValue));
-  })))))), body);
+  })))), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "close-button leankylin-message-box-button button-default",
+    onClick: closeDialog
+  }, button.close))), body);
 };
 
 var LinkEditCard = function LinkEditCard(_ref) {

package/dist/index.umd.css

@@ -1579,8 +1579,9 @@ html::-webkit-scrollbar-button {
   color: #555;
 }
 
-/* 搜索范围下拉 - 与查找/替换输入行同样的布局，select 展开至 input 相同宽度 */
-#leankylin-search-replace #searchTypeSelect {
+/* 搜索范围/搜索区域下拉 - 与查找/替换输入行同样的布局，select 展开至 input 相同宽度 */
+#leankylin-search-replace #searchTypeSelect,
+#leankylin-search-replace #searchRangeSelect {
   display: flex;
   align-items: center;
   gap: 8px;
@@ -1589,11 +1590,13 @@ html::-webkit-scrollbar-button {
   white-space: nowrap;
 }
 
-#leankylin-search-replace #searchTypeSelect > span {
+#leankylin-search-replace #searchTypeSelect > span,
+#leankylin-search-replace #searchRangeSelect > span {
   flex-shrink: 0;
 }
 
-#leankylin-search-replace #searchTypeSelect select {
+#leankylin-search-replace #searchTypeSelect select,
+#leankylin-search-replace #searchRangeSelect select {
   flex: 1;
   width: auto;
   height: 32px;
@@ -1615,11 +1618,13 @@ html::-webkit-scrollbar-button {
   box-sizing: border-box;
 }
 
-#leankylin-search-replace #searchTypeSelect select:hover {
+#leankylin-search-replace #searchTypeSelect select:hover,
+#leankylin-search-replace #searchRangeSelect select:hover {
   border-color: #b0aefe;
 }
 
-#leankylin-search-replace #searchTypeSelect select:focus {
+#leankylin-search-replace #searchTypeSelect select:focus,
+#leankylin-search-replace #searchRangeSelect select:focus {
   border-color: #8C89FE;
   box-shadow: 0 0 0 3px rgba(140, 137, 254, 0.12);
 }
@@ -1650,10 +1655,14 @@ html::-webkit-scrollbar-button {
   background-color: #f9f9ff;
 }
 
-/* 关闭按钮 */
+/* 关闭按钮：始终固定于弹窗右下角，宽度紧凑 */
 #leankylin-search-replace .close-button {
+  position: sticky;
+  bottom: 12px;
+  align-self: flex-end;
+  flex-shrink: 0;
   margin: 12px 0 0;
-  padding: 6px 20px;
+  padding: 6px 14px;
   border-radius: 6px;
   font-size: 13px;
   transition: all 0.15s;

package/dist/index.umd.js

@@ -20669,6 +20669,29 @@
     };
   }
 
+  function getSelectionRangeName(selection) {
+    if (selection == null || selection.length === 0) return null;
+    var names = [];
+    var _iterator = _createForOfIteratorHelper(selection),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        var row = item.row,
+          column = item.column;
+        var row1 = Math.min(row[0], row[1]);
+        var row2 = Math.max(row[0], row[1]);
+        var col1 = Math.min(column[0], column[1]);
+        var col2 = Math.max(column[0], column[1]);
+        names.push(row1 === row2 && col1 === col2 ? "".concat(core.chatatABC(col1)).concat(row1 + 1) : "".concat(core.chatatABC(col1)).concat(row1 + 1, ":").concat(core.chatatABC(col2)).concat(row2 + 1));
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return names.join(",");
+  }
   var SearchReplace = function SearchReplace() {
     var _useContext = React.useContext(WorkbookContext),
       context = _useContext.context,
@@ -20711,6 +20734,33 @@
       _useState14 = _slicedToArray(_useState13, 2),
       searchType = _useState14[0],
       setSearchType = _useState14[1];
+    var _useState15 = React.useState("currentSheet"),
+      _useState16 = _slicedToArray(_useState15, 2),
+      searchRange = _useState16[0],
+      setSearchRange = _useState16[1];
+    var _useState17 = React.useState([]),
+      _useState18 = _slicedToArray(_useState17, 2),
+      searchSelection = _useState18[0],
+      setSearchSelection = _useState18[1];
+    var sheetIndex = core.getSheetIndex(context, context.currentSheetId);
+    var currentSheetName = sheetIndex == null ? null : context.luckysheetfile[sheetIndex].name;
+    var isRealSelection = React.useMemo(function () {
+      var selection = context.luckysheet_select_save;
+      return selection != null && selection.length > 0 && !(selection.length === 1 && selection[0].row[0] === selection[0].row[1] && selection[0].column[0] === selection[0].column[1]);
+    }, [context.luckysheet_select_save]);
+    React.useEffect(function () {
+      if (searchRange !== "selection") return;
+      if (isRealSelection) {
+        setSearchSelection(lodash.assign([], context.luckysheet_select_save));
+      } else {
+        setSearchRange("currentSheet");
+      }
+    }, [isRealSelection, searchRange, context.luckysheet_select_save]);
+    var selectionRangeName = getSelectionRangeName(context.luckysheet_select_save);
+    var selectionRangeDisplay = findAndReplace.searchRangeSelection;
+    if (selectionRangeName != null) {
+      selectionRangeDisplay = currentSheetName ? "".concat(findAndReplace.searchRangeSelection, " (").concat(currentSheetName, "!").concat(selectionRangeName, ")") : "".concat(findAndReplace.searchRangeSelection, " (").concat(selectionRangeName, ")");
+    }
     var closeDialog = React.useCallback(function () {
       lodash.set(refs.globalCache, "searchDialog.mouseEnter", false);
       setContext(function (draftCtx) {
@@ -20808,6 +20858,23 @@
     }, findAndReplace.searchTypeFormula), /*#__PURE__*/React__default['default'].createElement("option", {
       value: "m"
     }, findAndReplace.searchTypeDisplay))), /*#__PURE__*/React__default['default'].createElement("div", {
+      id: "searchRangeSelect"
+    }, /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchRangeLabel, "\uFF1A"), /*#__PURE__*/React__default['default'].createElement("select", {
+      value: searchRange,
+      onChange: function onChange(e) {
+        var value = e.target.value;
+        setSearchRange(value);
+        if (value === "selection") {
+          setSearchSelection(lodash.assign([], context.luckysheet_select_save));
+        }
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("option", {
+      value: "currentSheet"
+    }, currentSheetName ? "".concat(findAndReplace.searchRangeCurrentSheet, "\uFF08").concat(currentSheetName, "\uFF09") : findAndReplace.searchRangeCurrentSheet), isRealSelection && ( /*#__PURE__*/React__default['default'].createElement("option", {
+      value: "selection"
+    }, selectionRangeDisplay)), /*#__PURE__*/React__default['default'].createElement("option", {
+      value: "all"
+    }, findAndReplace.searchRangeAllSheet))), /*#__PURE__*/React__default['default'].createElement("div", {
       className: "textboxs",
       id: "searchInput"
     }, findAndReplace.findTextbox, "\uFF1A", /*#__PURE__*/React__default['default'].createElement("input", {
@@ -20871,7 +20938,7 @@
       onClick: function onClick() {
         setContext(function (draftCtx) {
           setSelectedCell(undefined);
-          var alertMsg = core.replaceAll(draftCtx, searchText, replaceText, checkMode, searchType);
+          var alertMsg = core.replaceAll(draftCtx, searchText, replaceText, checkMode, searchType, searchRange, searchSelection);
           showAlert(alertMsg);
         });
       }
@@ -20881,7 +20948,7 @@
       onClick: function onClick() {
         return setContext(function (draftCtx) {
           setSelectedCell(undefined);
-          var alertMsg = core.replace(draftCtx, searchText, replaceText, checkMode, searchType);
+          var alertMsg = core.replace(draftCtx, searchText, replaceText, checkMode, searchType, searchRange, searchSelection);
           if (alertMsg != null) {
             showAlert(alertMsg);
           }
@@ -20894,7 +20961,7 @@
         return setContext(function (draftCtx) {
           setSelectedCell(undefined);
           if (!searchText) return;
-          var res = core.searchAll(draftCtx, searchText, checkMode, searchType);
+          var res = core.searchAll(draftCtx, searchText, checkMode, searchType, searchRange, searchSelection);
           setSearchResult(res);
           if (lodash.isEmpty(res)) showAlert(findAndReplace.noFindTip);
         });
@@ -20905,14 +20972,11 @@
       onClick: function onClick() {
         return setContext(function (draftCtx) {
           setSearchResult([]);
-          var alertMsg = core.searchNext(draftCtx, searchText, checkMode, searchType);
+          var alertMsg = core.searchNext(draftCtx, searchText, checkMode, searchType, searchRange, searchSelection);
           if (alertMsg != null) showAlert(alertMsg);
         });
       }
-    }, findAndReplace.findBtn))), /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "close-button leankylin-message-box-button button-default",
-      onClick: closeDialog
-    }, button.close), searchResult.length > 0 && ( /*#__PURE__*/React__default['default'].createElement("div", {
+    }, findAndReplace.findBtn))), searchResult.length > 0 && ( /*#__PURE__*/React__default['default'].createElement("div", {
       id: "searchAllbox",
       onScroll: function onScroll(e) {
         return e.stopPropagation();
@@ -20945,7 +21009,10 @@
           });
         }
       }, /*#__PURE__*/React__default['default'].createElement("span", null, v.sheetName), /*#__PURE__*/React__default['default'].createElement("span", null, v.cellPosition), /*#__PURE__*/React__default['default'].createElement("span", null, v.value), /*#__PURE__*/React__default['default'].createElement("span", null, v.formula), /*#__PURE__*/React__default['default'].createElement("span", null, v.displayValue));
-    })))))), body);
+    })))), /*#__PURE__*/React__default['default'].createElement("div", {
+      className: "close-button leankylin-message-box-button button-default",
+      onClick: closeDialog
+    }, button.close))), body);
   };
 
   var LinkEditCard = function LinkEditCard(_ref) {