ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-23 13:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: variable replace rang (#2923)

Browse Source
This commit is contained in:
Archer
2024-10-15 16:42:42 +08:00
committed by GitHub
parent 4f1ce640a7
commit da281ea9ec
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/global/common/string/tools.ts
View File

@@ -33,9 +33,9 @@ export function replaceVariable(text: any, obj: Record<string, string | number>)
for (const key in obj) { for (const key in obj) {
const val = obj[key]; const val = obj[key];
if (!['string', 'number'].includes(typeof val)) continue; const formatVal = typeof val === 'object' ? JSON.stringify(val) : String(val);
text = text.replace(new RegExp(`{{(${key})}}`, 'g'), String(val)); text = text.replace(new RegExp(`{{(${key})}}`, 'g'), formatVal);
} }
return text || ''; return text || '';
} }
@@ -63,6 +63,7 @@ export const getNanoid = (size = 12) => {
return `${firstChar}${randomsStr}`; return `${firstChar}${randomsStr}`;
}; };
export const customNanoid = (str: string, size: number) => customAlphabet(str, size)();
/* Custom text to reg, need to replace special chats */ /* Custom text to reg, need to replace special chats */
export const replaceRegChars = (text: string) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); export const replaceRegChars = (text: string) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

15
packages/global/core/workflow/utils.ts
View File

@@ -398,15 +398,12 @@ export function replaceEditorVariable({
// Replace {{$xxx.xxx$}} to value // Replace {{$xxx.xxx$}} to value
for (const key in allVariables) { for (const key in allVariables) {
const val = allVariables[key]; const variable = allVariables[key];
const regex = new RegExp(`\\{\\{\\$(${val.nodeId}\\.${val.id})\\$\\}\\}`, 'g'); const val = variable.value;
if (['string', 'number'].includes(typeof val.value)) { const formatVal = typeof val === 'object' ? JSON.stringify(val) : String(val);
text = text.replace(regex, String(val.value));
} else if (['object'].includes(typeof val.value)) { const regex = new RegExp(`\\{\\{\\$(${variable.nodeId}\\.${variable.id})\\$\\}\\}`, 'g');
text = text.replace(regex, JSON.stringify(val.value)); text = text.replace(regex, formatVal);
} else {
continue;
}
} }
return text || ''; return text || '';
} }