@fileverse-dev/fortune-core 1.2.61 → 1.2.62-patch-2

package/es/locale/en.js

@@ -3460,7 +3460,7 @@ export default {
       type: "rangeall"
     }]
   }, {
-    n: "NETWORKDAYS_INTL",
+    n: "NETWORKDAYS.INTL",
     t: 6,
     d: "Returns the number of net working days between two provided days excluding specified weekend days and holidays.",
     a: "Net working days between two dates (specifying weekends).",
@@ -3712,7 +3712,7 @@ export default {
       type: "rangeall"
     }]
   }, {
-    n: "WORKDAY_INTL",
+    n: "WORKDAY.INTL",
     t: 6,
     d: "Calculates the date after a specified number of workdays excluding specified weekend days and holidays.",
     a: "Date after a number of workdays (specifying weekends).",

package/es/modules/formula.js

@@ -689,7 +689,19 @@ export function insertUpdateFunctionGroup(ctx, r, c, id, calcChainSet) {
   file.calcChain = calcChain;
   ctx.luckysheetfile = luckysheetfile;
 }
+function replaceDotsInFunctionName(str) {
+  if (!str.startsWith("=")) return str;
+  var openParenIndex = str.indexOf("(");
+  if (openParenIndex === -1) return str;
+  var fnName = str.substring(1, openParenIndex);
+  var fixedFnName = fnName.replace(/\./g, "_");
+  return "=".concat(fixedFnName).concat(str.substring(openParenIndex));
+}
 export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc) {
+  var originalTxt = txt;
+  if (txt.toUpperCase().includes("NETWORKDAYS.INTL") || txt.toUpperCase().includes("WORKDAY.INTL")) {
+    txt = replaceDotsInFunctionName(txt);
+  }
   if (txt.indexOf(error.r) > -1) {
     return [false, error.r, txt];
   }
@@ -740,7 +752,7 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
   } else {
     clearCellError(ctx, r, c);
   }
-  return [true, !isError ? finalResult : "#ERROR", txt, isError && {
+  return [true, !isError ? finalResult : "#ERROR", originalTxt, isError && {
     row_column: "".concat(r, "_").concat(c),
     title: "Error",
     message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || detectedErrorFromValue || "Unknown Error"

package/es/modules/inline-string.d.ts

@@ -33,4 +33,4 @@ export declare function getInlineStringNoStyle(r: number, c: number, data: CellM
 export declare function convertCssToStyleList(cssText: string, originCell: Cell): CellStyle;
 export declare function convertSpanToShareString($dom: NodeListOf<HTMLSpanElement>, originCell: Cell): CellStyle[];
 export declare function updateInlineStringFormatOutside(cell: Cell, key: string, value: any): void;
-export declare function updateInlineStringFormat(ctx: Context, cell: Cell, attr: keyof Cell, value: any, cellInput: HTMLDivElement): void;
+export declare function updateInlineStringFormat(ctx: Context, attr: keyof Cell, value: any, cellInput: HTMLDivElement): void;

package/es/modules/inline-string.js

@@ -284,7 +284,7 @@ function extendCssText(origin, cover, isLimit) {
   }
   return newCss;
 }
-export function updateInlineStringFormat(ctx, cell, attr, value, cellInput) {
+export function updateInlineStringFormat(ctx, attr, value, cellInput) {
   var _a, _b, _c;
   var w = window.getSelection();
   if (!w) return;

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) || /= *XLOOKUP\s*\(/i.test(formulaString))) return false;
+  if (typeof formulaString !== "string" || !(/= *SORT\s*\(/i.test(formulaString) || /= *XLOOKUP\s*\(/i.test(formulaString) || /= *SEQUENCE\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/modules/toolbar.js

@@ -210,10 +210,7 @@ export function updateFormat(ctx, $input, d, attr, foucsStatus, canvas) {
     if (ctx.luckysheetCellUpdate.length > 0) {
       var value = $input.innerText;
       if (value.substring(0, 1) !== "=") {
-        var cell = d[ctx.luckysheetCellUpdate[0]][ctx.luckysheetCellUpdate[1]];
-        if (cell) {
-          updateInlineStringFormat(ctx, cell, attr, foucsStatus, $input);
-        }
+        updateInlineStringFormat(ctx, attr, foucsStatus, $input);
         return;
       }
     }

package/lib/locale/en.js

@@ -3466,7 +3466,7 @@ var _default = exports.default = {
       type: "rangeall"
     }]
   }, {
-    n: "NETWORKDAYS_INTL",
+    n: "NETWORKDAYS.INTL",
     t: 6,
     d: "Returns the number of net working days between two provided days excluding specified weekend days and holidays.",
     a: "Net working days between two dates (specifying weekends).",
@@ -3718,7 +3718,7 @@ var _default = exports.default = {
       type: "rangeall"
     }]
   }, {
-    n: "WORKDAY_INTL",
+    n: "WORKDAY.INTL",
     t: 6,
     d: "Calculates the date after a specified number of workdays excluding specified weekend days and holidays.",
     a: "Date after a number of workdays (specifying weekends).",

package/lib/modules/formula.js

@@ -719,7 +719,19 @@ function insertUpdateFunctionGroup(ctx, r, c, id, calcChainSet) {
   file.calcChain = calcChain;
   ctx.luckysheetfile = luckysheetfile;
 }
+function replaceDotsInFunctionName(str) {
+  if (!str.startsWith("=")) return str;
+  var openParenIndex = str.indexOf("(");
+  if (openParenIndex === -1) return str;
+  var fnName = str.substring(1, openParenIndex);
+  var fixedFnName = fnName.replace(/\./g, "_");
+  return "=".concat(fixedFnName).concat(str.substring(openParenIndex));
+}
 function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc) {
+  var originalTxt = txt;
+  if (txt.toUpperCase().includes("NETWORKDAYS.INTL") || txt.toUpperCase().includes("WORKDAY.INTL")) {
+    txt = replaceDotsInFunctionName(txt);
+  }
   if (txt.indexOf(_validation.error.r) > -1) {
     return [false, _validation.error.r, txt];
   }
@@ -770,7 +782,7 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
   } else {
     (0, _2.clearCellError)(ctx, r, c);
   }
-  return [true, !isError ? finalResult : "#ERROR", txt, isError && {
+  return [true, !isError ? finalResult : "#ERROR", originalTxt, isError && {
     row_column: "".concat(r, "_").concat(c),
     title: "Error",
     message: (formulaError === null || formulaError === void 0 ? void 0 : formulaError.toString()) || detectedErrorFromValue || "Unknown Error"

package/lib/modules/inline-string.d.ts

@@ -33,4 +33,4 @@ export declare function getInlineStringNoStyle(r: number, c: number, data: CellM
 export declare function convertCssToStyleList(cssText: string, originCell: Cell): CellStyle;
 export declare function convertSpanToShareString($dom: NodeListOf<HTMLSpanElement>, originCell: Cell): CellStyle[];
 export declare function updateInlineStringFormatOutside(cell: Cell, key: string, value: any): void;
-export declare function updateInlineStringFormat(ctx: Context, cell: Cell, attr: keyof Cell, value: any, cellInput: HTMLDivElement): void;
+export declare function updateInlineStringFormat(ctx: Context, attr: keyof Cell, value: any, cellInput: HTMLDivElement): void;

package/lib/modules/inline-string.js

@@ -299,7 +299,7 @@ function extendCssText(origin, cover, isLimit) {
   }
   return newCss;
 }
-function updateInlineStringFormat(ctx, cell, attr, value, cellInput) {
+function updateInlineStringFormat(ctx, attr, value, cellInput) {
   var _a, _b, _c;
   var w = window.getSelection();
   if (!w) return;

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) || /= *XLOOKUP\s*\(/i.test(formulaString))) return false;
+  if (typeof formulaString !== "string" || !(/= *SORT\s*\(/i.test(formulaString) || /= *XLOOKUP\s*\(/i.test(formulaString) || /= *SEQUENCE\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/modules/toolbar.js

@@ -243,10 +243,7 @@ function updateFormat(ctx, $input, d, attr, foucsStatus, canvas) {
     if (ctx.luckysheetCellUpdate.length > 0) {
       var value = $input.innerText;
       if (value.substring(0, 1) !== "=") {
-        var cell = d[ctx.luckysheetCellUpdate[0]][ctx.luckysheetCellUpdate[1]];
-        if (cell) {
-          (0, _inlineString.updateInlineStringFormat)(ctx, cell, attr, foucsStatus, $input);
-        }
+        (0, _inlineString.updateInlineStringFormat)(ctx, attr, foucsStatus, $input);
         return;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.61",
+  "version": "1.2.62-patch-2",
   "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.84",
+    "@fileverse-dev/formula-parser": "0.2.85-patch-1",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",