diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte index 3b5a6a9b2b..0abab0467f 100644 --- a/frontend/src/lib/components/SchemaForm.svelte +++ b/frontend/src/lib/components/SchemaForm.svelte @@ -89,7 +89,7 @@ bind:value={propertiesTypes[argName]} on:change={(e) => { if (e.detail === InputTransform.type.JAVASCRIPT) { - args[argName].expr = getDefaultExpr(i ?? -1, argName) + args[argName].expr = getDefaultExpr(i ?? -1, argName, args[argName].value) args[argName].value = undefined } else { args[argName].expr = undefined diff --git a/frontend/src/lib/components/flows/utils.ts b/frontend/src/lib/components/flows/utils.ts index e695e04da6..b969f3843a 100644 --- a/frontend/src/lib/components/flows/utils.ts +++ b/frontend/src/lib/components/flows/utils.ts @@ -159,10 +159,11 @@ export function getCodeInjectionExpr(code: string, isRaw: boolean): string { ${expr}` } -export function getDefaultExpr(i: number, key: string = 'myfield') { +export function getDefaultExpr(i: number, key: string = 'myfield', previousExpr?: string) { + const expr = previousExpr ? `\`${previousExpr}\`` : `previous_result.${key}` return `import { previous_result, flow_input, step, variable, resource, params } from 'windmill@${i}' -previous_result.${key}` +${expr}` } export function getPickableProperties(