diff --git a/frontend/app/(main)/admin/systemMng/tableMngList/page.tsx b/frontend/app/(main)/admin/systemMng/tableMngList/page.tsx index 73e5d282..17c52897 100644 --- a/frontend/app/(main)/admin/systemMng/tableMngList/page.tsx +++ b/frontend/app/(main)/admin/systemMng/tableMngList/page.tsx @@ -773,18 +773,81 @@ export default function TableManagementPage() { // 2. 모든 컬럼 설정 저장 if (columns.length > 0) { - const columnSettings = columns.map((column) => ({ - columnName: column.columnName, // 실제 DB 컬럼명 (변경 불가) - columnLabel: column.displayName, // 사용자가 입력한 표시명 - inputType: column.inputType || "text", - detailSettings: column.detailSettings || "", - description: column.description || "", - codeCategory: column.codeCategory || "", - codeValue: column.codeValue || "", - referenceTable: column.referenceTable || "", - referenceColumn: column.referenceColumn || "", - displayColumn: column.displayColumn || "", // 🎯 Entity 조인에서 표시할 컬럼명 - })); + const columnSettings = columns.map((column) => { + // detailSettings 계산 + let finalDetailSettings = column.detailSettings || ""; + + // 🆕 Numbering 타입인 경우 numberingRuleId를 detailSettings에 포함 + if (column.inputType === "numbering" && column.numberingRuleId) { + let existingSettings: Record = {}; + if (typeof finalDetailSettings === "string" && finalDetailSettings.trim().startsWith("{")) { + try { + existingSettings = JSON.parse(finalDetailSettings); + } catch { + existingSettings = {}; + } + } + const numberingSettings = { + ...existingSettings, + numberingRuleId: column.numberingRuleId, + }; + finalDetailSettings = JSON.stringify(numberingSettings); + console.log("🔧 전체저장 - Numbering 설정 JSON 생성:", { + columnName: column.columnName, + numberingRuleId: column.numberingRuleId, + finalDetailSettings, + }); + } + + // 🆕 Entity 타입인 경우 detailSettings에 엔티티 설정 포함 + if (column.inputType === "entity" && column.referenceTable) { + let existingSettings: Record = {}; + if (typeof finalDetailSettings === "string" && finalDetailSettings.trim().startsWith("{")) { + try { + existingSettings = JSON.parse(finalDetailSettings); + } catch { + existingSettings = {}; + } + } + const entitySettings = { + ...existingSettings, + entityTable: column.referenceTable, + entityCodeColumn: column.referenceColumn || "id", + entityLabelColumn: column.displayColumn || "name", + }; + finalDetailSettings = JSON.stringify(entitySettings); + } + + // 🆕 Code 타입인 경우 hierarchyRole을 detailSettings에 포함 + if (column.inputType === "code" && column.hierarchyRole) { + let existingSettings: Record = {}; + if (typeof finalDetailSettings === "string" && finalDetailSettings.trim().startsWith("{")) { + try { + existingSettings = JSON.parse(finalDetailSettings); + } catch { + existingSettings = {}; + } + } + const codeSettings = { + ...existingSettings, + hierarchyRole: column.hierarchyRole, + }; + finalDetailSettings = JSON.stringify(codeSettings); + } + + return { + columnName: column.columnName, // 실제 DB 컬럼명 (변경 불가) + columnLabel: column.displayName, // 사용자가 입력한 표시명 + inputType: column.inputType || "text", + detailSettings: finalDetailSettings, + description: column.description || "", + codeCategory: column.codeCategory || "", + codeValue: column.codeValue || "", + referenceTable: column.referenceTable || "", + referenceColumn: column.referenceColumn || "", + displayColumn: column.displayColumn || "", // 🎯 Entity 조인에서 표시할 컬럼명 + }; + }); // console.log("저장할 전체 설정:", { tableLabel, tableDescription, columnSettings }); diff --git a/frontend/components/v2/V2Input.tsx b/frontend/components/v2/V2Input.tsx index be4dd83e..edaefffb 100644 --- a/frontend/components/v2/V2Input.tsx +++ b/frontend/components/v2/V2Input.tsx @@ -334,6 +334,8 @@ export const V2Input = forwardRef((props, ref) => // formData 추출 (채번규칙 날짜 컬럼 기준 생성 시 사용) const formData = (props as any).formData || {}; const columnName = (props as any).columnName; + // onFormDataChange 추출 (채번 규칙 ID를 formData에 저장하기 위함) + const onFormDataChange = (props as any).onFormDataChange; // config가 없으면 기본값 사용 const config = (configProp || { type: "text" }) as V2InputConfig & { @@ -526,6 +528,15 @@ export const V2Input = forwardRef((props, ref) => try { const parsed = JSON.parse(targetColumn.detailSettings); numberingRuleIdRef.current = parsed.numberingRuleId || null; + + // 🆕 채번 규칙 ID를 formData에 저장 (저장 시 allocateCode 호출을 위해) + if (parsed.numberingRuleId && onFormDataChange && columnName) { + onFormDataChange(`${columnName}_numberingRuleId`, parsed.numberingRuleId); + console.log("🔧 채번 규칙 ID를 formData에 저장:", { + key: `${columnName}_numberingRuleId`, + value: parsed.numberingRuleId, + }); + } } catch { // JSON 파싱 실패 } diff --git a/frontend/lib/registry/components/v2-input/V2InputRenderer.tsx b/frontend/lib/registry/components/v2-input/V2InputRenderer.tsx index 1afc2075..52a230fa 100644 --- a/frontend/lib/registry/components/v2-input/V2InputRenderer.tsx +++ b/frontend/lib/registry/components/v2-input/V2InputRenderer.tsx @@ -30,15 +30,21 @@ export class V2InputRenderer extends AutoRegisteringComponentRenderer { } }; + // 라벨: style.labelText 우선, 없으면 component.label 사용 + // style.labelDisplay가 false면 라벨 숨김 + const style = component.style || {}; + const effectiveLabel = style.labelDisplay === false ? undefined : (style.labelText || component.label); + return (