Merge pull request 'jskim-node' (#409 ) from jskim-node into main

Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/409
Merge branch 'main' into jskim-node
2026-03-10 11:03:46 +09:00 · 2026-03-10 11:03:36 +09:00 · 2026-03-10 10:53:27 +09:00 · 2026-03-10 10:53:25 +09:00
1 changed files with 1 additions and 1 deletions
--- 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;
Author	SHA1	Message	Date
kjs	6d1f8edc6c	Merge pull request 'jskim-node' (#409 ) from jskim-node into main Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/409	2026-03-10 11:03:46 +09:00
kjs	9db69a83cd	Merge branch 'main' into jskim-node	2026-03-10 11:03:36 +09:00
kjs	4f8c31c893	Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node	2026-03-10 10:53:27 +09:00
kjs	f565b2d119	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.	2026-03-10 10:53:25 +09:00