@fileverse-dev/fortune-core 1.2.84 → 1.2.86-maitra-xl

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++) {
+      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/modules/ConditionFormat.js

@@ -126,7 +126,7 @@ export function getCurrentRules(fileC) {
   return currentRules;
 }
 export function setConditionRules(ctx, protection, generalDialog, conditionformat, rules, edit, editKey) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   if (!checkProtectionFormatCells(ctx)) {
     return;
   }
@@ -259,17 +259,17 @@ export function setConditionRules(ctx, protection, generalDialog, conditionforma
     format: {
       textColor: textColor,
       cellColor: cellColor,
-      bold: rules.font.bold,
-      italic: rules.font.italic,
-      underline: rules.font.underline,
-      strikethrough: rules.font.strikethrough
+      bold: (_b = rules === null || rules === void 0 ? void 0 : rules.font) === null || _b === void 0 ? void 0 : _b.bold,
+      italic: (_c = rules === null || rules === void 0 ? void 0 : rules.font) === null || _c === void 0 ? void 0 : _c.italic,
+      underline: (_d = rules === null || rules === void 0 ? void 0 : rules.font) === null || _d === void 0 ? void 0 : _d.underline,
+      strikethrough: (_e = rules === null || rules === void 0 ? void 0 : rules.font) === null || _e === void 0 ? void 0 : _e.strikethrough
     },
     conditionName: conditionName,
     conditionRange: conditionRange,
     conditionValue: conditionValue
   };
   var index = getSheetIndex(ctx, ctx.currentSheetId);
-  var ruleArr = (_b = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _b !== void 0 ? _b : [];
+  var ruleArr = (_f = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _f !== void 0 ? _f : [];
   if (edit) {
     ruleArr.splice(Number(editKey), 1, rule);
   } else {
@@ -1007,7 +1007,7 @@ export function compute(ctx, ruleArr, d) {
   return computeMap;
 }
 export function getComputeMap(ctx) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
   var index = getSheetIndex(ctx, ctx.currentSheetId);
   var ruleArr = ((_a = ctx.luckysheetfile[index]) === null || _a === void 0 ? void 0 : _a.luckysheet_conditionformat_save) ? __spreadArray([], (_b = ctx.luckysheetfile[index]) === null || _b === void 0 ? void 0 : _b.luckysheet_conditionformat_save, true) : [];
   var data = ctx.luckysheetfile[index].data;
@@ -1023,14 +1023,14 @@ export function getComputeMap(ctx) {
       format: {
         textColor: (_e = ctx.luckysheetfile[index].conditionRules) === null || _e === void 0 ? void 0 : _e.textColor.color,
         cellColor: (_f = ctx.luckysheetfile[index].conditionRules) === null || _f === void 0 ? void 0 : _f.cellColor.color,
-        bold: (_g = ctx.luckysheetfile[index].conditionRules) === null || _g === void 0 ? void 0 : _g.font.bold,
-        italic: (_h = ctx.luckysheetfile[index].conditionRules) === null || _h === void 0 ? void 0 : _h.font.italic,
-        underline: (_j = ctx.luckysheetfile[index].conditionRules) === null || _j === void 0 ? void 0 : _j.font.underline,
-        strikethrough: (_k = ctx.luckysheetfile[index].conditionRules) === null || _k === void 0 ? void 0 : _k.font.strikethrough
+        bold: (_h = (_g = ctx.luckysheetfile[index].conditionRules) === null || _g === void 0 ? void 0 : _g.font) === null || _h === void 0 ? void 0 : _h.bold,
+        italic: (_k = (_j = ctx.luckysheetfile[index].conditionRules) === null || _j === void 0 ? void 0 : _j.font) === null || _k === void 0 ? void 0 : _k.italic,
+        underline: (_m = (_l = ctx.luckysheetfile[index].conditionRules) === null || _l === void 0 ? void 0 : _l.font) === null || _m === void 0 ? void 0 : _m.underline,
+        strikethrough: (_p = (_o = ctx.luckysheetfile[index].conditionRules) === null || _o === void 0 ? void 0 : _o.font) === null || _p === void 0 ? void 0 : _p.strikethrough
       },
-      conditionName: (_l = ctx.luckysheetfile[index].conditionRules) === null || _l === void 0 ? void 0 : _l.rulesType,
+      conditionName: (_q = ctx.luckysheetfile[index].conditionRules) === null || _q === void 0 ? void 0 : _q.rulesType,
       conditionRange: [],
-      conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
+      conditionValue: [(_r = ctx.luckysheetfile[index].conditionRules) === null || _r === void 0 ? void 0 : _r.rulesValue]
     });
   }
   var computeMap = compute(ctx, ruleArr, data);

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++) {
+      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/modules/ConditionFormat.js

@@ -141,7 +141,7 @@ function getCurrentRules(fileC) {
   return currentRules;
 }
 function setConditionRules(ctx, protection, generalDialog, conditionformat, rules, edit, editKey) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f;
   if (!(0, _protection.checkProtectionFormatCells)(ctx)) {
     return;
   }
@@ -274,17 +274,17 @@ function setConditionRules(ctx, protection, generalDialog, conditionformat, rule
     format: {
       textColor: textColor,
       cellColor: cellColor,
-      bold: rules.font.bold,
-      italic: rules.font.italic,
-      underline: rules.font.underline,
-      strikethrough: rules.font.strikethrough
+      bold: (_b = rules === null || rules === void 0 ? void 0 : rules.font) === null || _b === void 0 ? void 0 : _b.bold,
+      italic: (_c = rules === null || rules === void 0 ? void 0 : rules.font) === null || _c === void 0 ? void 0 : _c.italic,
+      underline: (_d = rules === null || rules === void 0 ? void 0 : rules.font) === null || _d === void 0 ? void 0 : _d.underline,
+      strikethrough: (_e = rules === null || rules === void 0 ? void 0 : rules.font) === null || _e === void 0 ? void 0 : _e.strikethrough
     },
     conditionName: conditionName,
     conditionRange: conditionRange,
     conditionValue: conditionValue
   };
   var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
-  var ruleArr = (_b = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _b !== void 0 ? _b : [];
+  var ruleArr = (_f = ctx.luckysheetfile[index].luckysheet_conditionformat_save) !== null && _f !== void 0 ? _f : [];
   if (edit) {
     ruleArr.splice(Number(editKey), 1, rule);
   } else {
@@ -1022,7 +1022,7 @@ function compute(ctx, ruleArr, d) {
   return computeMap;
 }
 function getComputeMap(ctx) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
   var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   var ruleArr = ((_a = ctx.luckysheetfile[index]) === null || _a === void 0 ? void 0 : _a.luckysheet_conditionformat_save) ? __spreadArray([], (_b = ctx.luckysheetfile[index]) === null || _b === void 0 ? void 0 : _b.luckysheet_conditionformat_save, true) : [];
   var data = ctx.luckysheetfile[index].data;
@@ -1038,14 +1038,14 @@ function getComputeMap(ctx) {
       format: {
         textColor: (_e = ctx.luckysheetfile[index].conditionRules) === null || _e === void 0 ? void 0 : _e.textColor.color,
         cellColor: (_f = ctx.luckysheetfile[index].conditionRules) === null || _f === void 0 ? void 0 : _f.cellColor.color,
-        bold: (_g = ctx.luckysheetfile[index].conditionRules) === null || _g === void 0 ? void 0 : _g.font.bold,
-        italic: (_h = ctx.luckysheetfile[index].conditionRules) === null || _h === void 0 ? void 0 : _h.font.italic,
-        underline: (_j = ctx.luckysheetfile[index].conditionRules) === null || _j === void 0 ? void 0 : _j.font.underline,
-        strikethrough: (_k = ctx.luckysheetfile[index].conditionRules) === null || _k === void 0 ? void 0 : _k.font.strikethrough
+        bold: (_h = (_g = ctx.luckysheetfile[index].conditionRules) === null || _g === void 0 ? void 0 : _g.font) === null || _h === void 0 ? void 0 : _h.bold,
+        italic: (_k = (_j = ctx.luckysheetfile[index].conditionRules) === null || _j === void 0 ? void 0 : _j.font) === null || _k === void 0 ? void 0 : _k.italic,
+        underline: (_m = (_l = ctx.luckysheetfile[index].conditionRules) === null || _l === void 0 ? void 0 : _l.font) === null || _m === void 0 ? void 0 : _m.underline,
+        strikethrough: (_p = (_o = ctx.luckysheetfile[index].conditionRules) === null || _o === void 0 ? void 0 : _o.font) === null || _p === void 0 ? void 0 : _p.strikethrough
       },
-      conditionName: (_l = ctx.luckysheetfile[index].conditionRules) === null || _l === void 0 ? void 0 : _l.rulesType,
+      conditionName: (_q = ctx.luckysheetfile[index].conditionRules) === null || _q === void 0 ? void 0 : _q.rulesType,
       conditionRange: [],
-      conditionValue: [(_m = ctx.luckysheetfile[index].conditionRules) === null || _m === void 0 ? void 0 : _m.rulesValue]
+      conditionValue: [(_r = ctx.luckysheetfile[index].conditionRules) === null || _r === void 0 ? void 0 : _r.rulesValue]
     });
   }
   var computeMap = compute(ctx, ruleArr, data);

package/package.json

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