mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 14:44:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Add support for data from not first output data

Browse source
This commit is contained in:
Jan Oberhauser 2021-12-23 19:11:14 +01:00
parent 85be1223e9
commit 395f8ed5b5
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/editor-ui/src/components/CodeEdit.vue
View file

@ -133,14 +133,16 @@ export default mixins(
loadAutocompleteData(): void { loadAutocompleteData(): void {
if (['function', 'functionItem'].includes(this.codeAutocomplete)) { if (['function', 'functionItem'].includes(this.codeAutocomplete)) {
const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
const workflow = this.getWorkflow();
const activeNode: INodeUi | null = this.$store.getters.activeNode;
const inputIndex = 0;
const itemIndex = 0; const itemIndex = 0;
const inputName = 'main'; const inputName = 'main';
const mode = 'manual'; const mode = 'manual';
const runIndex = 0; let runIndex = 0;
const executedWorkflow: IExecutionResponse | null = this.$store.getters.getWorkflowExecution;
const workflow = this.getWorkflow();
const activeNode: INodeUi | null = this.$store.getters.activeNode;
const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
const inputIndex = workflow.getNodeConnectionOutputIndex(activeNode.name, parentNode[0]);
const autocompleteData: string[] = []; const autocompleteData: string[] = [];
@ -155,8 +157,10 @@ export default mixins(
}; };
} else { } else {
runExecutionData = executionData.data; runExecutionData = executionData.data;
if (runExecutionData.resultData.runData[activeNode.name]) {
runIndex = runExecutionData.resultData.runData[activeNode.name].length - 1;
}
} }
const parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
const connectionInputData = this.connectionInputData(parentNode, inputName, runIndex, inputIndex); const connectionInputData = this.connectionInputData(parentNode, inputName, runIndex, inputIndex);
@ -178,7 +182,7 @@ export default mixins(
const baseKeys = ['$env', '$executionId', '$mode', '$parameter', '$position', '$resumeWebhookUrl', '$workflow']; const baseKeys = ['$env', '$executionId', '$mode', '$parameter', '$position', '$resumeWebhookUrl', '$workflow'];
const additionalKeys = ['$json', '$binary']; const additionalKeys = ['$json', '$binary'];
if (executedWorkflow && connectionInputData) { if (executedWorkflow && connectionInputData && connectionInputData.length) {
baseKeys.push(...additionalKeys); baseKeys.push(...additionalKeys);
} else { } else {
additionalKeys.forEach(key => { additionalKeys.forEach(key => {