mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 20:54:07 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔀 Merge branch 'master' into escape-quote-in-migrations

Browse source
This commit is contained in:
Jan Oberhauser 2021-05-31 13:01:13 -05:00
parent a992a2da75 8f6344fbd5
commit 1c64d22203
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/editor-ui/src/components/ExpressionEdit.vue
View file

@ -73,9 +73,15 @@ export default mixins(
}; };
}, },
methods: { methods: {
valueChanged (value: string) { valueChanged (value: string, forceUpdate = false) {
this.latestValue = value; this.latestValue = value;
if (forceUpdate === true) {
this.updateDisplayValue();
this.$emit('valueChanged', this.latestValue);
} else {
this.callDebounced('updateDisplayValue', 500); this.callDebounced('updateDisplayValue', 500);
}
}, },
updateDisplayValue () { updateDisplayValue () {

10
packages/editor-ui/src/components/ExpressionInput.vue
View file

@ -234,11 +234,13 @@ export default mixins(
} else { } else {
// If no position got found add it to end // If no position got found add it to end
let newValue = this.value; let newValue = this.value;
if (newValue !== '=') { if (newValue === '=' || newValue === '=0') {
newValue += ` `; newValue = `{{${eventData.variable}}}\n`;
} } else {
newValue += ` {{${eventData.variable}}}\n`; newValue += ` {{${eventData.variable}}}\n`;
this.$emit('change', newValue); }
this.$emit('change', newValue, true);
if (!this.resolvedValue) { if (!this.resolvedValue) {
Vue.nextTick(() => { Vue.nextTick(() => {
this.initValue(); this.initValue();