merge: origin/main을 ksh-v2-work-merge-test에 병합

origin/main의 feature/v2-unified-renewal(PR #386) 포함 86개 커밋을 병합.
ScreenDesigner.tsx에서 3건의 충돌을 수동 해결:

1. 함수 시그니처: isPop/defaultDevicePreview props 유지 (POP 모드 지원)
2. 저장 로직: POP/V2/Legacy 3단계 분기 유지, 디버그 로그 제거
3. 툴바 props: origin/main의 정렬/분배/크기맞춤/라벨토글/단축키 기능 채택

검증 완료: 빌드 성공, 타입 에러 없음, 시맨틱 충돌 없음

Co-authored-by: Cursor <cursoragent@cursor.com>

backend-node/src/controllers/screenGroupController.ts

@@ -46,11 +46,13 @@ export const getScreenGroups = async (req: AuthenticatedRequest, res: Response)
     const countResult = await pool.query(countQuery, params);
     const total = parseInt(countResult.rows[0].total);
 
-    // 데이터 조회 (screens 배열 포함)
+    // 데이터 조회 (screens 배열 포함) - 삭제된 화면(is_active = 'D') 제외
     const dataQuery = `
       SELECT 
         sg.*,
-        (SELECT COUNT(*) FROM screen_group_screens sgs WHERE sgs.group_id = sg.id) as screen_count,
+        (SELECT COUNT(*) FROM screen_group_screens sgs 
+         LEFT JOIN screen_definitions sd ON sgs.screen_id = sd.screen_id
+         WHERE sgs.group_id = sg.id AND sd.is_active != 'D') as screen_count,
         (SELECT json_agg(
           json_build_object(
             'id', sgs.id,
@@ -64,6 +66,7 @@ export const getScreenGroups = async (req: AuthenticatedRequest, res: Response)
         ) FROM screen_group_screens sgs 
         LEFT JOIN screen_definitions sd ON sgs.screen_id = sd.screen_id
         WHERE sgs.group_id = sg.id
+          AND sd.is_active != 'D'
         ) as screens
       FROM screen_groups sg
       ${whereClause}
@@ -111,6 +114,7 @@ export const getScreenGroup = async (req: AuthenticatedRequest, res: Response) =
         ) FROM screen_group_screens sgs 
         LEFT JOIN screen_definitions sd ON sgs.screen_id = sd.screen_id
         WHERE sgs.group_id = sg.id
+          AND sd.is_active != 'D'
         ) as screens
       FROM screen_groups sg
       WHERE sg.id = $1
@@ -308,39 +312,108 @@ export const deleteScreenGroup = async (req: AuthenticatedRequest, res: Response
 
     await client.query('BEGIN');
 
-    // 1. 삭제할 그룹과 하위 그룹 ID 수집 (CASCADE 삭제 대상)
+    // 0. 삭제할 그룹의 company_code 확인
+    const targetGroupResult = await client.query(
+      `SELECT company_code FROM screen_groups WHERE id = $1`,
+      [id]
+    );
+    if (targetGroupResult.rows.length === 0) {
+      await client.query('ROLLBACK');
+      return res.status(404).json({ success: false, message: "화면 그룹을 찾을 수 없습니다." });
+    }
+    const targetCompanyCode = targetGroupResult.rows[0].company_code;
+
+    // 권한 체크: 최고관리자가 아닌 경우 자신의 회사 그룹만 삭제 가능
+    if (companyCode !== "*" && targetCompanyCode !== companyCode) {
+      await client.query('ROLLBACK');
+      return res.status(403).json({ success: false, message: "권한이 없습니다." });
+    }
+
+    // 1. 삭제할 그룹과 하위 그룹 ID 수집 (같은 회사만 - CASCADE 삭제 대상)
     const childGroupsResult = await client.query(`
       WITH RECURSIVE child_groups AS (
-        SELECT id FROM screen_groups WHERE id = $1
+        SELECT id, company_code FROM screen_groups WHERE id = $1 AND company_code = $2
         UNION ALL
-        SELECT sg.id FROM screen_groups sg
-        JOIN child_groups cg ON sg.parent_group_id = cg.id
+        SELECT sg.id, sg.company_code FROM screen_groups sg
+        JOIN child_groups cg ON sg.parent_group_id = cg.id AND sg.company_code = cg.company_code
       )
       SELECT id FROM child_groups
-    `, [id]);
+    `, [id, targetCompanyCode]);
     const groupIdsToDelete = childGroupsResult.rows.map((r: any) => r.id);
 
-    // 2. menu_info에서 삭제될 screen_group 참조를 NULL로 정리
+    logger.info("화면 그룹 삭제 대상", { 
+      companyCode, 
+      targetCompanyCode,
+      groupId: id, 
+      childGroupIds: groupIdsToDelete 
+    });
+
+    // 2. 삭제될 그룹에 연결된 메뉴 정리
     if (groupIdsToDelete.length > 0) {
-      await client.query(`
-        UPDATE menu_info 
-        SET screen_group_id = NULL 
+      // 2-1. 삭제할 메뉴 objid 수집
+      const menusToDelete = await client.query(`
+        SELECT objid FROM menu_info 
         WHERE screen_group_id = ANY($1::int[])
-      `, [groupIdsToDelete]);
+        AND company_code = $2
+      `, [groupIdsToDelete, targetCompanyCode]);
+      const menuObjids = menusToDelete.rows.map((r: any) => r.objid);
+
+      if (menuObjids.length > 0) {
+        // 2-2. screen_menu_assignments에서 해당 메뉴 관련 데이터 삭제
+        await client.query(`
+          DELETE FROM screen_menu_assignments 
+          WHERE menu_objid = ANY($1::bigint[])
+          AND company_code = $2
+        `, [menuObjids, targetCompanyCode]);
+
+        // 2-3. menu_info에서 해당 메뉴 삭제
+        await client.query(`
+          DELETE FROM menu_info 
+          WHERE screen_group_id = ANY($1::int[])
+          AND company_code = $2
+        `, [groupIdsToDelete, targetCompanyCode]);
+
+        logger.info("그룹 삭제 시 연결된 메뉴 삭제", { 
+          groupIds: groupIdsToDelete, 
+          deletedMenuCount: menuObjids.length,
+          companyCode: targetCompanyCode 
+        });
+      }
+
+      // 2-4. 해당 회사의 채번 규칙 삭제 (최상위 그룹 삭제 시)
+      // 삭제되는 그룹이 최상위인지 확인
+      const isRootGroup = await client.query(
+        `SELECT 1 FROM screen_groups WHERE id = $1 AND parent_group_id IS NULL`,
+        [id]
+      );
+      
+      if (isRootGroup.rows.length > 0) {
+        // 최상위 그룹 삭제 시 해당 회사의 채번 규칙도 삭제
+        // 먼저 파트 삭제
+        await client.query(
+          `DELETE FROM numbering_rule_parts 
+           WHERE rule_id IN (SELECT rule_id FROM numbering_rules WHERE company_code = $1)`,
+          [targetCompanyCode]
+        );
+        // 규칙 삭제
+        const deletedRules = await client.query(
+          `DELETE FROM numbering_rules WHERE company_code = $1 RETURNING rule_id`,
+          [targetCompanyCode]
+        );
+        if (deletedRules.rowCount && deletedRules.rowCount > 0) {
+          logger.info("그룹 삭제 시 채번 규칙 삭제", { 
+            companyCode: targetCompanyCode, 
+            deletedCount: deletedRules.rowCount 
+          });
+        }
+      }
     }
 
-    // 3. screen_groups 삭제
-    let query = `DELETE FROM screen_groups WHERE id = $1`;
-    const params: any[] = [id];
-
-    if (companyCode !== "*") {
-      query += ` AND company_code = $2`;
-      params.push(companyCode);
-    }
-
-    query += " RETURNING id";
-
-    const result = await client.query(query, params);
+    // 3. screen_groups 삭제 (해당 그룹만 - 하위 그룹은 프론트엔드에서 순차 삭제)
+    const result = await client.query(
+      `DELETE FROM screen_groups WHERE id = $1 AND company_code = $2 RETURNING id`,
+      [id, targetCompanyCode]
+    );
 
     if (result.rows.length === 0) {
       await client.query('ROLLBACK');
@@ -349,7 +422,7 @@ export const deleteScreenGroup = async (req: AuthenticatedRequest, res: Response
 
     await client.query('COMMIT');
 
-    logger.info("화면 그룹 삭제", { companyCode, groupId: id, cleanedRefs: groupIdsToDelete.length });
+    logger.info("화면 그룹 삭제 완료", { companyCode, targetCompanyCode, groupId: id, cleanedRefs: groupIdsToDelete.length });
 
     res.json({ success: true, message: "화면 그룹이 삭제되었습니다." });
   } catch (error: any) {
@@ -1668,7 +1741,9 @@ export const getScreenSubTables = async (req: AuthenticatedRequest, res: Respons
     });
 
     // 4. rightPanel.relation 파싱 (split-panel-layout 등에서 사용)
+    // screen_layouts (v1)와 screen_layouts_v2 모두 조회
     const rightPanelQuery = `
+      -- V1: screen_layouts에서 조회
       SELECT 
         sd.screen_id,
         sd.screen_name,
@@ -1681,6 +1756,23 @@ export const getScreenSubTables = async (req: AuthenticatedRequest, res: Respons
       JOIN screen_layouts sl ON sd.screen_id = sl.screen_id
       WHERE sd.screen_id = ANY($1)
       AND sl.properties->'componentConfig'->'rightPanel'->'relation' IS NOT NULL
+
+      UNION ALL
+
+      -- V2: screen_layouts_v2에서 조회 (v2-split-panel-layout 컴포넌트)
+      SELECT 
+        sd.screen_id,
+        sd.screen_name,
+        sd.table_name as main_table,
+        comp->'overrides'->>'type' as component_type,
+        comp->'overrides'->'rightPanel'->'relation' as right_panel_relation,
+        comp->'overrides'->'rightPanel'->>'tableName' as right_panel_table,
+        comp->'overrides'->'rightPanel'->'columns' as right_panel_columns
+      FROM screen_definitions sd
+      JOIN screen_layouts_v2 slv2 ON sd.screen_id = slv2.screen_id,
+      jsonb_array_elements(slv2.layout_data->'components') as comp
+      WHERE sd.screen_id = ANY($1)
+      AND comp->'overrides'->'rightPanel'->'relation' IS NOT NULL
     `;
 
     const rightPanelResult = await pool.query(rightPanelQuery, [screenIds]);
@@ -2049,9 +2141,56 @@ export const getScreenSubTables = async (req: AuthenticatedRequest, res: Respons
       }))
     });
 
+    // ============================================================
+    // 6. 전역 메인 테이블 목록 수집 (우선순위 적용용)
+    // ============================================================
+    // 메인 테이블 조건:
+    // 1. screen_definitions.table_name (컴포넌트 직접 연결)
+    // 2. v2-split-panel-layout의 rightPanel.tableName (WHERE 조건 대상)
+    // 
+    // 이 목록에 있으면 서브 테이블로 분류되지 않음 (우선순위: 메인 > 서브)
+    const globalMainTablesQuery = `
+      -- 1. 모든 화면의 메인 테이블 (screen_definitions.table_name)
+      SELECT DISTINCT table_name as main_table
+      FROM screen_definitions
+      WHERE screen_id = ANY($1)
+      AND table_name IS NOT NULL
+
+      UNION
+
+      -- 2. v2-split-panel-layout의 rightPanel.tableName (WHERE 조건 대상)
+      -- 현재 그룹의 화면들에서 마스터-디테일로 연결된 테이블
+      SELECT DISTINCT comp->'overrides'->'rightPanel'->>'tableName' as main_table
+      FROM screen_definitions sd
+      JOIN screen_layouts_v2 slv2 ON sd.screen_id = slv2.screen_id,
+      jsonb_array_elements(slv2.layout_data->'components') as comp
+      WHERE sd.screen_id = ANY($1)
+      AND comp->'overrides'->'rightPanel'->>'tableName' IS NOT NULL
+
+      UNION
+
+      -- 3. v1 screen_layouts의 rightPanel.tableName (WHERE 조건 대상)
+      SELECT DISTINCT sl.properties->'componentConfig'->'rightPanel'->>'tableName' as main_table
+      FROM screen_definitions sd
+      JOIN screen_layouts sl ON sd.screen_id = sl.screen_id
+      WHERE sd.screen_id = ANY($1)
+      AND sl.properties->'componentConfig'->'rightPanel'->>'tableName' IS NOT NULL
+    `;
+
+    const globalMainTablesResult = await pool.query(globalMainTablesQuery, [screenIds]);
+    const globalMainTables = globalMainTablesResult.rows
+      .map((r: any) => r.main_table)
+      .filter((t: string) => t != null && t !== '');
+
+    logger.info("전역 메인 테이블 목록 수집 완료", { 
+      count: globalMainTables.length,
+      tables: globalMainTables
+    });
+
     res.json({
       success: true,
       data: screenSubTables,
+      globalMainTables: globalMainTables,  // 메인 테이블로 분류되어야 하는 테이블 목록
     });
   } catch (error: any) {
     logger.error("화면 서브 테이블 정보 조회 실패:", error);