tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

allow prefix and suffix with double braces

Browse Source
This commit is contained in:
Thomas White
2024-08-14 21:13:44 +08:00
parent 5c5bd4627b
commit 813d299c8c
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/src/pages/printing/printing.tsx
View File

@@ -95,12 +95,35 @@ function applyTextFormatting(text: string): JSX.Element[] {
});
return elements;
}
export function renderLabelContents(template: string, spool: ISpool): JSX.Element {
// Find all {tags} in the template string and loop over them
let result = template.replace(/\{(.*?)\}/g, function (_, tag) {
return getTagValue(tag, spool);
// let matches = [...template.matchAll(/(?:{(.*?))?{(.*?)}(.*?)(?:}(.*?))?/gs)];
let matches = [...template.matchAll(/{(?:[^}{]|{[^}{]*})*}/gs)];
// console.log(matches){(?:[^}{]|{[^}{]*})*}
let label_text = template;
matches.forEach((match) => {
// console.log(match)
if ((match[0].match(/{/g)||[]).length == 1) {
let tag = match[0].replace(/[{}]/g, "");
// console.log(tag)
let tagValue = getTagValue(tag, spool)
label_text = label_text.replace(match[0], tagValue);
}
else if ((match[0].match(/{/g)||[]).length == 2) {
let structure = match[0].match(/{(.*?){(.*?)}(.*?)}/);
if (structure != null) {
const tag = structure[2];
let tagValue = getTagValue(tag, spool);
if (tagValue == "?") {
label_text = label_text.replace(match[0], "");
} else {
label_text = label_text.replace(match[0], structure[1] + tagValue + structure[3]);
}
}
}
});
// Split string on \n into individual lines
return <>{applyTextFormatting(result)}</>;
return <>{applyTextFormatting(label_text)}</>;
}