@fileverse-dev/fortune-core 1.1.71 → 1.1.73

package/es/events/paste.js

@@ -304,7 +304,7 @@ function setCellHyperlink(ctx, id, r, c, link) {
 function pasteHandlerOfCutPaste(ctx, copyRange) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   var allowEdit = isAllowEdit(ctx);
-  if (!allowEdit) return;
+  if (!allowEdit || ctx.isFlvReadOnly) return;
   if (!copyRange) return;
   var cfg = ctx.config || {};
   if (cfg.merge == null) {

package/es/locale/en.js

@@ -2851,6 +2851,55 @@ export default {
       repeat: "y",
       type: "rangeall"
     }]
+  }, {
+    n: "XLOOKUP",
+    t: 2,
+    d: "Cross lookup. Returns the values in the result range at the position where a match was found in the lookup range.",
+    a: "Cross lookup.",
+    m: [3, 4],
+    p: [{
+      name: "search_key",
+      detail: 'The value to search for. For example, `42`, `"Cats"`, or `I24`.',
+      example: "10003",
+      require: "m",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "lookup_range",
+      detail: "The range to consider for the search. This range must be a singular row or column.",
+      example: "A2:B26",
+      require: "m",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "result_range",
+      detail: "The range to consider for the result. This range's row or column size should be the same as the lookup_range's, depending on how the lookup is done.",
+      example: "A2:B26",
+      require: "m",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "missing_value",
+      detail: "The value to return if no match is found. If unspecified, an error is returned.",
+      example: "N/A",
+      require: "o",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "match_mode",
+      detail: "How to find a match for the search_key. 0 is for an exact match, 1 for an exact match or the next value that is bigger than the search_key, -1 for an exact match or the next value that is lower than the search_key, and 2 for a wildcard match. If unspecified, this defaults to finding an exact match.",
+      example: "0",
+      require: "o",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "search_mode",
+      detail: "How to search through the lookup range. 1 is to search from the first entry to the last one, -1 to search from the last entry to the first, 2 to search through the range using binary search and assuming the range is sorted in ascending order, and -2 to search through the range using binary search and assuming the range is sorted in descending order. If unspecified, this defaults to searching through the range from the first entry to the last one.",
+      example: "1",
+      require: "o",
+      repeat: "n",
+      type: "rangeall"
+    }]
   }, {
     n: "VLOOKUP",
     t: 2,

package/es/modules/cell.js

@@ -1,7 +1,17 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { getSheetIndex, indexToColumnChar, rgbToHex, processArray, getContentInParentheses } from "../utils";
+import { getSheetIndex, indexToColumnChar, rgbToHex, processArray, getContentInParentheses, getNumberFormat } from "../utils";
 import { checkCF, getComputeMap } from "./ConditionFormat";
 import { getFailureText, validateCellData } from "./dataVerification";
 import { genarate, update } from "./format";
@@ -93,7 +103,8 @@ export function getCellValue(r, c, data, attr) {
   return retv;
 }
 export function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  console.log("setCellValue", r, c, v);
   if (_.isNil(d)) {
     d = getFlowdata(ctx);
   }
@@ -205,6 +216,17 @@ export function setCellValue(ctx, r, c, d, v) {
           t: "n"
         };
       }
+      if (/^[\d.,]+$/.test(vupdate)) {
+        var flowdata = getFlowdata(ctx);
+        var args = (_g = getContentInParentheses(cell === null || cell === void 0 ? void 0 : cell.f)) === null || _g === void 0 ? void 0 : _g.split(",");
+        var cellRefs = args === null || args === void 0 ? void 0 : args.map(function (arg) {
+          return arg.trim().toUpperCase();
+        });
+        var formatted = processArray(cellRefs, d, flowdata);
+        if (formatted) {
+          cell.ct.fa = formatted;
+        }
+      }
       if (cell.v === Infinity || cell.v === -Infinity) {
         cell.m = cell.v.toString();
       } else {
@@ -244,10 +266,23 @@ export function setCellValue(ctx, r, c, d, v) {
         cell.m = update(cell.ct.fa, cell.v);
       }
     } else if (!_.isNil(cell.ct) && !_.isNil(cell.ct.fa) && cell.ct.fa !== "General") {
+      var fa = cell.ct.fa;
       if (isRealNum(vupdate)) {
+        if (commaPresent && !fa.includes(",") || String(vupdate).includes(".") && ((_j = (_h = String(vupdate).split(".")) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.length) !== ((_l = (_k = fa.split(".")) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.length) || fa.includes(",") !== String(vupdate).includes(",")) {
+          if (fa.includes(",") !== String(vupdate).includes(",")) {
+            commaPresent = true;
+          }
+          fa = getNumberFormat(String(vupdate), commaPresent);
+        }
         vupdate = parseFloat(vupdate);
+        if (cell === null || cell === void 0 ? void 0 : cell.ct) {
+          cell.ct = __assign(__assign({}, cell.ct), {
+            fa: fa,
+            t: "n"
+          });
+        }
       }
-      var mask = update(cell.ct.fa, vupdate);
+      var mask = update(fa, vupdate);
       if (mask === vupdate) {
         mask = genarate(vupdate);
         cell.m = mask[0].toString();
@@ -272,17 +307,7 @@ export function setCellValue(ctx, r, c, d, v) {
         }
         cell.v = vupdate;
         var strValue = String(vupdate);
-        var format = void 0;
-        var hasDecimal = strValue.includes(".");
-        var hasComma = commaPresent;
-        if (hasDecimal) {
-          var decimalCount = ((_g = strValue.split(".")[1]) === null || _g === void 0 ? void 0 : _g.length) || 0;
-          format = hasComma ? "#,##0.".concat("0".repeat(decimalCount)) : "0.".concat("0".repeat(decimalCount));
-        } else if (hasComma) {
-          format = "#,##0";
-        } else {
-          format = "0";
-        }
+        var format = getNumberFormat(strValue, commaPresent);
         cell.m = v.m ? v.m : update(format, cell.v);
         cell.ht = 2;
         cell.ct = {
@@ -500,13 +525,11 @@ export function cancelNormalSelected(ctx) {
 }
 export function updateCell(ctx, r, c, $input, value, canvas) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+  console.log("updateCell", ctx, r, c, $input, value, canvas);
   var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
-  if (!(value === null || value === void 0 ? void 0 : value.toString())) {
-    clearCellError(ctx, r, c);
-  }
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
   if (!_.isNil(dataVerification)) {
@@ -563,6 +586,10 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
     }
   }
   value = value || ($input === null || $input === void 0 ? void 0 : $input.innerText);
+  var shouldClearError = (oldValue === null || oldValue === void 0 ? void 0 : oldValue.f) ? oldValue.f !== value : (oldValue === null || oldValue === void 0 ? void 0 : oldValue.v) !== value;
+  if (shouldClearError) {
+    clearCellError(ctx, r, c);
+  }
   if (((_b = (_a = ctx.hooks).beforeUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, value)) === false) {
     cancelNormalSelected(ctx);
     return;

package/es/modules/formula.js

@@ -812,6 +812,7 @@ export function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isFo
     var cellCache = [[{
       v: undefined
     }]];
+    console.log("cellCache hhaahahah setCell value", cellCache);
     setCellValue(ctx, 0, 0, cellCache, value);
     ctx.formulaCache.execFunctionGlobalData["".concat(origin_r, "_").concat(origin_c, "_").concat(id)] = cellCache[0][0];
   }

package/es/modules/sort.js

@@ -174,7 +174,7 @@ function createRowsOrColumnsForSpilledValues(ctx, startRow, startColumn, spillRo
 export function spillSortResult(ctx, startRow, startCol, formulaResult, flowdata) {
   var formulaString = formulaResult === null || formulaResult === void 0 ? void 0 : formulaResult.f;
   var formulaValue = formulaResult === null || formulaResult === void 0 ? void 0 : formulaResult.v;
-  if (typeof formulaString !== "string" || !/= *SORT\s*\(/i.test(formulaString)) return false;
+  if (typeof formulaString !== "string" || !(/= *SORT\s*\(/i.test(formulaString) || /= *XLOOKUP\s*\(/i.test(formulaString))) return false;
   if (!Array.isArray(formulaValue)) return false;
   var valueMatrix = Array.isArray(formulaValue[0]) ? formulaValue : formulaValue.map(function (x) {
     return [x];

package/es/utils/index.d.ts

@@ -21,3 +21,5 @@ export declare function isLetterNumberPattern(str: string): boolean;
 export declare function removeLastSpan(htmlString: string): string;
 export declare function getContentInParentheses(str: string | null): string | null;
 export declare function processArray(cellReferences: any, d: any, flowData: any): undefined;
+export declare function getNumberFormat(strValue: any, commaPresent: boolean): string;
+export declare function checkIsCol(str: string): boolean | null;

package/es/utils/index.js

@@ -290,16 +290,47 @@ export function processArray(cellReferences, d, flowData) {
   });
   var formated;
   coordinates.forEach(function (coord) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     var row = coord[0],
       col = coord[1];
     if (row >= 0 && row < d.length && col >= 0 && col < d[row].length) {
       if (((_b = (_a = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _a === void 0 ? void 0 : _a.ct) === null || _b === void 0 ? void 0 : _b.fa) && ((_e = (_d = (_c = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _c === void 0 ? void 0 : _c.ct) === null || _d === void 0 ? void 0 : _d.fa) === null || _e === void 0 ? void 0 : _e.includes("#,##0"))) {
-        formated = "#,##0";
-      } else if (((_g = (_f = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _f === void 0 ? void 0 : _f.ct) === null || _g === void 0 ? void 0 : _g.fa) && ((_k = (_j = (_h = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _h === void 0 ? void 0 : _h.ct) === null || _j === void 0 ? void 0 : _j.fa) === null || _k === void 0 ? void 0 : _k.includes("#,##0.00"))) {
-        formated = "#,##0.00";
+        formated = (_g = (_f = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _f === void 0 ? void 0 : _f.ct) === null || _g === void 0 ? void 0 : _g.fa;
+      }
+      if (((_j = (_h = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _h === void 0 ? void 0 : _h.ct) === null || _j === void 0 ? void 0 : _j.fa) && ((_m = (_l = (_k = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _k === void 0 ? void 0 : _k.ct) === null || _l === void 0 ? void 0 : _l.fa) === null || _m === void 0 ? void 0 : _m.includes("#,##0."))) {
+        formated = (_p = (_o = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _o === void 0 ? void 0 : _o.ct) === null || _p === void 0 ? void 0 : _p.fa;
       }
     }
   });
   return formated;
+}
+export function getNumberFormat(strValue, commaPresent) {
+  var _a;
+  var format = "";
+  var hasDecimal = strValue.includes(".");
+  var hasComma = commaPresent;
+  if (hasDecimal) {
+    var decimalCount = ((_a = strValue.split(".")[1]) === null || _a === void 0 ? void 0 : _a.length) || 0;
+    format = hasComma ? "#,##0.".concat("0".repeat(decimalCount)) : "0.".concat("0".repeat(decimalCount));
+  } else if (hasComma) {
+    format = "#,##0";
+  } else {
+    format = "0";
+  }
+  return format;
+}
+export function checkIsCol(str) {
+  var _a;
+  var afterComma = (_a = str.split(",")[1]) === null || _a === void 0 ? void 0 : _a.trim();
+  if (!afterComma) return null;
+  var firstRange = afterComma.split(/[),]/)[0].trim();
+  var match = firstRange.match(/^([A-Z]+)(\d+):([A-Z]+)(\d+)$/i);
+  if (!match) return null;
+  var col1 = match[1],
+    row1 = match[2],
+    col2 = match[3],
+    row2 = match[4];
+  if (col1 === col2 && row1 !== row2) return false;
+  if (row1 === row2 && col1 !== col2) return true;
+  return null;
 }

package/lib/events/paste.js

@@ -313,7 +313,7 @@ function setCellHyperlink(ctx, id, r, c, link) {
 function pasteHandlerOfCutPaste(ctx, copyRange) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
-  if (!allowEdit) return;
+  if (!allowEdit || ctx.isFlvReadOnly) return;
   if (!copyRange) return;
   var cfg = ctx.config || {};
   if (cfg.merge == null) {

package/lib/locale/en.js

@@ -2857,6 +2857,55 @@ var _default = exports.default = {
       repeat: "y",
       type: "rangeall"
     }]
+  }, {
+    n: "XLOOKUP",
+    t: 2,
+    d: "Cross lookup. Returns the values in the result range at the position where a match was found in the lookup range.",
+    a: "Cross lookup.",
+    m: [3, 4],
+    p: [{
+      name: "search_key",
+      detail: 'The value to search for. For example, `42`, `"Cats"`, or `I24`.',
+      example: "10003",
+      require: "m",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "lookup_range",
+      detail: "The range to consider for the search. This range must be a singular row or column.",
+      example: "A2:B26",
+      require: "m",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "result_range",
+      detail: "The range to consider for the result. This range's row or column size should be the same as the lookup_range's, depending on how the lookup is done.",
+      example: "A2:B26",
+      require: "m",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "missing_value",
+      detail: "The value to return if no match is found. If unspecified, an error is returned.",
+      example: "N/A",
+      require: "o",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "match_mode",
+      detail: "How to find a match for the search_key. 0 is for an exact match, 1 for an exact match or the next value that is bigger than the search_key, -1 for an exact match or the next value that is lower than the search_key, and 2 for a wildcard match. If unspecified, this defaults to finding an exact match.",
+      example: "0",
+      require: "o",
+      repeat: "n",
+      type: "rangeall"
+    }, {
+      name: "search_mode",
+      detail: "How to search through the lookup range. 1 is to search from the first entry to the last one, -1 to search from the last entry to the first, 2 to search through the range using binary search and assuming the range is sorted in ascending order, and -2 to search through the range using binary search and assuming the range is sorted in descending order. If unspecified, this defaults to searching through the range from the first entry to the last one.",
+      example: "1",
+      require: "o",
+      repeat: "n",
+      type: "rangeall"
+    }]
   }, {
     n: "VLOOKUP",
     t: 2,

package/lib/modules/cell.js

@@ -44,6 +44,16 @@ var _text = require("./text");
 var _sort = require("./sort");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 function normalizedCellAttr(cell, attr, defaultFontSize) {
   if (defaultFontSize === void 0) {
     defaultFontSize = 10;
@@ -126,7 +136,8 @@ function getCellValue(r, c, data, attr) {
   return retv;
 }
 function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  console.log("setCellValue", r, c, v);
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);
   }
@@ -238,6 +249,17 @@ function setCellValue(ctx, r, c, d, v) {
           t: "n"
         };
       }
+      if (/^[\d.,]+$/.test(vupdate)) {
+        var flowdata = (0, _context.getFlowdata)(ctx);
+        var args = (_g = (0, _utils.getContentInParentheses)(cell === null || cell === void 0 ? void 0 : cell.f)) === null || _g === void 0 ? void 0 : _g.split(",");
+        var cellRefs = args === null || args === void 0 ? void 0 : args.map(function (arg) {
+          return arg.trim().toUpperCase();
+        });
+        var formatted = (0, _utils.processArray)(cellRefs, d, flowdata);
+        if (formatted) {
+          cell.ct.fa = formatted;
+        }
+      }
       if (cell.v === Infinity || cell.v === -Infinity) {
         cell.m = cell.v.toString();
       } else {
@@ -277,10 +299,23 @@ function setCellValue(ctx, r, c, d, v) {
         cell.m = (0, _format.update)(cell.ct.fa, cell.v);
       }
     } else if (!_lodash.default.isNil(cell.ct) && !_lodash.default.isNil(cell.ct.fa) && cell.ct.fa !== "General") {
+      var fa = cell.ct.fa;
       if ((0, _validation.isRealNum)(vupdate)) {
+        if (commaPresent && !fa.includes(",") || String(vupdate).includes(".") && ((_j = (_h = String(vupdate).split(".")) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.length) !== ((_l = (_k = fa.split(".")) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.length) || fa.includes(",") !== String(vupdate).includes(",")) {
+          if (fa.includes(",") !== String(vupdate).includes(",")) {
+            commaPresent = true;
+          }
+          fa = (0, _utils.getNumberFormat)(String(vupdate), commaPresent);
+        }
         vupdate = parseFloat(vupdate);
+        if (cell === null || cell === void 0 ? void 0 : cell.ct) {
+          cell.ct = __assign(__assign({}, cell.ct), {
+            fa: fa,
+            t: "n"
+          });
+        }
       }
-      var mask = (0, _format.update)(cell.ct.fa, vupdate);
+      var mask = (0, _format.update)(fa, vupdate);
       if (mask === vupdate) {
         mask = (0, _format.genarate)(vupdate);
         cell.m = mask[0].toString();
@@ -305,17 +340,7 @@ function setCellValue(ctx, r, c, d, v) {
         }
         cell.v = vupdate;
         var strValue = String(vupdate);
-        var format = void 0;
-        var hasDecimal = strValue.includes(".");
-        var hasComma = commaPresent;
-        if (hasDecimal) {
-          var decimalCount = ((_g = strValue.split(".")[1]) === null || _g === void 0 ? void 0 : _g.length) || 0;
-          format = hasComma ? "#,##0.".concat("0".repeat(decimalCount)) : "0.".concat("0".repeat(decimalCount));
-        } else if (hasComma) {
-          format = "#,##0";
-        } else {
-          format = "0";
-        }
+        var format = (0, _utils.getNumberFormat)(strValue, commaPresent);
         cell.m = v.m ? v.m : (0, _format.update)(format, cell.v);
         cell.ht = 2;
         cell.ct = {
@@ -533,13 +558,11 @@ function cancelNormalSelected(ctx) {
 }
 function updateCell(ctx, r, c, $input, value, canvas) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+  console.log("updateCell", ctx, r, c, $input, value, canvas);
   var inputText = $input === null || $input === void 0 ? void 0 : $input.innerText;
   var inputHtml = $input === null || $input === void 0 ? void 0 : $input.innerHTML;
   var flowdata = (0, _context.getFlowdata)(ctx);
   if (!flowdata) return;
-  if (!(value === null || value === void 0 ? void 0 : value.toString())) {
-    (0, _api.clearCellError)(ctx, r, c);
-  }
   var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   var dataVerification = ctx.luckysheetfile[index].dataVerification;
   if (!_lodash.default.isNil(dataVerification)) {
@@ -596,6 +619,10 @@ function updateCell(ctx, r, c, $input, value, canvas) {
     }
   }
   value = value || ($input === null || $input === void 0 ? void 0 : $input.innerText);
+  var shouldClearError = (oldValue === null || oldValue === void 0 ? void 0 : oldValue.f) ? oldValue.f !== value : (oldValue === null || oldValue === void 0 ? void 0 : oldValue.v) !== value;
+  if (shouldClearError) {
+    (0, _api.clearCellError)(ctx, r, c);
+  }
   if (((_b = (_a = ctx.hooks).beforeUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, value)) === false) {
     cancelNormalSelected(ctx);
     return;

package/lib/modules/formula.js

@@ -842,6 +842,7 @@ function execFunctionGroup(ctx, origin_r, origin_c, value, id, data, isForce) {
     var cellCache = [[{
       v: undefined
     }]];
+    console.log("cellCache hhaahahah setCell value", cellCache);
     (0, _cell.setCellValue)(ctx, 0, 0, cellCache, value);
     ctx.formulaCache.execFunctionGlobalData["".concat(origin_r, "_").concat(origin_c, "_").concat(id)] = cellCache[0][0];
   }

package/lib/modules/sort.js

@@ -184,7 +184,7 @@ function createRowsOrColumnsForSpilledValues(ctx, startRow, startColumn, spillRo
 function spillSortResult(ctx, startRow, startCol, formulaResult, flowdata) {
   var formulaString = formulaResult === null || formulaResult === void 0 ? void 0 : formulaResult.f;
   var formulaValue = formulaResult === null || formulaResult === void 0 ? void 0 : formulaResult.v;
-  if (typeof formulaString !== "string" || !/= *SORT\s*\(/i.test(formulaString)) return false;
+  if (typeof formulaString !== "string" || !(/= *SORT\s*\(/i.test(formulaString) || /= *XLOOKUP\s*\(/i.test(formulaString))) return false;
   if (!Array.isArray(formulaValue)) return false;
   var valueMatrix = Array.isArray(formulaValue[0]) ? formulaValue : formulaValue.map(function (x) {
     return [x];

package/lib/utils/index.d.ts

@@ -21,3 +21,5 @@ export declare function isLetterNumberPattern(str: string): boolean;
 export declare function removeLastSpan(htmlString: string): string;
 export declare function getContentInParentheses(str: string | null): string | null;
 export declare function processArray(cellReferences: any, d: any, flowData: any): undefined;
+export declare function getNumberFormat(strValue: any, commaPresent: boolean): string;
+export declare function checkIsCol(str: string): boolean | null;

package/lib/utils/index.js

@@ -22,15 +22,19 @@ var _exportNames = {
   isLetterNumberPattern: true,
   removeLastSpan: true,
   getContentInParentheses: true,
-  processArray: true
+  processArray: true,
+  getNumberFormat: true,
+  checkIsCol: true
 };
 exports.chatatABC = chatatABC;
+exports.checkIsCol = checkIsCol;
 exports.columnCharToIndex = columnCharToIndex;
 exports.escapeHTMLTag = escapeHTMLTag;
 exports.escapeScriptTag = escapeScriptTag;
 exports.generateRandomSheetName = generateRandomSheetName;
 exports.getContentInParentheses = getContentInParentheses;
 exports.getNowDateTime = getNowDateTime;
+exports.getNumberFormat = getNumberFormat;
 exports.getRegExpStr = getRegExpStr;
 exports.getSheetByIndex = getSheetByIndex;
 exports.getSheetIdByName = getSheetIdByName;
@@ -358,16 +362,47 @@ function processArray(cellReferences, d, flowData) {
   });
   var formated;
   coordinates.forEach(function (coord) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     var row = coord[0],
       col = coord[1];
     if (row >= 0 && row < d.length && col >= 0 && col < d[row].length) {
       if (((_b = (_a = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _a === void 0 ? void 0 : _a.ct) === null || _b === void 0 ? void 0 : _b.fa) && ((_e = (_d = (_c = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _c === void 0 ? void 0 : _c.ct) === null || _d === void 0 ? void 0 : _d.fa) === null || _e === void 0 ? void 0 : _e.includes("#,##0"))) {
-        formated = "#,##0";
-      } else if (((_g = (_f = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _f === void 0 ? void 0 : _f.ct) === null || _g === void 0 ? void 0 : _g.fa) && ((_k = (_j = (_h = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _h === void 0 ? void 0 : _h.ct) === null || _j === void 0 ? void 0 : _j.fa) === null || _k === void 0 ? void 0 : _k.includes("#,##0.00"))) {
-        formated = "#,##0.00";
+        formated = (_g = (_f = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _f === void 0 ? void 0 : _f.ct) === null || _g === void 0 ? void 0 : _g.fa;
+      }
+      if (((_j = (_h = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _h === void 0 ? void 0 : _h.ct) === null || _j === void 0 ? void 0 : _j.fa) && ((_m = (_l = (_k = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _k === void 0 ? void 0 : _k.ct) === null || _l === void 0 ? void 0 : _l.fa) === null || _m === void 0 ? void 0 : _m.includes("#,##0."))) {
+        formated = (_p = (_o = flowData === null || flowData === void 0 ? void 0 : flowData[row][col]) === null || _o === void 0 ? void 0 : _o.ct) === null || _p === void 0 ? void 0 : _p.fa;
       }
     }
   });
   return formated;
+}
+function getNumberFormat(strValue, commaPresent) {
+  var _a;
+  var format = "";
+  var hasDecimal = strValue.includes(".");
+  var hasComma = commaPresent;
+  if (hasDecimal) {
+    var decimalCount = ((_a = strValue.split(".")[1]) === null || _a === void 0 ? void 0 : _a.length) || 0;
+    format = hasComma ? "#,##0.".concat("0".repeat(decimalCount)) : "0.".concat("0".repeat(decimalCount));
+  } else if (hasComma) {
+    format = "#,##0";
+  } else {
+    format = "0";
+  }
+  return format;
+}
+function checkIsCol(str) {
+  var _a;
+  var afterComma = (_a = str.split(",")[1]) === null || _a === void 0 ? void 0 : _a.trim();
+  if (!afterComma) return null;
+  var firstRange = afterComma.split(/[),]/)[0].trim();
+  var match = firstRange.match(/^([A-Z]+)(\d+):([A-Z]+)(\d+)$/i);
+  if (!match) return null;
+  var col1 = match[1],
+    row1 = match[2],
+    col2 = match[3],
+    row2 = match[4];
+  if (col1 === col2 && row1 !== row2) return false;
+  if (row1 === row2 && col1 !== col2) return true;
+  return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.1.71",
+  "version": "1.1.73",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
@@ -15,7 +15,7 @@
     "dev": "father-build --watch"
   },
   "dependencies": {
-    "@fileverse-dev/formula-parser": "0.2.70",
+    "@fileverse-dev/formula-parser": "0.2.71",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",