@leankylin-sheet/core 5.2.24 → 5.2.26

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",
@@ -35545,7 +35557,10 @@ var FormulaCache = /*#__PURE__*/function () {
     key: "tryGetCellAsNumber",
     value: function tryGetCellAsNumber(cell) {
       var _cell$ct;
-      if ((cell === null || cell === void 0 ? void 0 : (_cell$ct = cell.ct) === null || _cell$ct === void 0 ? void 0 : _cell$ct.t) === "n") {
+      if (_.isNil(cell === null || cell === void 0 ? void 0 : cell.v)) {
+        return null;
+      }
+      if ((cell === null || cell === void 0 ? void 0 : (_cell$ct = cell.ct) === null || _cell$ct === void 0 ? void 0 : _cell$ct.t) === "n" && (cell === null || cell === void 0 ? void 0 : cell.v)) {
         var n = Number(cell === null || cell === void 0 ? void 0 : cell.v);
         return Number.isNaN(n) ? cell.v : n;
       }
@@ -53678,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) {
@@ -53689,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();
           }
@@ -53766,6 +53790,7 @@ function getSearchIndexArr(searchText, range, flowdata) {
 }
 function searchNext(ctx, searchText, checkModes) {
   var _ctx$luckysheet_selec, _ctx$luckysheet_selec2;
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var _locale = locale(ctx),
     findAndReplace = _locale.findAndReplace;
   var flowdata = getFlowdata(ctx);
@@ -53783,7 +53808,7 @@ function searchNext(ctx, searchText, 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.noFindTip;
   }
@@ -53841,6 +53866,7 @@ function searchNext(ctx, searchText, checkModes) {
 }
 function searchAll(ctx, searchText, checkModes) {
   var _ctx$luckysheet_selec3;
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var flowdata = getFlowdata(ctx);
   var searchResult = [];
   if (searchText === "" || searchText == null || flowdata == null) {
@@ -53855,7 +53881,7 @@ function searchAll(ctx, searchText, 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 searchResult;
   }
@@ -53924,6 +53950,7 @@ function onSearchDialogMoveEnd(globalCache) {
 }
 function replace(ctx, searchText, replaceText, checkModes) {
   var _ctx$luckysheet_selec4, _ctx$luckysheet_selec5;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale2 = locale(ctx),
     findAndReplace = _locale2.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -53943,7 +53970,7 @@ 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;
   }
@@ -53992,6 +54019,7 @@ function replace(ctx, searchText, replaceText, checkModes) {
 }
 function replaceAll(ctx, searchText, replaceText, checkModes) {
   var _ctx$luckysheet_selec6;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale3 = locale(ctx),
     findAndReplace = _locale3.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -54011,7 +54039,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;
   }

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",
@@ -35555,7 +35567,10 @@ var FormulaCache = /*#__PURE__*/function () {
     key: "tryGetCellAsNumber",
     value: function tryGetCellAsNumber(cell) {
       var _cell$ct;
-      if ((cell === null || cell === void 0 ? void 0 : (_cell$ct = cell.ct) === null || _cell$ct === void 0 ? void 0 : _cell$ct.t) === "n") {
+      if (___default['default'].isNil(cell === null || cell === void 0 ? void 0 : cell.v)) {
+        return null;
+      }
+      if ((cell === null || cell === void 0 ? void 0 : (_cell$ct = cell.ct) === null || _cell$ct === void 0 ? void 0 : _cell$ct.t) === "n" && (cell === null || cell === void 0 ? void 0 : cell.v)) {
         var n = Number(cell === null || cell === void 0 ? void 0 : cell.v);
         return Number.isNaN(n) ? cell.v : n;
       }
@@ -53688,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) {
@@ -53699,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();
           }
@@ -53776,6 +53800,7 @@ function getSearchIndexArr(searchText, range, flowdata) {
 }
 function searchNext(ctx, searchText, checkModes) {
   var _ctx$luckysheet_selec, _ctx$luckysheet_selec2;
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var _locale = locale(ctx),
     findAndReplace = _locale.findAndReplace;
   var flowdata = getFlowdata(ctx);
@@ -53793,7 +53818,7 @@ function searchNext(ctx, searchText, 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.noFindTip;
   }
@@ -53851,6 +53876,7 @@ function searchNext(ctx, searchText, checkModes) {
 }
 function searchAll(ctx, searchText, checkModes) {
   var _ctx$luckysheet_selec3;
+  var searchType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "v";
   var flowdata = getFlowdata(ctx);
   var searchResult = [];
   if (searchText === "" || searchText == null || flowdata == null) {
@@ -53865,7 +53891,7 @@ function searchAll(ctx, searchText, 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 searchResult;
   }
@@ -53934,6 +53960,7 @@ function onSearchDialogMoveEnd(globalCache) {
 }
 function replace(ctx, searchText, replaceText, checkModes) {
   var _ctx$luckysheet_selec4, _ctx$luckysheet_selec5;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale2 = locale(ctx),
     findAndReplace = _locale2.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -53953,7 +53980,7 @@ 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;
   }
@@ -54002,6 +54029,7 @@ function replace(ctx, searchText, replaceText, checkModes) {
 }
 function replaceAll(ctx, searchText, replaceText, checkModes) {
   var _ctx$luckysheet_selec6;
+  var searchType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "v";
   var _locale3 = locale(ctx),
     findAndReplace = _locale3.findAndReplace;
   var allowEdit = isAllowEdit(ctx);
@@ -54021,7 +54049,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;
   }

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/formula.d.ts

@@ -25,7 +25,7 @@ export declare class FormulaCache {
     execFunctionExist?: any[];
     execFunctionGlobalData: any;
     constructor();
-    tryGetCellAsNumber(cell: Cell): string | number | boolean | undefined;
+    tryGetCellAsNumber(cell: Cell): string | number | boolean | null;
 }
 export declare function iscelldata(txt: string): boolean;
 export declare function getcellrange(ctx: Context, txt: string, formulaId?: string): any;

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.24",
+  "version": "5.2.26",
   "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.24",
+    "@leankylin-sheet/formula-parser": "5.2.26",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",