@vdhewei/xlsx-template-lib 1.3.0 → 1.3.2

package/dist/index.js

@@ -3091,7 +3091,7 @@ var __numberKey = (str) => {
 var __codeAliasKey = (str) => {
   const key = __codeKey(str);
   if (key !== "") {
-    return `${defaultRuleTokenParserMap.get("@" /* UseAliasToken */)}${key}`;
+    return `${defaultRuleTokenMap.get("@" /* UseAliasToken */)}${key}`;
   }
   return "";
 };
@@ -3179,8 +3179,8 @@ var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, t
             if (cellValue === void 0 || cellValue.value === null) {
               return;
             }
-            const value = cellValue.value;
-            parts.push(execMacroFormat(value.toString(), formatter));
+            const value = execMacroFormat(cellValue.value.toString(), formatter);
+            parts.push(value);
           });
         });
       }
@@ -3513,21 +3513,26 @@ var compileRowCells = function(ctx, expr, cellPoints, rowIndex, errs) {
     return;
   }
   ctx.currentExpr = expr;
-  cellPoints.forEach((cellPoint, index) => {
-    const r = cellPoint.Row;
-    const sheet = ctx.sheet;
-    const c = cellPoint.Column;
-    const cell = sheet.findCell(r, c);
-    if (cell === void 0 || cell.value !== void 0 && cell.value !== null && cell.value !== "") {
-      return;
-    }
-    let templateValue = String(expr.value);
-    const macroTokens2 = getMacroTokens(expr);
-    templateValue = resolveFunctionExpr(ctx, templateValue, expr);
-    templateValue = resolveCompileMacroExpr(ctx, templateValue, macroTokens2, index, cellPoints.length);
-    templateValue = resolveAliasExpr(ctx, templateValue, index);
-    cell.value = resolveValueExpr(ctx, templateValue);
-  });
+  try {
+    cellPoints.forEach((cellPoint, index) => {
+      const r = cellPoint.Row;
+      const sheet = ctx.sheet;
+      const c = cellPoint.Column;
+      const cell = sheet.findCell(r, c);
+      if (cell === void 0 || cell.value !== void 0 && cell.value !== null && cell.value !== "") {
+        return;
+      }
+      let templateValue = String(expr.value);
+      const macroTokens2 = getMacroTokens(expr);
+      templateValue = resolveFunctionExpr(ctx, templateValue, expr);
+      templateValue = resolveCompileMacroExpr(ctx, templateValue, macroTokens2, index, cellPoints.length);
+      templateValue = resolveAliasExpr(ctx, templateValue, index);
+      cell.value = resolveValueExpr(ctx, templateValue);
+    });
+  } catch (err) {
+    const msg = err.message;
+    throw new Error(`expr:${expr.express}, resolve error: ${msg}`);
+  }
 };
 var generateWorkSheetCellsPlaceholder = function(ctx, expr, sheet) {
   const errs = [];