From cdd6e0975c9257cc3b58152210f7ffb213e3f44f Mon Sep 17 00:00:00 2001 From: Aliaksandra Ramanenka Date: Tue, 15 Apr 2025 16:00:31 +0300 Subject: [PATCH] FIO-9885: Fixes an issue where conditionally hidden layout components could cause data loss of the conditionally hidden Nested Form --- src/utils/formUtil/eachComponentData.ts | 2 +- src/utils/formUtil/eachComponentDataAsync.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/formUtil/eachComponentData.ts b/src/utils/formUtil/eachComponentData.ts index 41fc8316..576dae33 100644 --- a/src/utils/formUtil/eachComponentData.ts +++ b/src/utils/formUtil/eachComponentData.ts @@ -49,7 +49,7 @@ export const eachComponentData = ( component, data, row, - compPaths?.dataPath || '', + (component.modelType === 'none' ? compPaths?.fullPath : compPaths?.dataPath) || '', componentComponents, compPaths?.dataIndex, compParent, diff --git a/src/utils/formUtil/eachComponentDataAsync.ts b/src/utils/formUtil/eachComponentDataAsync.ts index eff4b28f..246448d1 100644 --- a/src/utils/formUtil/eachComponentDataAsync.ts +++ b/src/utils/formUtil/eachComponentDataAsync.ts @@ -47,7 +47,7 @@ export const eachComponentDataAsync = async ( component, data, row, - compPaths?.dataPath || '', + (component.modelType === 'none' ? compPaths?.fullPath : compPaths?.dataPath) || '', componentComponents, compPaths?.dataIndex, compParent,