@vdhewei/xlsx-template-lib 1.5.1 → 1.6.2

package/dist/index.js

@@ -3048,6 +3048,14 @@ var resolveCompileMacroGen = (ctx, expr, currentCellIndex) => {
       parts.push(resolveAliasExpr(ctx, item.value, currentCellIndex));
     }
   }
+  if (parts.length === 1) {
+    return parts[0];
+  }
+  let end = parts[parts.length - 1];
+  if (end.startsWith('"') && end.length >= 3 && end.endsWith('"')) {
+    join2 = end;
+    return parts.slice(0, parts.length - 1).join(join2);
+  }
   return parts.join(join2);
 };
 var getExprEnd = function(macroExpr, matchIndex, rparenToken) {
@@ -3096,7 +3104,17 @@ var __codeKey = (str, expr) => {
   return str.toUpperCase();
 };
 var __numberKey = (str, expr) => {
-  return Number.parseInt(str, 10).toString();
+  if (str === "NaN" || str === "Infinity" || str === "null" || str === "[object object]") {
+    return str;
+  }
+  if (str.startsWith("0x")) {
+    return str.substring(2);
+  }
+  let v = Number.parseInt(str, 10);
+  if (isNaN(v)) {
+    return str;
+  }
+  return v.toString();
 };
 var __codeAliasKey = (str, expr) => {
   const key = __codeKey(str);
@@ -3725,7 +3743,7 @@ var fetchAlias = (m) => {
   return alias;
 };
 var removeUnExportSheets = (w, options) => {
-  const removes = [];
+  let removes = [];
   if (typeof options.skipRemoveUnExportSheet === "boolean" && options.skipRemoveUnExportSheet === true) {
     return w;
   }
@@ -3743,6 +3761,9 @@ var removeUnExportSheets = (w, options) => {
       }
     }
   }
+  if (removes.length === w.worksheets.length && w.worksheets[0].name === removes[0]) {
+    removes = removes.slice(1, removes.length);
+  }
   for (const [_, name] of removes.entries()) {
     w.removeWorksheet(name);
   }