admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Fields reset after closing NDV when side panel NDV is also visible (no-changelog) (#18857)

Browse Source
This commit is contained in:
Suguru Inoue
2025-09-01 10:10:10 +02:00
committed by GitHub
parent 61f79319df
commit 280dd013ba
6 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/frontend/editor-ui/src/components/ParameterInput.vue
View File

@@ -201,6 +201,7 @@ const dateTimePickerOptions = ref({
],
});
const isFocused = ref(false);
const isMapperShown = ref(false);
const contextNode = expressionLocalResolveCtx?.value?.workflow.getNode(
expressionLocalResolveCtx.value.nodeName,
@@ -611,11 +612,7 @@ const showDragnDropTip = computed(
const shouldCaptureForPosthog = computed(() => node.value?.type === AI_TRANSFORM_NODE_TYPE);
const shouldShowMapper = computed(
() =>
isFocused.value &&
(isModelValueExpression.value || props.forceShowExpression || props.modelValue === ''),
);
const mapperElRef = computed(() => mapperRef.value?.contentRef);
function isRemoteParameterOption(option: INodePropertyOptions) {
return remoteParameterOptionsKeys.value.includes(option.name);
@@ -802,6 +799,10 @@ async function setFocus() {
}
isFocused.value = true;
if (isModelValueExpression.value || props.forceShowExpression || props.modelValue === '') {
isMapperShown.value = true;
}
}
emit('focus');
@@ -942,17 +943,19 @@ function expressionUpdated(value: string) {
}
function onBlur(event?: FocusEvent | KeyboardEvent) {
if (
event?.target instanceof HTMLElement &&
mapperRef.value?.contentRef &&
(event.target === mapperRef.value.contentRef ||
mapperRef.value.contentRef.contains(event.target))
) {
return;
}
emit('blur');
isFocused.value = false;
if (
!(event?.target instanceof Node && mapperElRef.value?.contains(event.target)) &&
!(
event instanceof FocusEvent &&
event.relatedTarget instanceof Node &&
mapperElRef.value?.contains(event.relatedTarget)
)
) {
isMapperShown.value = false;
}
}
function onPaste(event: ClipboardEvent) {
@@ -998,6 +1001,12 @@ function onUpdateTextInput(value: string) {
onTextInputChange(value);
}
function onClickOutsideMapper() {
if (!isFocused.value) {
isMapperShown.value = false;
}
}
async function optionSelected(command: string) {
const prevValue = props.modelValue;
@@ -1012,6 +1021,7 @@ async function optionSelected(command: string) {
case 'removeExpression':
isFocused.value = false;
isMapperShown.value = false;
valueChanged(
parseFromExpression(
props.modelValue,
@@ -1210,7 +1220,7 @@ onUpdated(async () => {
}
});
onClickOutside(wrapper, onBlur);
onClickOutside(mapperElRef, onClickOutsideMapper);
</script>
<template>
@@ -1239,7 +1249,7 @@ onClickOutside(wrapper, onBlur);
:workflow="expressionLocalResolveCtx?.workflow"
:node="node"
:input-node-name="expressionLocalResolveCtx?.inputNode?.name"
:visible="shouldShowMapper"
:visible="isMapperShown"
:virtual-ref="wrapper"
/>