@fileverse-dev/fortune-core 1.2.86 → 1.2.88

package/es/api/sheet.d.ts

@@ -8,3 +8,4 @@ export declare function hideSheet(ctx: Context, sheetId: string): void;
 export declare function showSheet(ctx: Context, sheetId: string): void;
 export declare function copySheet(ctx: Context, sheetId: string): void;
 export declare function calculateSheetFromula(ctx: Context, id: string): void;
+export declare function calculateReferencedCellSheetFromula(ctx: Context, id: string, refCell?: string[]): void;

package/es/api/sheet.js

@@ -3,6 +3,43 @@ import { v4 as uuidv4 } from "uuid";
 import { dataToCelldata, getSheet } from "./common";
 import { getSheetIndex } from "../utils";
 import { api, execfunction, getFlowdata, insertUpdateFunctionGroup, locale, spillSortResult } from "..";
+function isCellReferenced(formulaString, cell) {
+  function colToNumber(col) {
+    var num = 0;
+    for (var i = 0; i < col.length; i += 1) {
+      num = num * 26 + (col.charCodeAt(i) - 64);
+    }
+    return num;
+  }
+  function parseCell(cellRef) {
+    var match = cellRef.match(/^([A-Z]+)(\d+)$/);
+    if (!match) return null;
+    return {
+      col: colToNumber(match[1]),
+      row: Number(match[2])
+    };
+  }
+  var target = parseCell(cell.toUpperCase());
+  if (!target) return false;
+  var formula = formulaString.toUpperCase();
+  var rangeRegex = /([A-Z]+\d+):([A-Z]+\d+)/g;
+  var match;
+  while ((match = rangeRegex.exec(formula)) !== null) {
+    var start = parseCell(match[1]);
+    var end = parseCell(match[2]);
+    if (target.col >= Math.min(start.col, end.col) && target.col <= Math.max(start.col, end.col) && target.row >= Math.min(start.row, end.row) && target.row <= Math.max(start.row, end.row)) {
+      return true;
+    }
+  }
+  var cleanedFormula = formula.replace(rangeRegex, "");
+  var cellRegex = /([A-Z]+\d+)/g;
+  while ((match = cellRegex.exec(cleanedFormula)) !== null) {
+    if (match[1] === cell.toUpperCase()) {
+      return true;
+    }
+  }
+  return false;
+}
 export function getAllSheets(ctx) {
   return ctx.luckysheetfile;
 }
@@ -134,4 +171,42 @@ export function calculateSheetFromula(ctx, id) {
       insertUpdateFunctionGroup(ctx, r, c, id);
     }
   }
+}
+export function calculateReferencedCellSheetFromula(ctx, id, refCell) {
+  var _a, _b, _c, _d, _e, _f;
+  var index = getSheetIndex(ctx, id);
+  if (!ctx.luckysheetfile[index].data) return;
+  var _loop_1 = function _loop_1(r) {
+    var _loop_2 = function _loop_2(c) {
+      console.log(refCell, (_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f);
+      var isRef = false;
+      if (refCell && ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f) && !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.isDataBlockFormula)) {
+        isRef = refCell.some(function (cell) {
+          var _a;
+          return isCellReferenced((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f, cell);
+        });
+      }
+      if (!isRef || !((_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.f) || ((_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.isDataBlockFormula)) {
+        return "continue";
+      }
+      var result = execfunction(ctx, (_f = ctx.luckysheetfile[index].data[r][c]) === null || _f === void 0 ? void 0 : _f.f, r, c, id);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        spillSortResult(ctx, r, c, value, getFlowdata(ctx));
+      } else {
+        api.setCellValue(ctx, r, c, result[1], null);
+      }
+      insertUpdateFunctionGroup(ctx, r, c, id);
+    };
+    for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
+      _loop_2(c);
+    }
+  };
+  for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
+    _loop_1(r);
+  }
 }

package/es/events/keyboard.js

@@ -423,12 +423,12 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
       isFxInput = (_b = (_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.contains("fortune-fx-input");
       ignoredKeys = new Set(isFxInput ? ["Enter", "Tab", "ArrowLeft", "ArrowRight"] : ["Enter", "Tab", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]);
       restCod = !ignoredKeys.has(kstr);
-      if (ctx.luckysheetCellUpdate.length > 0 && restCod) {
+      if (ctx.luckysheetCellUpdate.length > 0 && restCod && (window.CompositData === "" || window.CompositData === undefined)) {
         return [2];
       }
       if (kstr === "Enter") {
         if (!allowEdit) return [2];
-        handleGlobalEnter(ctx, cellInput, e, canvas);
+        if (window.CompositData === "" || window.CompositData === undefined) handleGlobalEnter(ctx, cellInput, e, canvas);
       } else if (kstr === "Tab") {
         if (ctx.luckysheetCellUpdate.length > 0) {
           updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
@@ -466,6 +466,7 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
         } else if (kstr === "Escape") {
           ctx.contextMenu = {};
         } else if (kstr === "Delete" || kstr === "Backspace") {
+          console.log("Delete");
           if (!allowEdit) return [2];
           if (ctx.activeImg != null) {
             removeActiveImage(ctx);

package/es/modules/formula.js

@@ -705,7 +705,7 @@ export function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notIns
     id: id
   });
   var originalTxt = txt;
-  if (txt.toUpperCase().includes("NETWORKDAYS.INTL") || txt.toUpperCase().includes("WORKDAY.INTL")) {
+  if ((txt === null || txt === void 0 ? void 0 : txt.toUpperCase().includes("NETWORKDAYS.INTL")) || (txt === null || txt === void 0 ? void 0 : txt.toUpperCase().includes("WORKDAY.INTL"))) {
     txt = replaceDotsInFunctionName(txt);
   }
   if (txt.indexOf(error.r) > -1) {
@@ -1597,6 +1597,7 @@ export function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText, refres
   if (refreshRangeSelect === void 0) {
     refreshRangeSelect = true;
   }
+  if (!$editor) return;
   try {
     var value1 = void 0;
     var value1txt = preText !== null && preText !== void 0 ? preText : $editor.innerText;

package/lib/api/sheet.d.ts

@@ -8,3 +8,4 @@ export declare function hideSheet(ctx: Context, sheetId: string): void;
 export declare function showSheet(ctx: Context, sheetId: string): void;
 export declare function copySheet(ctx: Context, sheetId: string): void;
 export declare function calculateSheetFromula(ctx: Context, id: string): void;
+export declare function calculateReferencedCellSheetFromula(ctx: Context, id: string, refCell?: string[]): void;

package/lib/api/sheet.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.calculateReferencedCellSheetFromula = calculateReferencedCellSheetFromula;
 exports.calculateSheetFromula = calculateSheetFromula;
 exports.copySheet = copySheet;
 exports.getAllSheets = getAllSheets;
@@ -21,6 +22,43 @@ var _common = require("./common");
 var _utils = require("../utils");
 var _2 = require("..");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function isCellReferenced(formulaString, cell) {
+  function colToNumber(col) {
+    var num = 0;
+    for (var i = 0; i < col.length; i += 1) {
+      num = num * 26 + (col.charCodeAt(i) - 64);
+    }
+    return num;
+  }
+  function parseCell(cellRef) {
+    var match = cellRef.match(/^([A-Z]+)(\d+)$/);
+    if (!match) return null;
+    return {
+      col: colToNumber(match[1]),
+      row: Number(match[2])
+    };
+  }
+  var target = parseCell(cell.toUpperCase());
+  if (!target) return false;
+  var formula = formulaString.toUpperCase();
+  var rangeRegex = /([A-Z]+\d+):([A-Z]+\d+)/g;
+  var match;
+  while ((match = rangeRegex.exec(formula)) !== null) {
+    var start = parseCell(match[1]);
+    var end = parseCell(match[2]);
+    if (target.col >= Math.min(start.col, end.col) && target.col <= Math.max(start.col, end.col) && target.row >= Math.min(start.row, end.row) && target.row <= Math.max(start.row, end.row)) {
+      return true;
+    }
+  }
+  var cleanedFormula = formula.replace(rangeRegex, "");
+  var cellRegex = /([A-Z]+\d+)/g;
+  while ((match = cellRegex.exec(cleanedFormula)) !== null) {
+    if (match[1] === cell.toUpperCase()) {
+      return true;
+    }
+  }
+  return false;
+}
 function getAllSheets(ctx) {
   return ctx.luckysheetfile;
 }
@@ -151,4 +189,42 @@ function calculateSheetFromula(ctx, id) {
       (0, _2.insertUpdateFunctionGroup)(ctx, r, c, id);
     }
   }
+}
+function calculateReferencedCellSheetFromula(ctx, id, refCell) {
+  var _a, _b, _c, _d, _e, _f;
+  var index = (0, _utils.getSheetIndex)(ctx, id);
+  if (!ctx.luckysheetfile[index].data) return;
+  var _loop_1 = function _loop_1(r) {
+    var _loop_2 = function _loop_2(c) {
+      console.log(refCell, (_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f);
+      var isRef = false;
+      if (refCell && ((_b = ctx.luckysheetfile[index].data[r][c]) === null || _b === void 0 ? void 0 : _b.f) && !((_c = ctx.luckysheetfile[index].data[r][c]) === null || _c === void 0 ? void 0 : _c.isDataBlockFormula)) {
+        isRef = refCell.some(function (cell) {
+          var _a;
+          return isCellReferenced((_a = ctx.luckysheetfile[index].data[r][c]) === null || _a === void 0 ? void 0 : _a.f, cell);
+        });
+      }
+      if (!isRef || !((_d = ctx.luckysheetfile[index].data[r][c]) === null || _d === void 0 ? void 0 : _d.f) || ((_e = ctx.luckysheetfile[index].data[r][c]) === null || _e === void 0 ? void 0 : _e.isDataBlockFormula)) {
+        return "continue";
+      }
+      var result = (0, _2.execfunction)(ctx, (_f = ctx.luckysheetfile[index].data[r][c]) === null || _f === void 0 ? void 0 : _f.f, r, c, id);
+      var isValueArray = Array.isArray(result[1]);
+      if (isValueArray) {
+        var value = {
+          f: result[2],
+          v: result[1]
+        };
+        (0, _2.spillSortResult)(ctx, r, c, value, (0, _2.getFlowdata)(ctx));
+      } else {
+        _2.api.setCellValue(ctx, r, c, result[1], null);
+      }
+      (0, _2.insertUpdateFunctionGroup)(ctx, r, c, id);
+    };
+    for (var c = 0; c < ctx.luckysheetfile[index].data[r].length; c += 1) {
+      _loop_2(c);
+    }
+  };
+  for (var r = 0; r < ctx.luckysheetfile[index].data.length; r += 1) {
+    _loop_1(r);
+  }
 }

package/lib/events/keyboard.js

@@ -433,12 +433,12 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       isFxInput = (_b = (_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.classList) === null || _b === void 0 ? void 0 : _b.contains("fortune-fx-input");
       ignoredKeys = new Set(isFxInput ? ["Enter", "Tab", "ArrowLeft", "ArrowRight"] : ["Enter", "Tab", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"]);
       restCod = !ignoredKeys.has(kstr);
-      if (ctx.luckysheetCellUpdate.length > 0 && restCod) {
+      if (ctx.luckysheetCellUpdate.length > 0 && restCod && (window.CompositData === "" || window.CompositData === undefined)) {
         return [2];
       }
       if (kstr === "Enter") {
         if (!allowEdit) return [2];
-        handleGlobalEnter(ctx, cellInput, e, canvas);
+        if (window.CompositData === "" || window.CompositData === undefined) handleGlobalEnter(ctx, cellInput, e, canvas);
       } else if (kstr === "Tab") {
         if (ctx.luckysheetCellUpdate.length > 0) {
           (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
@@ -476,6 +476,7 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
         } else if (kstr === "Escape") {
           ctx.contextMenu = {};
         } else if (kstr === "Delete" || kstr === "Backspace") {
+          console.log("Delete");
           if (!allowEdit) return [2];
           if (ctx.activeImg != null) {
             (0, _2.removeActiveImage)(ctx);

package/lib/modules/formula.js

@@ -735,7 +735,7 @@ function execfunction(ctx, txt, r, c, id, calcChainSet, isrefresh, notInsertFunc
     id: id
   });
   var originalTxt = txt;
-  if (txt.toUpperCase().includes("NETWORKDAYS.INTL") || txt.toUpperCase().includes("WORKDAY.INTL")) {
+  if ((txt === null || txt === void 0 ? void 0 : txt.toUpperCase().includes("NETWORKDAYS.INTL")) || (txt === null || txt === void 0 ? void 0 : txt.toUpperCase().includes("WORKDAY.INTL"))) {
     txt = replaceDotsInFunctionName(txt);
   }
   if (txt.indexOf(_validation.error.r) > -1) {
@@ -1627,6 +1627,7 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText, refreshRangeS
   if (refreshRangeSelect === void 0) {
     refreshRangeSelect = true;
   }
+  if (!$editor) return;
   try {
     var value1 = void 0;
     var value1txt = preText !== null && preText !== void 0 ? preText : $editor.innerText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.2.86",
+  "version": "1.2.88",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",