@vdhewei/xlsx-template-lib 1.3.3 → 1.3.5

package/dist/index.mjs

@@ -2998,11 +2998,11 @@ var extractMacro = function(expr, options) {
   return extracResult;
 };
 var __codeKey = (str) => {
-  const replaces = [` `, `-`, `/`, `,`, `'`, `&`, `.`, `(`, `)`, `{`, `}`, `@`, `\\`, `[`, `]`, `#`, `:`];
-  for (const k in replaces) {
-    str = str.replace(k, "_").trim();
+  const replaces = [" ", `-`, `/`, `,`, `'`, `&`, `.`, `(`, `)`, `{`, `}`, `@`, `\\`, `[`, `]`, `#`, `:`];
+  for (const k of replaces) {
+    str = str.replaceAll(k, "_").trim();
     if (str.indexOf("__") >= 0) {
-      str = str.replace("__", "_");
+      str = str.replaceAll("__", "_");
     }
   }
   if (str.startsWith("_")) {
@@ -3051,6 +3051,29 @@ var toCellRow = (rowVals, setup) => {
 var toCellColumn = (columnVals, setup) => {
   return toCellRow(columnVals, setup);
 };
+var toCellValue = (value) => {
+  if (typeof value !== "string") {
+    const rText = value;
+    if (rText !== void 0 && rText.richText !== void 0 && rText.richText.length > 0) {
+      const values = [];
+      for (const [_, v] of rText.richText.entries()) {
+        if (v === void 0 || v === null) {
+          continue;
+        }
+        const text = v.text !== void 0 && v.text !== null ? v.text : void 0;
+        if (text !== void 0 && text !== "" && text !== "[object]") {
+          values.push(text.trim());
+        }
+      }
+      return values.join(" ");
+    }
+    const hText = value;
+    if (hText !== void 0 && hText.text !== null && hText.hyperlink !== null) {
+      return `[${hText.text}](${hText.hyperlink})`;
+    }
+  }
+  return value.toString();
+};
 var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, totalCells) => {
   if (macroTokens2 === void 0 || macroTokens2.length <= 0) {
     return macroExpr;
@@ -3107,8 +3130,9 @@ var resolveCompileMacroExpr = (ctx, macroExpr, macroTokens2, currentCellIndex, t
             if (cellValue === void 0 || cellValue.value === null) {
               return;
             }
-            const value = execMacroFormat(cellValue.value.toString(), formatter);
-            parts.push(value);
+            const value = toCellValue(cellValue.value);
+            let exprValue2 = execMacroFormat(value, formatter);
+            parts.push(exprValue2);
           });
         });
       }
@@ -3995,6 +4019,7 @@ export {
   resolveArgument,
   scanCellSetPlaceholder,
   toArrayBuffer,
+  toCellValue,
   valueDotGet,
   workSheetSetPlaceholder
 };