mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡ Detect position automatically

Browse source
This commit is contained in:
Iván Ovejero 2022-05-03 13:38:15 +02:00
parent aedbbe5b8f
commit cacd43f19c
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/editor-ui/src/components/NodeSettings.vue
View file

@ -31,7 +31,6 @@
:parameters="parametersNoneSetting" :parameters="parametersNoneSetting"
:hideDelete="true" :hideDelete="true"
:nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged" :nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged"
:showCredentialsAfter="showCredentialsAfter"
> >
<node-credentials <node-credentials
:node="node" :node="node"
@ -161,9 +160,6 @@ export default mixins(
return this.nodeType.properties; return this.nodeType.properties;
}, },
showCredentialsAfter (): boolean {
return this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2;
},
}, },
props: { props: {
eventBus: { eventBus: {

26
packages/editor-ui/src/components/ParameterInputList.vue
View file

@ -1,7 +1,8 @@
<template> <template>
<div class="parameter-input-list-wrapper" :class="{ 'has-reordered-credentials-input': showCredentialsAfter }"> <div class="parameter-input-list-wrapper">
<slot /> <div v-for="(parameter, index) in filteredParameters" :key="parameter.name" :class="{indent}">
<div v-for="parameter in filteredParameters" :key="parameter.name" :class="{indent}"> <slot v-if="indexToShowSlotAt === index" />
<div <div
v-if="multipleValues(parameter) === true && parameter.type !== 'fixedCollection'" v-if="multipleValues(parameter) === true && parameter.type !== 'fixedCollection'"
class="parameter-item" class="parameter-item"
@ -103,6 +104,7 @@ import ParameterInputFull from '@/components/ParameterInputFull.vue';
import { get, set } from 'lodash'; import { get, set } from 'lodash';
import mixins from 'vue-typed-mixins'; import mixins from 'vue-typed-mixins';
import { HTTP_REQUEST_NODE_TYPE } from '@/constants';
export default mixins( export default mixins(
genericHelpers, genericHelpers,
@ -120,7 +122,6 @@ export default mixins(
'path', // string 'path', // string
'hideDelete', // boolean 'hideDelete', // boolean
'indent', 'indent',
'showCredentialsAfter', // boolean
], ],
computed: { computed: {
filteredParameters (): INodeProperties[] { filteredParameters (): INodeProperties[] {
@ -132,6 +133,13 @@ export default mixins(
node (): INodeUi { node (): INodeUi {
return this.$store.getters.activeNode; return this.$store.getters.activeNode;
}, },
indexToShowSlotAt (): number {
if (this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2) {
return 2;
}
return 0;
},
}, },
methods: { methods: {
multipleValues (parameter: INodeProperties): boolean { multipleValues (parameter: INodeProperties): boolean {
@ -268,16 +276,6 @@ export default mixins(
flex-direction: column; flex-direction: column;
padding-top: var(--spacing-xs); padding-top: var(--spacing-xs);
&.has-reordered-credentials-input {
.node-credentials + div {
order: -2;
}
.node-credentials + div + div {
order: -1;
}
}
.delete-option { .delete-option {
display: none; display: none;
position: absolute; position: absolute;