Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/v2-unified-renewal

2026-01-21 13:58:29 +09:00
parent 16cb1ea1af fbd7e89c8a
commit e46d216aae
19 changed files with 1258 additions and 217 deletions
@@ -335,6 +335,9 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
        const editId = urlParams.get("editId");
        const tableName = urlParams.get("tableName") || screenInfo.tableName;
        const groupByColumnsParam = urlParams.get("groupByColumns");
+        const primaryKeyColumn = urlParams.get("primaryKeyColumn"); // 🆕 Primary Key 컬럼명
+
+        console.log("📋 URL 파라미터 확인:", { mode, editId, tableName, groupByColumnsParam, primaryKeyColumn });

        // 수정 모드이고 editId가 있으면 해당 레코드 조회
        if (mode === "edit" && editId && tableName) {
@@ -357,6 +360,16 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
            if (groupByColumns.length > 0) {
              params.groupByColumns = JSON.stringify(groupByColumns);
            }
+            // 🆕 Primary Key 컬럼명 전달 (백엔드 자동 감지 실패 시 사용)
+            if (primaryKeyColumn) {
+              params.primaryKeyColumn = primaryKeyColumn;
+              console.log("✅ [ScreenModal] primaryKeyColumn을 params에 추가:", primaryKeyColumn);
+            }
+
+            console.log("📡 [ScreenModal] 실제 API 요청:", {
+              url: `/data/${tableName}/${editId}`,
+              params,
+            });

            const apiResponse = await apiClient.get(`/data/${tableName}/${editId}`, { params });
            const response = apiResponse.data;
@@ -582,66 +595,66 @@ export const ScreenModal: React.FC<ScreenModalProps> = ({ className }) => {
            </div>
          ) : screenData ? (
            <ActiveTabProvider>
-            <TableOptionsProvider>
-              <div
-                className="relative mx-auto bg-white"
-                style={{
-                  width: `${screenDimensions?.width || 800}px`,
-                  height: `${screenDimensions?.height || 600}px`,
-                  transformOrigin: "center center",
-                }}
-              >
-                {screenData.components.map((component) => {
-                  // 화면 관리 해상도를 사용하는 경우 offset 조정 불필요
-                  const offsetX = screenDimensions?.offsetX || 0;
-                  const offsetY = screenDimensions?.offsetY || 0;
+              <TableOptionsProvider>
+                <div
+                  className="relative mx-auto bg-white"
+                  style={{
+                    width: `${screenDimensions?.width || 800}px`,
+                    height: `${screenDimensions?.height || 600}px`,
+                    transformOrigin: "center center",
+                  }}
+                >
+                  {screenData.components.map((component) => {
+                    // 화면 관리 해상도를 사용하는 경우 offset 조정 불필요
+                    const offsetX = screenDimensions?.offsetX || 0;
+                    const offsetY = screenDimensions?.offsetY || 0;

-                  // offset이 0이면 원본 위치 사용 (화면 관리 해상도 사용 시)
-                  const adjustedComponent =
-                    offsetX === 0 && offsetY === 0
-                      ? component
-                      : {
-                          ...component,
-                          position: {
-                            ...component.position,
-                            x: parseFloat(component.position?.x?.toString() || "0") - offsetX,
-                            y: parseFloat(component.position?.y?.toString() || "0") - offsetY,
-                          },
-                        };
-
-                  return (
-                    <InteractiveScreenViewerDynamic
-                      key={`${component.id}-${resetKey}`}
-                      component={adjustedComponent}
-                      allComponents={screenData.components}
-                      formData={formData}
-                      originalData={originalData} // 🆕 원본 데이터 전달 (UPDATE 판단용)
-                      onFormDataChange={(fieldName, value) => {
-                        setFormData((prev) => {
-                          const newFormData = {
-                            ...prev,
-                            [fieldName]: value,
+                    // offset이 0이면 원본 위치 사용 (화면 관리 해상도 사용 시)
+                    const adjustedComponent =
+                      offsetX === 0 && offsetY === 0
+                        ? component
+                        : {
+                            ...component,
+                            position: {
+                              ...component.position,
+                              x: parseFloat(component.position?.x?.toString() || "0") - offsetX,
+                              y: parseFloat(component.position?.y?.toString() || "0") - offsetY,
+                            },
                          };
-                          return newFormData;
-                        });
-                      }}
-                      onRefresh={() => {
-                        // 부모 화면의 테이블 새로고침 이벤트 발송
-                        window.dispatchEvent(new CustomEvent("refreshTable"));
-                      }}
-                      screenInfo={{
-                        id: modalState.screenId!,
-                        tableName: screenData.screenInfo?.tableName,
-                      }}
-                      groupedData={selectedData}
-                      userId={userId}
-                      userName={userName}
-                      companyCode={user?.companyCode}
-                    />
-                  );
-                })}
-              </div>
-            </TableOptionsProvider>
+
+                    return (
+                      <InteractiveScreenViewerDynamic
+                        key={`${component.id}-${resetKey}`}
+                        component={adjustedComponent}
+                        allComponents={screenData.components}
+                        formData={formData}
+                        originalData={originalData} // 🆕 원본 데이터 전달 (UPDATE 판단용)
+                        onFormDataChange={(fieldName, value) => {
+                          setFormData((prev) => {
+                            const newFormData = {
+                              ...prev,
+                              [fieldName]: value,
+                            };
+                            return newFormData;
+                          });
+                        }}
+                        onRefresh={() => {
+                          // 부모 화면의 테이블 새로고침 이벤트 발송
+                          window.dispatchEvent(new CustomEvent("refreshTable"));
+                        }}
+                        screenInfo={{
+                          id: modalState.screenId!,
+                          tableName: screenData.screenInfo?.tableName,
+                        }}
+                        groupedData={selectedData}
+                        userId={userId}
+                        userName={userName}
+                        companyCode={user?.companyCode}
+                      />
+                    );
+                  })}
+                </div>
+              </TableOptionsProvider>
            </ActiveTabProvider>
          ) : (
            <div className="flex h-full items-center justify-center">