@leankylin-sheet/core 5.2.25 → 5.2.27

package/dist/index.esm.js

@@ -10504,6 +10504,10 @@ var en = {
     regexTextbox: "Regular Expression",
     wholeTextbox: "Whole word",
     distinguishTextbox: "Case sensitive",
+    searchTypeLabel: "Search In",
+    searchTypeValue: "Value",
+    searchTypeFormula: "Formula",
+    searchTypeDisplay: "Display Value",
     allReplaceBtn: "Replace All",
     replaceBtn: "Replace",
     allFindBtn: "Find All",
@@ -21080,6 +21084,10 @@ var zh = {
     regexTextbox: "正则表达式匹配",
     wholeTextbox: "整词匹配",
     distinguishTextbox: "区分大小写匹配",
+    searchTypeLabel: "搜索范围",
+    searchTypeValue: "值",
+    searchTypeFormula: "公式",
+    searchTypeDisplay: "显示值",
     allReplaceBtn: "全部替换",
     replaceBtn: "替换",
     allFindBtn: "查找全部",
@@ -31114,6 +31122,10 @@ var es = {
     regexTextbox: "Expresión Regular",
     wholeTextbox: "Palabra entera",
     distinguishTextbox: "Distingue mayúsculas y minúsculas",
+    searchTypeLabel: "Buscar en",
+    searchTypeValue: "Valor",
+    searchTypeFormula: "Fórmula",
+    searchTypeDisplay: "Valor mostrado",
     allReplaceBtn: "Reemplazar Todo",
     replaceBtn: "Reemplazar",
     allFindBtn: "Encontrar Todo",
@@ -53681,6 +53693,7 @@ function getSearchIndexArr(searchText, range, flowdata) {
     regCheck = _ref.regCheck,
     wordCheck = _ref.wordCheck,
     caseCheck = _ref.caseCheck;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var arr = [];
   var obj = {};
   for (var s = 0; s < range.length; s += 1) {
@@ -53692,7 +53705,15 @@ function getSearchIndexArr(searchText, range, flowdata) {
       for (var c = c1; c <= c2; c += 1) {
         var cell = flowdata[r][c];
         if (cell != null) {
-          var value = valueShowEs(r, c, flowdata);
+          var value = void 0;
+          if (searchType === "f") {
+            value = cell.f;
+          } else if (searchType === "m") {
+            var _cell$m;
+            value = (_cell$m = cell.m) !== null && _cell$m !== void 0 ? _cell$m : cell.v;
+          } else {
+            value = valueShowEs(r, c, flowdata);
+          }
           if (value === 0) {
             value = value.toString();
           }
@@ -53767,117 +53788,122 @@ function getSearchIndexArr(searchText, range, flowdata) {
   }
   return arr;
 }
+function searchSheet(searchText, checkModes, sheet) {
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
+  var flowdata = sheet.data;
+  if (!flowdata || flowdata.length === 0 || flowdata[0].length === 0) {
+    return [];
+  }
+  var range = [{
+    row: [0, flowdata.length - 1],
+    column: [0, flowdata[0].length - 1]
+  }];
+  return getSearchIndexArr(searchText, range, flowdata, checkModes, searchType);
+}
 function searchNext(ctx, searchText, checkModes) {
-  var _ctx$luckysheet_selec, _ctx$luckysheet_selec2;
+  var _getSheetIndex, _currentSelection$0$r, _currentSelection$, _currentSelection$0$c, _currentSelection$2;
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var _locale = locale(ctx),
     findAndReplace = _locale.findAndReplace;
-  var flowdata = getFlowdata(ctx);
-  if (searchText === "" || searchText == null || flowdata == null) {
+  if (searchText === "" || searchText == null) {
     return findAndReplace.searchInputTip;
   }
-  var range;
-  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
-    range = [{
-      row: [0, flowdata.length - 1],
-      column: [0, flowdata[0].length - 1],
-      row_focus: 0,
-      column_focus: 0
-    }];
-  } else {
-    range = _.assign([], ctx.luckysheet_select_save);
-  }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
-  if (searchIndexArr.length === 0) {
+  var sheets = ctx.luckysheetfile;
+  if (!sheets || sheets.length === 0) {
     return findAndReplace.noFindTip;
   }
-  var count = 0;
-  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec2 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec2 === void 0 ? void 0 : _ctx$luckysheet_selec2.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
-    if (_.size(ctx.luckysheet_select_save) === 0) {
-      count = 0;
-    } else {
-      for (var i = 0; i < searchIndexArr.length; i += 1) {
-        if (searchIndexArr[i].r === ctx.luckysheet_select_save[0].row[0] && searchIndexArr[i].c === ctx.luckysheet_select_save[0].column[0]) {
-          if (i === searchIndexArr.length - 1) {
-            count = 0;
-          } else {
-            count = i + 1;
-          }
+  var currentSheetIndex = (_getSheetIndex = getSheetIndex(ctx, ctx.currentSheetId)) !== null && _getSheetIndex !== void 0 ? _getSheetIndex : 0;
+  var currentSelection = ctx.luckysheet_select_save;
+  var currentR = (_currentSelection$0$r = currentSelection === null || currentSelection === void 0 ? void 0 : (_currentSelection$ = currentSelection[0]) === null || _currentSelection$ === void 0 ? void 0 : _currentSelection$.row_focus) !== null && _currentSelection$0$r !== void 0 ? _currentSelection$0$r : -1;
+  var currentC = (_currentSelection$0$c = currentSelection === null || currentSelection === void 0 ? void 0 : (_currentSelection$2 = currentSelection[0]) === null || _currentSelection$2 === void 0 ? void 0 : _currentSelection$2.column_focus) !== null && _currentSelection$0$c !== void 0 ? _currentSelection$0$c : -1;
+  var totalSheets = sheets.length;
+  for (var offset = 0; offset < totalSheets; offset += 1) {
+    var sheetIdx = (currentSheetIndex + offset) % totalSheets;
+    var sheet = sheets[sheetIdx];
+    var matches = searchSheet(searchText, checkModes, sheet, searchType);
+    if (matches.length === 0) continue;
+    var foundMatch = null;
+    if (offset === 0 && currentR >= 0 && currentC >= 0) {
+      for (var i = 0; i < matches.length; i += 1) {
+        var m = matches[i];
+        if (m.r > currentR || m.r === currentR && m.c > currentC) {
+          foundMatch = m;
           break;
         }
       }
     }
-    ctx.luckysheet_select_save = normalizeSelection(ctx, [{
-      row: [searchIndexArr[count].r, searchIndexArr[count].r],
-      column: [searchIndexArr[count].c, searchIndexArr[count].c]
-    }]);
-  } else {
-    var rf = range[range.length - 1].row_focus;
-    var cf = range[range.length - 1].column_focus;
-    for (var _i = 0; _i < searchIndexArr.length; _i += 1) {
-      if (searchIndexArr[_i].r === rf && searchIndexArr[_i].c === cf) {
-        if (_i === searchIndexArr.length - 1) {
-          count = 0;
-        } else {
-          count = _i + 1;
-        }
-        break;
+    if (!foundMatch && offset > 0) {
+      var _matches = _slicedToArray(matches, 1);
+      foundMatch = _matches[0];
+    }
+    if (!foundMatch && offset === 0 && matches.length > 0) {
+      var _matches2 = _slicedToArray(matches, 1);
+      foundMatch = _matches2[0];
+      if (matches.length === 1 && matches[0].r === currentR && matches[0].c === currentC) {
+        foundMatch = null;
       }
     }
-    for (var s = 0; s < range.length; s += 1) {
-      var r1 = range[s].row[0];
-      var r2 = range[s].row[1];
-      var c1 = range[s].column[0];
-      var c2 = range[s].column[1];
-      if (searchIndexArr[count].r >= r1 && searchIndexArr[count].r <= r2 && searchIndexArr[count].c >= c1 && searchIndexArr[count].c <= c2) {
-        var obj = range[s];
-        obj.row_focus = searchIndexArr[count].r;
-        obj.column_focus = searchIndexArr[count].c;
-        range.splice(s, 1);
-        range.push(obj);
-        break;
+    if (foundMatch) {
+      if (sheetIdx !== currentSheetIndex) {
+        changeSheet(ctx, sheet.id);
       }
+      ctx.luckysheet_select_save = normalizeSelection(ctx, [{
+        row: [foundMatch.r, foundMatch.r],
+        column: [foundMatch.c, foundMatch.c]
+      }]);
+      scrollToHighlightCell(ctx, foundMatch.r, foundMatch.c);
+      return null;
     }
-    ctx.luckysheet_select_save = range;
   }
-  scrollToHighlightCell(ctx, searchIndexArr[count].r, searchIndexArr[count].c);
-  return null;
+  return findAndReplace.noFindTip;
 }
 function searchAll(ctx, searchText, checkModes) {
-  var _ctx$luckysheet_selec3;
-  var flowdata = getFlowdata(ctx);
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var searchResult = [];
-  if (searchText === "" || searchText == null || flowdata == null) {
+  if (searchText === "" || searchText == null) {
     return searchResult;
   }
-  var range;
-  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec3 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec3 === void 0 ? void 0 : _ctx$luckysheet_selec3.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
-    range = [{
-      row: [0, flowdata.length - 1],
-      column: [0, flowdata[0].length - 1]
-    }];
-  } else {
-    range = _.assign([], ctx.luckysheet_select_save);
-  }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
-  if (searchIndexArr.length === 0) {
+  var sheets = ctx.luckysheetfile;
+  if (!sheets || sheets.length === 0) {
     return searchResult;
   }
-  for (var i = 0; i < searchIndexArr.length; i += 1) {
-    var _ctx$luckysheetfile;
-    var value_ShowEs = valueShowEs(searchIndexArr[i].r, searchIndexArr[i].c, flowdata).toString();
-    searchResult.push({
-      r: searchIndexArr[i].r,
-      c: searchIndexArr[i].c,
-      sheetName: (_ctx$luckysheetfile = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId) || 0]) === null || _ctx$luckysheetfile === void 0 ? void 0 : _ctx$luckysheetfile.name,
-      sheetId: ctx.currentSheetId,
-      cellPosition: "".concat(chatatABC(searchIndexArr[i].c)).concat(searchIndexArr[i].r + 1),
-      value: value_ShowEs
-    });
+  var firstMatch = null;
+  for (var sheetIdx = 0; sheetIdx < sheets.length; sheetIdx += 1) {
+    var sheet = sheets[sheetIdx];
+    var matches = searchSheet(searchText, checkModes, sheet, searchType);
+    if (matches.length === 0) continue;
+    var flowdata = sheet.data;
+    if (!flowdata) continue;
+    for (var i = 0; i < matches.length; i += 1) {
+      var match = matches[i];
+      var value_ShowEs = valueShowEs(match.r, match.c, flowdata).toString();
+      searchResult.push({
+        r: match.r,
+        c: match.c,
+        sheetName: sheet.name,
+        sheetId: sheet.id,
+        cellPosition: "".concat(chatatABC(match.c)).concat(match.r + 1),
+        value: value_ShowEs
+      });
+      if (!firstMatch) {
+        firstMatch = {
+          r: match.r,
+          c: match.c,
+          sheetId: sheet.id
+        };
+      }
+    }
+  }
+  if (firstMatch) {
+    if (firstMatch.sheetId !== ctx.currentSheetId) {
+      changeSheet(ctx, firstMatch.sheetId);
+    }
+    ctx.luckysheet_select_save = normalizeSelection(ctx, [{
+      row: [firstMatch.r, firstMatch.r],
+      column: [firstMatch.c, firstMatch.c]
+    }]);
+    scrollToHighlightCell(ctx, firstMatch.r, firstMatch.c);
   }
-  ctx.luckysheet_select_save = normalizeSelection(ctx, [{
-    row: [searchIndexArr[0].r, searchIndexArr[0].r],
-    column: [searchIndexArr[0].c, searchIndexArr[0].c]
-  }]);
   return searchResult;
 }
 function onSearchDialogMoveStart(globalCache, e, container) {
@@ -53926,7 +53952,8 @@ function onSearchDialogMoveEnd(globalCache) {
   _.set(globalCache, "searchDialog.moveProps", undefined);
 }
 function replace(ctx, searchText, replaceText, checkModes) {
-  var _ctx$luckysheet_selec4, _ctx$luckysheet_selec5;
+  var _ctx$luckysheet_selec, _ctx$luckysheet_selec2;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale2 = locale(ctx),
     findAndReplace = _locale2.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -53938,7 +53965,7 @@ function replace(ctx, searchText, replaceText, checkModes) {
     return findAndReplace.searchInputTip;
   }
   var range;
-  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec4 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec4 === void 0 ? void 0 : _ctx$luckysheet_selec4.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
+  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
     range = [{
       row: [0, flowdata.length - 1],
       column: [0, flowdata[0].length - 1]
@@ -53946,12 +53973,12 @@ function replace(ctx, searchText, replaceText, checkModes) {
   } else {
     range = _.assign([], ctx.luckysheet_select_save);
   }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
+  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes, searchType);
   if (searchIndexArr.length === 0) {
     return findAndReplace.noReplceTip;
   }
   var count = null;
-  var last = (_ctx$luckysheet_selec5 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec5 === void 0 ? void 0 : _ctx$luckysheet_selec5[ctx.luckysheet_select_save.length - 1];
+  var last = (_ctx$luckysheet_selec2 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec2 === void 0 ? void 0 : _ctx$luckysheet_selec2[ctx.luckysheet_select_save.length - 1];
   var rf = last === null || last === void 0 ? void 0 : last.row_focus;
   var cf = last === null || last === void 0 ? void 0 : last.column_focus;
   for (var i = 0; i < searchIndexArr.length; i += 1) {
@@ -53994,7 +54021,8 @@ function replace(ctx, searchText, replaceText, checkModes) {
   return null;
 }
 function replaceAll(ctx, searchText, replaceText, checkModes) {
-  var _ctx$luckysheet_selec6;
+  var _ctx$luckysheet_selec3;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale3 = locale(ctx),
     findAndReplace = _locale3.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -54006,7 +54034,7 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
     return findAndReplace.searchInputTip;
   }
   var range;
-  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec6 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec6 === void 0 ? void 0 : _ctx$luckysheet_selec6.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
+  if (_.size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec3 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec3 === void 0 ? void 0 : _ctx$luckysheet_selec3.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
     range = [{
       row: [0, flowdata.length - 1],
       column: [0, flowdata[0].length - 1]
@@ -54014,7 +54042,7 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
   } else {
     range = _.assign([], ctx.luckysheet_select_save);
   }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
+  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes, searchType);
   if (searchIndexArr.length === 0) {
     return findAndReplace.noReplceTip;
   }
@@ -54039,9 +54067,9 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
     } else {
       reg = new RegExp(getRegExpStr(searchText), "ig");
     }
-    for (var _i2 = 0; _i2 < searchIndexArr.length; _i2 += 1) {
-      var _r = searchIndexArr[_i2].r;
-      var _c = searchIndexArr[_i2].c;
+    for (var _i = 0; _i < searchIndexArr.length; _i += 1) {
+      var _r = searchIndexArr[_i].r;
+      var _c = searchIndexArr[_i].c;
       var _v2 = valueShowEs(_r, _c, d).toString().replace(reg, replaceText);
       setCellValue(ctx, _r, _c, d, _v2);
       range.push({

package/dist/index.js

@@ -10514,6 +10514,10 @@ var en = {
     regexTextbox: "Regular Expression",
     wholeTextbox: "Whole word",
     distinguishTextbox: "Case sensitive",
+    searchTypeLabel: "Search In",
+    searchTypeValue: "Value",
+    searchTypeFormula: "Formula",
+    searchTypeDisplay: "Display Value",
     allReplaceBtn: "Replace All",
     replaceBtn: "Replace",
     allFindBtn: "Find All",
@@ -21090,6 +21094,10 @@ var zh = {
     regexTextbox: "正则表达式匹配",
     wholeTextbox: "整词匹配",
     distinguishTextbox: "区分大小写匹配",
+    searchTypeLabel: "搜索范围",
+    searchTypeValue: "值",
+    searchTypeFormula: "公式",
+    searchTypeDisplay: "显示值",
     allReplaceBtn: "全部替换",
     replaceBtn: "替换",
     allFindBtn: "查找全部",
@@ -31124,6 +31132,10 @@ var es = {
     regexTextbox: "Expresión Regular",
     wholeTextbox: "Palabra entera",
     distinguishTextbox: "Distingue mayúsculas y minúsculas",
+    searchTypeLabel: "Buscar en",
+    searchTypeValue: "Valor",
+    searchTypeFormula: "Fórmula",
+    searchTypeDisplay: "Valor mostrado",
     allReplaceBtn: "Reemplazar Todo",
     replaceBtn: "Reemplazar",
     allFindBtn: "Encontrar Todo",
@@ -53691,6 +53703,7 @@ function getSearchIndexArr(searchText, range, flowdata) {
     regCheck = _ref.regCheck,
     wordCheck = _ref.wordCheck,
     caseCheck = _ref.caseCheck;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var arr = [];
   var obj = {};
   for (var s = 0; s < range.length; s += 1) {
@@ -53702,7 +53715,15 @@ function getSearchIndexArr(searchText, range, flowdata) {
       for (var c = c1; c <= c2; c += 1) {
         var cell = flowdata[r][c];
         if (cell != null) {
-          var value = valueShowEs(r, c, flowdata);
+          var value = void 0;
+          if (searchType === "f") {
+            value = cell.f;
+          } else if (searchType === "m") {
+            var _cell$m;
+            value = (_cell$m = cell.m) !== null && _cell$m !== void 0 ? _cell$m : cell.v;
+          } else {
+            value = valueShowEs(r, c, flowdata);
+          }
           if (value === 0) {
             value = value.toString();
           }
@@ -53777,117 +53798,122 @@ function getSearchIndexArr(searchText, range, flowdata) {
   }
   return arr;
 }
+function searchSheet(searchText, checkModes, sheet) {
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
+  var flowdata = sheet.data;
+  if (!flowdata || flowdata.length === 0 || flowdata[0].length === 0) {
+    return [];
+  }
+  var range = [{
+    row: [0, flowdata.length - 1],
+    column: [0, flowdata[0].length - 1]
+  }];
+  return getSearchIndexArr(searchText, range, flowdata, checkModes, searchType);
+}
 function searchNext(ctx, searchText, checkModes) {
-  var _ctx$luckysheet_selec, _ctx$luckysheet_selec2;
+  var _getSheetIndex, _currentSelection$0$r, _currentSelection$, _currentSelection$0$c, _currentSelection$2;
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var _locale = locale(ctx),
     findAndReplace = _locale.findAndReplace;
-  var flowdata = getFlowdata(ctx);
-  if (searchText === "" || searchText == null || flowdata == null) {
+  if (searchText === "" || searchText == null) {
     return findAndReplace.searchInputTip;
   }
-  var range;
-  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
-    range = [{
-      row: [0, flowdata.length - 1],
-      column: [0, flowdata[0].length - 1],
-      row_focus: 0,
-      column_focus: 0
-    }];
-  } else {
-    range = ___default['default'].assign([], ctx.luckysheet_select_save);
-  }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
-  if (searchIndexArr.length === 0) {
+  var sheets = ctx.luckysheetfile;
+  if (!sheets || sheets.length === 0) {
     return findAndReplace.noFindTip;
   }
-  var count = 0;
-  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec2 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec2 === void 0 ? void 0 : _ctx$luckysheet_selec2.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
-    if (___default['default'].size(ctx.luckysheet_select_save) === 0) {
-      count = 0;
-    } else {
-      for (var i = 0; i < searchIndexArr.length; i += 1) {
-        if (searchIndexArr[i].r === ctx.luckysheet_select_save[0].row[0] && searchIndexArr[i].c === ctx.luckysheet_select_save[0].column[0]) {
-          if (i === searchIndexArr.length - 1) {
-            count = 0;
-          } else {
-            count = i + 1;
-          }
+  var currentSheetIndex = (_getSheetIndex = getSheetIndex(ctx, ctx.currentSheetId)) !== null && _getSheetIndex !== void 0 ? _getSheetIndex : 0;
+  var currentSelection = ctx.luckysheet_select_save;
+  var currentR = (_currentSelection$0$r = currentSelection === null || currentSelection === void 0 ? void 0 : (_currentSelection$ = currentSelection[0]) === null || _currentSelection$ === void 0 ? void 0 : _currentSelection$.row_focus) !== null && _currentSelection$0$r !== void 0 ? _currentSelection$0$r : -1;
+  var currentC = (_currentSelection$0$c = currentSelection === null || currentSelection === void 0 ? void 0 : (_currentSelection$2 = currentSelection[0]) === null || _currentSelection$2 === void 0 ? void 0 : _currentSelection$2.column_focus) !== null && _currentSelection$0$c !== void 0 ? _currentSelection$0$c : -1;
+  var totalSheets = sheets.length;
+  for (var offset = 0; offset < totalSheets; offset += 1) {
+    var sheetIdx = (currentSheetIndex + offset) % totalSheets;
+    var sheet = sheets[sheetIdx];
+    var matches = searchSheet(searchText, checkModes, sheet, searchType);
+    if (matches.length === 0) continue;
+    var foundMatch = null;
+    if (offset === 0 && currentR >= 0 && currentC >= 0) {
+      for (var i = 0; i < matches.length; i += 1) {
+        var m = matches[i];
+        if (m.r > currentR || m.r === currentR && m.c > currentC) {
+          foundMatch = m;
           break;
         }
       }
     }
-    ctx.luckysheet_select_save = normalizeSelection(ctx, [{
-      row: [searchIndexArr[count].r, searchIndexArr[count].r],
-      column: [searchIndexArr[count].c, searchIndexArr[count].c]
-    }]);
-  } else {
-    var rf = range[range.length - 1].row_focus;
-    var cf = range[range.length - 1].column_focus;
-    for (var _i = 0; _i < searchIndexArr.length; _i += 1) {
-      if (searchIndexArr[_i].r === rf && searchIndexArr[_i].c === cf) {
-        if (_i === searchIndexArr.length - 1) {
-          count = 0;
-        } else {
-          count = _i + 1;
-        }
-        break;
+    if (!foundMatch && offset > 0) {
+      var _matches = _slicedToArray(matches, 1);
+      foundMatch = _matches[0];
+    }
+    if (!foundMatch && offset === 0 && matches.length > 0) {
+      var _matches2 = _slicedToArray(matches, 1);
+      foundMatch = _matches2[0];
+      if (matches.length === 1 && matches[0].r === currentR && matches[0].c === currentC) {
+        foundMatch = null;
       }
     }
-    for (var s = 0; s < range.length; s += 1) {
-      var r1 = range[s].row[0];
-      var r2 = range[s].row[1];
-      var c1 = range[s].column[0];
-      var c2 = range[s].column[1];
-      if (searchIndexArr[count].r >= r1 && searchIndexArr[count].r <= r2 && searchIndexArr[count].c >= c1 && searchIndexArr[count].c <= c2) {
-        var obj = range[s];
-        obj.row_focus = searchIndexArr[count].r;
-        obj.column_focus = searchIndexArr[count].c;
-        range.splice(s, 1);
-        range.push(obj);
-        break;
+    if (foundMatch) {
+      if (sheetIdx !== currentSheetIndex) {
+        changeSheet(ctx, sheet.id);
       }
+      ctx.luckysheet_select_save = normalizeSelection(ctx, [{
+        row: [foundMatch.r, foundMatch.r],
+        column: [foundMatch.c, foundMatch.c]
+      }]);
+      scrollToHighlightCell(ctx, foundMatch.r, foundMatch.c);
+      return null;
     }
-    ctx.luckysheet_select_save = range;
   }
-  scrollToHighlightCell(ctx, searchIndexArr[count].r, searchIndexArr[count].c);
-  return null;
+  return findAndReplace.noFindTip;
 }
 function searchAll(ctx, searchText, checkModes) {
-  var _ctx$luckysheet_selec3;
-  var flowdata = getFlowdata(ctx);
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var searchResult = [];
-  if (searchText === "" || searchText == null || flowdata == null) {
+  if (searchText === "" || searchText == null) {
     return searchResult;
   }
-  var range;
-  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec3 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec3 === void 0 ? void 0 : _ctx$luckysheet_selec3.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
-    range = [{
-      row: [0, flowdata.length - 1],
-      column: [0, flowdata[0].length - 1]
-    }];
-  } else {
-    range = ___default['default'].assign([], ctx.luckysheet_select_save);
-  }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
-  if (searchIndexArr.length === 0) {
+  var sheets = ctx.luckysheetfile;
+  if (!sheets || sheets.length === 0) {
     return searchResult;
   }
-  for (var i = 0; i < searchIndexArr.length; i += 1) {
-    var _ctx$luckysheetfile;
-    var value_ShowEs = valueShowEs(searchIndexArr[i].r, searchIndexArr[i].c, flowdata).toString();
-    searchResult.push({
-      r: searchIndexArr[i].r,
-      c: searchIndexArr[i].c,
-      sheetName: (_ctx$luckysheetfile = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId) || 0]) === null || _ctx$luckysheetfile === void 0 ? void 0 : _ctx$luckysheetfile.name,
-      sheetId: ctx.currentSheetId,
-      cellPosition: "".concat(chatatABC(searchIndexArr[i].c)).concat(searchIndexArr[i].r + 1),
-      value: value_ShowEs
-    });
+  var firstMatch = null;
+  for (var sheetIdx = 0; sheetIdx < sheets.length; sheetIdx += 1) {
+    var sheet = sheets[sheetIdx];
+    var matches = searchSheet(searchText, checkModes, sheet, searchType);
+    if (matches.length === 0) continue;
+    var flowdata = sheet.data;
+    if (!flowdata) continue;
+    for (var i = 0; i < matches.length; i += 1) {
+      var match = matches[i];
+      var value_ShowEs = valueShowEs(match.r, match.c, flowdata).toString();
+      searchResult.push({
+        r: match.r,
+        c: match.c,
+        sheetName: sheet.name,
+        sheetId: sheet.id,
+        cellPosition: "".concat(chatatABC(match.c)).concat(match.r + 1),
+        value: value_ShowEs
+      });
+      if (!firstMatch) {
+        firstMatch = {
+          r: match.r,
+          c: match.c,
+          sheetId: sheet.id
+        };
+      }
+    }
+  }
+  if (firstMatch) {
+    if (firstMatch.sheetId !== ctx.currentSheetId) {
+      changeSheet(ctx, firstMatch.sheetId);
+    }
+    ctx.luckysheet_select_save = normalizeSelection(ctx, [{
+      row: [firstMatch.r, firstMatch.r],
+      column: [firstMatch.c, firstMatch.c]
+    }]);
+    scrollToHighlightCell(ctx, firstMatch.r, firstMatch.c);
   }
-  ctx.luckysheet_select_save = normalizeSelection(ctx, [{
-    row: [searchIndexArr[0].r, searchIndexArr[0].r],
-    column: [searchIndexArr[0].c, searchIndexArr[0].c]
-  }]);
   return searchResult;
 }
 function onSearchDialogMoveStart(globalCache, e, container) {
@@ -53936,7 +53962,8 @@ function onSearchDialogMoveEnd(globalCache) {
   ___default['default'].set(globalCache, "searchDialog.moveProps", undefined);
 }
 function replace(ctx, searchText, replaceText, checkModes) {
-  var _ctx$luckysheet_selec4, _ctx$luckysheet_selec5;
+  var _ctx$luckysheet_selec, _ctx$luckysheet_selec2;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale2 = locale(ctx),
     findAndReplace = _locale2.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -53948,7 +53975,7 @@ function replace(ctx, searchText, replaceText, checkModes) {
     return findAndReplace.searchInputTip;
   }
   var range;
-  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec4 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec4 === void 0 ? void 0 : _ctx$luckysheet_selec4.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
+  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec === void 0 ? void 0 : _ctx$luckysheet_selec.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
     range = [{
       row: [0, flowdata.length - 1],
       column: [0, flowdata[0].length - 1]
@@ -53956,12 +53983,12 @@ function replace(ctx, searchText, replaceText, checkModes) {
   } else {
     range = ___default['default'].assign([], ctx.luckysheet_select_save);
   }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
+  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes, searchType);
   if (searchIndexArr.length === 0) {
     return findAndReplace.noReplceTip;
   }
   var count = null;
-  var last = (_ctx$luckysheet_selec5 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec5 === void 0 ? void 0 : _ctx$luckysheet_selec5[ctx.luckysheet_select_save.length - 1];
+  var last = (_ctx$luckysheet_selec2 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec2 === void 0 ? void 0 : _ctx$luckysheet_selec2[ctx.luckysheet_select_save.length - 1];
   var rf = last === null || last === void 0 ? void 0 : last.row_focus;
   var cf = last === null || last === void 0 ? void 0 : last.column_focus;
   for (var i = 0; i < searchIndexArr.length; i += 1) {
@@ -54004,7 +54031,8 @@ function replace(ctx, searchText, replaceText, checkModes) {
   return null;
 }
 function replaceAll(ctx, searchText, replaceText, checkModes) {
-  var _ctx$luckysheet_selec6;
+  var _ctx$luckysheet_selec3;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale3 = locale(ctx),
     findAndReplace = _locale3.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -54016,7 +54044,7 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
     return findAndReplace.searchInputTip;
   }
   var range;
-  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec6 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec6 === void 0 ? void 0 : _ctx$luckysheet_selec6.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
+  if (___default['default'].size(ctx.luckysheet_select_save) === 0 || ((_ctx$luckysheet_selec3 = ctx.luckysheet_select_save) === null || _ctx$luckysheet_selec3 === void 0 ? void 0 : _ctx$luckysheet_selec3.length) === 1 && ctx.luckysheet_select_save[0].row[0] === ctx.luckysheet_select_save[0].row[1] && ctx.luckysheet_select_save[0].column[0] === ctx.luckysheet_select_save[0].column[1]) {
     range = [{
       row: [0, flowdata.length - 1],
       column: [0, flowdata[0].length - 1]
@@ -54024,7 +54052,7 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
   } else {
     range = ___default['default'].assign([], ctx.luckysheet_select_save);
   }
-  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes);
+  var searchIndexArr = getSearchIndexArr(searchText, range, flowdata, checkModes, searchType);
   if (searchIndexArr.length === 0) {
     return findAndReplace.noReplceTip;
   }
@@ -54049,9 +54077,9 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
     } else {
       reg = new RegExp(getRegExpStr(searchText), "ig");
     }
-    for (var _i2 = 0; _i2 < searchIndexArr.length; _i2 += 1) {
-      var _r = searchIndexArr[_i2].r;
-      var _c = searchIndexArr[_i2].c;
+    for (var _i = 0; _i < searchIndexArr.length; _i += 1) {
+      var _r = searchIndexArr[_i].r;
+      var _c = searchIndexArr[_i].c;
       var _v2 = valueShowEs(_r, _c, d).toString().replace(reg, replaceText);
       setCellValue(ctx, _r, _c, d, _v2);
       range.push({

package/dist/locale/en.d.ts

@@ -500,6 +500,10 @@ declare const _default: {
         regexTextbox: string;
         wholeTextbox: string;
         distinguishTextbox: string;
+        searchTypeLabel: string;
+        searchTypeValue: string;
+        searchTypeFormula: string;
+        searchTypeDisplay: string;
         allReplaceBtn: string;
         replaceBtn: string;
         allFindBtn: string;

package/dist/locale/es.d.ts

@@ -625,6 +625,10 @@ declare const _default: {
         regexTextbox: string;
         wholeTextbox: string;
         distinguishTextbox: string;
+        searchTypeLabel: string;
+        searchTypeValue: string;
+        searchTypeFormula: string;
+        searchTypeDisplay: string;
         allReplaceBtn: string;
         replaceBtn: string;
         allFindBtn: string;

package/dist/locale/index.d.ts

@@ -518,6 +518,10 @@ declare function locale(ctx: Context): {
         regexTextbox: string;
         wholeTextbox: string;
         distinguishTextbox: string;
+        searchTypeLabel: string;
+        searchTypeValue: string;
+        searchTypeFormula: string;
+        searchTypeDisplay: string;
         allReplaceBtn: string;
         replaceBtn: string;
         allFindBtn: string;

package/dist/locale/zh.d.ts

@@ -517,6 +517,10 @@ declare const _default: {
         regexTextbox: string;
         wholeTextbox: string;
         distinguishTextbox: string;
+        searchTypeLabel: string;
+        searchTypeValue: string;
+        searchTypeFormula: string;
+        searchTypeDisplay: string;
         allReplaceBtn: string;
         replaceBtn: string;
         allFindBtn: string;

package/dist/locale/zh_tw.d.ts

@@ -663,6 +663,10 @@ declare const _default: {
         regexTextbox: string;
         wholeTextbox: string;
         distinguishTextbox: string;
+        searchTypeLabel: string;
+        searchTypeValue: string;
+        searchTypeFormula: string;
+        searchTypeDisplay: string;
         allReplaceBtn: string;
         replaceBtn: string;
         allFindBtn: string;

package/dist/modules/searchReplace.d.ts

@@ -1,5 +1,6 @@
 import { Context } from "../context";
 import { CellMatrix, SearchResult, GlobalCache } from "../types";
+export type SearchType = "v" | "m" | "f";
 export declare function getSearchIndexArr(searchText: string, range: {
     row: number[];
     column: number[];
@@ -7,7 +8,7 @@ export declare function getSearchIndexArr(searchText: string, range: {
     regCheck: boolean;
     wordCheck: boolean;
     caseCheck: boolean;
-}): {
+}, searchType?: SearchType): {
     r: number;
     c: number;
 }[];
@@ -15,12 +16,12 @@ export declare function searchNext(ctx: Context, searchText: string, checkModes:
     regCheck: boolean;
     wordCheck: boolean;
     caseCheck: boolean;
-}): string | null;
+}, searchType?: SearchType): string | null;
 export declare function searchAll(ctx: Context, searchText: string, checkModes: {
     regCheck: boolean;
     wordCheck: boolean;
     caseCheck: boolean;
-}): SearchResult[];
+}, searchType?: SearchType): SearchResult[];
 export declare function onSearchDialogMoveStart(globalCache: GlobalCache, e: MouseEvent, container: HTMLDivElement): void;
 export declare function onSearchDialogMove(globalCache: GlobalCache, e: MouseEvent): void;
 export declare function onSearchDialogMoveEnd(globalCache: GlobalCache): void;
@@ -28,9 +29,9 @@ export declare function replace(ctx: Context, searchText: string, replaceText: s
     regCheck: boolean;
     wordCheck: boolean;
     caseCheck: boolean;
-}): string | null;
+}, searchType?: SearchType): string | null;
 export declare function replaceAll(ctx: Context, searchText: string, replaceText: string, checkModes: {
     regCheck: boolean;
     wordCheck: boolean;
     caseCheck: boolean;
-}): string;
+}, searchType?: SearchType): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "5.2.25",
+  "version": "5.2.27",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "5.2.25",
+    "@leankylin-sheet/formula-parser": "5.2.27",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",