@leankylin-sheet/excel 5.2.56 → 5.2.58

package/dist/index.esm.js

@@ -5086,7 +5086,7 @@ var getVariable = function getVariable(variables, sheetId, name) {
 var replaceVariablesInFormula = function replaceVariablesInFormula(formula, variables, sheetId) {
   if (_.isNil(variables)) return formula;
   return formula.replace(/\{\{(.*?)\}\}/g, function (match) {
-    var value = getVariable(variables, sheetId, match);
+    var value = getVariable(variables, sheetId, match) || 0;
     if (_.isNil(value)) return match;
     if (typeof value === "string") return "\"".concat(value.replace(/"/g, '""'), "\"");
     if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
@@ -5173,6 +5173,9 @@ var setStyleAndValue = function setStyleAndValue(table, worksheet, variables) {
           var fa = getFa();
           if (fa) numFmt = fa;
         }
+        if (["", undefined, null].includes(cell.v)) {
+          v = cell.v;
+        }
       } else if (cell.ct && ctT === "d") {
         var mockDate = isTime(cell.ct.fa) ? "2000-01-01 " : "";
         v = new Date(mockDate + cell.m);
@@ -5183,15 +5186,10 @@ var setStyleAndValue = function setStyleAndValue(table, worksheet, variables) {
       }
       if (cell.f && _typeof(v) !== "object") {
         var formulaStr = cell.f.startsWith("=") ? cell.f.slice(1) : cell.f;
-        var hasVariables = cell.f.includes("{{");
-        if (hasVariables) {
-          value = v;
-        } else {
-          value = {
-            formula: replaceVariablesInFormula(formulaStr, variables, table.id),
-            result: v
-          };
-        }
+        value = {
+          formula: replaceVariablesInFormula(formulaStr, variables, table.id),
+          result: v
+        };
       } else {
         value = v;
       }

package/dist/index.js

@@ -5098,7 +5098,7 @@ var getVariable = function getVariable(variables, sheetId, name) {
 var replaceVariablesInFormula = function replaceVariablesInFormula(formula, variables, sheetId) {
   if (___default['default'].isNil(variables)) return formula;
   return formula.replace(/\{\{(.*?)\}\}/g, function (match) {
-    var value = getVariable(variables, sheetId, match);
+    var value = getVariable(variables, sheetId, match) || 0;
     if (___default['default'].isNil(value)) return match;
     if (typeof value === "string") return "\"".concat(value.replace(/"/g, '""'), "\"");
     if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
@@ -5185,6 +5185,9 @@ var setStyleAndValue = function setStyleAndValue(table, worksheet, variables) {
           var fa = getFa();
           if (fa) numFmt = fa;
         }
+        if (["", undefined, null].includes(cell.v)) {
+          v = cell.v;
+        }
       } else if (cell.ct && ctT === "d") {
         var mockDate = isTime(cell.ct.fa) ? "2000-01-01 " : "";
         v = new Date(mockDate + cell.m);
@@ -5195,15 +5198,10 @@ var setStyleAndValue = function setStyleAndValue(table, worksheet, variables) {
       }
       if (cell.f && _typeof(v) !== "object") {
         var formulaStr = cell.f.startsWith("=") ? cell.f.slice(1) : cell.f;
-        var hasVariables = cell.f.includes("{{");
-        if (hasVariables) {
-          value = v;
-        } else {
-          value = {
-            formula: replaceVariablesInFormula(formulaStr, variables, table.id),
-            result: v
-          };
-        }
+        value = {
+          formula: replaceVariablesInFormula(formulaStr, variables, table.id),
+          result: v
+        };
       } else {
         value = v;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/excel",
-  "version": "5.2.56",
+  "version": "5.2.58",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.esm.js",