Merge origin/main into ksh - resolve conflicts

This commit is contained in:
SeongHyun Kim
2025-12-19 16:38:12 +09:00
60 changed files with 11437 additions and 1361 deletions

View File

@@ -449,7 +449,7 @@ export function UniversalFormModalComponent({
console.log(`[initializeForm] 옵셔널 그룹 자동 활성화: ${key}, triggerField=${group.triggerField}, value=${triggerValue}`);
// 활성화된 그룹의 필드값도 초기화
for (const field of group.fields) {
for (const field of group.fields || []) {
let value = field.defaultValue ?? "";
const parentField = field.parentFieldName || field.columnName;
if (effectiveInitialData[parentField] !== undefined) {
@@ -697,7 +697,7 @@ export function UniversalFormModalComponent({
}
// 옵셔널 필드 그룹 필드 값 초기화
group.fields.forEach((field) => {
(group.fields || []).forEach((field) => {
handleFieldChange(field.columnName, field.defaultValue || "");
});
}, [config, handleFieldChange]);
@@ -1023,7 +1023,7 @@ export function UniversalFormModalComponent({
// 공통 필드가 설정되지 않은 경우, 기본정보 섹션의 모든 필드를 공통 필드로 사용
if (commonFields.length === 0) {
const nonRepeatableSections = config.sections.filter((s) => !s.repeatable);
commonFields = nonRepeatableSections.flatMap((s) => s.fields.map((f) => f.columnName));
commonFields = nonRepeatableSections.flatMap((s) => (s.fields || []).map((f) => f.columnName));
}
// 반복 섹션 ID가 설정되지 않은 경우, 첫 번째 반복 섹션 사용
@@ -1069,7 +1069,7 @@ export function UniversalFormModalComponent({
// 반복 섹션의 필드 값 추가
const repeatSection = config.sections.find((s) => s.id === repeatSectionId);
repeatSection?.fields.forEach((field) => {
(repeatSection?.fields || []).forEach((field) => {
if (item[field.columnName] !== undefined) {
subRow[field.columnName] = item[field.columnName];
}
@@ -1928,7 +1928,7 @@ export function UniversalFormModalComponent({
</div>
<CollapsibleContent>
<div className="grid gap-3 px-3 pb-3" style={{ gridTemplateColumns: "repeat(12, 1fr)" }}>
{group.fields.map((field) =>
{(group.fields || []).map((field) =>
renderFieldWithColumns(
field,
formData[field.columnName],
@@ -1972,7 +1972,7 @@ export function UniversalFormModalComponent({
</Button>
</div>
<div className="grid gap-3" style={{ gridTemplateColumns: "repeat(12, 1fr)" }}>
{group.fields.map((field) =>
{(group.fields || []).map((field) =>
renderFieldWithColumns(
field,
formData[field.columnName],