From f565b2d119257dee10af4edd1cce430581bb679a Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Tue, 10 Mar 2026 10:53:25 +0900
Subject: [PATCH] fix: Merge form data with group data in EditModal

- Updated the logic in EditModal to merge the existing form data with the first item in groupData if available. This change ensures that relevant data from groupData is incorporated into the form, improving data accuracy and user experience during editing.
---
 frontend/components/screen/EditModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/components/screen/EditModal.tsx b/frontend/components/screen/EditModal.tsx
index 0127af40..e55f46ea 100644
--- a/frontend/components/screen/EditModal.tsx
+++ b/frontend/components/screen/EditModal.tsx
@@ -679,7 +679,7 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
           (targetComponent as any)?.componentConfig?.columnName ||
           targetComponentId;
 
-        const currentFormData = groupData.length > 0 ? groupData[0] : formData;
+        const currentFormData = groupData.length > 0 ? { ...formData, ...groupData[0] } : formData;
         const targetValue = currentFormData[fieldKey];
 
         let isMatch = false;