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

This commit is contained in:
kjs
2026-01-14 15:38:41 +09:00
12 changed files with 3021 additions and 1123 deletions

View File

@@ -1055,7 +1055,8 @@ export const getMultipleScreenLayoutSummary = async (req: Request, res: Response
properties->'componentConfig'->>'bindField',
properties->>'bindField',
properties->'componentConfig'->>'field',
properties->>'field'
properties->>'field',
properties->>'columnName'
) as bind_field,
-- componentConfig 전체 (JavaScript에서 다양한 패턴 파싱용)
properties->'componentConfig' as component_config
@@ -1158,6 +1159,17 @@ export const getMultipleScreenLayoutSummary = async (req: Request, res: Response
}
}
// 4. bindField가 있으면 usedColumns에 추가 (인풋 필드, 텍스트 필드 등)
if (row.bind_field && !usedColumns.includes(row.bind_field)) {
usedColumns.push(row.bind_field);
}
// 5. componentConfig.field 또는 componentConfig.valueField도 추가
const configField = componentConfig.field || componentConfig.valueField;
if (configField && typeof configField === 'string' && !usedColumns.includes(configField)) {
usedColumns.push(configField);
}
if (summaryMap[screenId]) {
summaryMap[screenId].widgetCounts[componentKind] =
(summaryMap[screenId].widgetCounts[componentKind] || 0) + 1;