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

This commit is contained in:
kjs 2025-12-24 09:58:39 +09:00
commit cc4d294906
36 changed files with 5979 additions and 1159 deletions

View File

@ -30,6 +30,7 @@ import {
Header, Header,
Footer, Footer,
HeadingLevel, HeadingLevel,
TableLayoutType,
} from "docx"; } from "docx";
import { WatermarkConfig } from "../types/report"; import { WatermarkConfig } from "../types/report";
import bwipjs from "bwip-js"; import bwipjs from "bwip-js";
@ -592,8 +593,12 @@ export class ReportController {
// mm를 twip으로 변환 // mm를 twip으로 변환
const mmToTwip = (mm: number) => convertMillimetersToTwip(mm); const mmToTwip = (mm: number) => convertMillimetersToTwip(mm);
// px를 twip으로 변환 (1px = 15twip at 96DPI)
const pxToTwip = (px: number) => Math.round(px * 15); // 프론트엔드와 동일한 MM_TO_PX 상수 (캔버스에서 mm를 px로 변환할 때 사용하는 값)
const MM_TO_PX = 4;
// 1mm = 56.692913386 twip (docx 라이브러리 기준)
// px를 twip으로 변환: px -> mm -> twip
const pxToTwip = (px: number) => Math.round((px / MM_TO_PX) * 56.692913386);
// 쿼리 결과 맵 // 쿼리 결과 맵
const queryResultsMap: Record< const queryResultsMap: Record<
@ -726,6 +731,9 @@ export class ReportController {
const base64Data = const base64Data =
component.imageBase64.split(",")[1] || component.imageBase64; component.imageBase64.split(",")[1] || component.imageBase64;
const imageBuffer = Buffer.from(base64Data, "base64"); const imageBuffer = Buffer.from(base64Data, "base64");
// 서명 이미지 크기: 라벨 옆에 인라인으로 표시될 수 있도록 적절한 크기로 조정
const sigImageHeight = 30; // 고정 높이 (약 40px)
const sigImageWidth = Math.round((component.width / component.height) * sigImageHeight) || 80;
result.push( result.push(
new ParagraphRef({ new ParagraphRef({
children: [ children: [
@ -733,8 +741,8 @@ export class ReportController {
new ImageRunRef({ new ImageRunRef({
data: imageBuffer, data: imageBuffer,
transformation: { transformation: {
width: Math.round(component.width * 0.75), width: sigImageWidth,
height: Math.round(component.height * 0.75), height: sigImageHeight,
}, },
type: "png", type: "png",
}), }),
@ -1443,7 +1451,11 @@ export class ReportController {
try { try {
const barcodeType = component.barcodeType || "CODE128"; const barcodeType = component.barcodeType || "CODE128";
const barcodeColor = (component.barcodeColor || "#000000").replace("#", ""); const barcodeColor = (component.barcodeColor || "#000000").replace("#", "");
const barcodeBackground = (component.barcodeBackground || "#ffffff").replace("#", ""); // transparent는 bwip-js에서 지원하지 않으므로 흰색으로 변환
let barcodeBackground = (component.barcodeBackground || "#ffffff").replace("#", "");
if (barcodeBackground === "transparent" || barcodeBackground === "") {
barcodeBackground = "ffffff";
}
// 바코드 값 결정 (쿼리 바인딩 또는 고정값) // 바코드 값 결정 (쿼리 바인딩 또는 고정값)
let barcodeValue = component.barcodeValue || "SAMPLE123"; let barcodeValue = component.barcodeValue || "SAMPLE123";
@ -1739,6 +1751,7 @@ export class ReportController {
const rowTable = new Table({ const rowTable = new Table({
rows: [new TableRow({ children: cells })], rows: [new TableRow({ children: cells })],
width: { size: 100, type: WidthType.PERCENTAGE }, width: { size: 100, type: WidthType.PERCENTAGE },
layout: TableLayoutType.FIXED, // 셀 너비 고정
borders: { borders: {
top: { style: BorderStyle.NONE, size: 0, color: "FFFFFF" }, top: { style: BorderStyle.NONE, size: 0, color: "FFFFFF" },
bottom: { style: BorderStyle.NONE, size: 0, color: "FFFFFF" }, bottom: { style: BorderStyle.NONE, size: 0, color: "FFFFFF" },
@ -1821,6 +1834,7 @@ export class ReportController {
const textTable = new Table({ const textTable = new Table({
rows: [new TableRow({ children: [textCell] })], rows: [new TableRow({ children: [textCell] })],
width: { size: pxToTwip(component.width), type: WidthType.DXA }, width: { size: pxToTwip(component.width), type: WidthType.DXA },
layout: TableLayoutType.FIXED, // 셀 너비 고정
indent: { size: indentLeft, type: WidthType.DXA }, indent: { size: indentLeft, type: WidthType.DXA },
borders: { borders: {
top: { style: BorderStyle.NONE, size: 0, color: "FFFFFF" }, top: { style: BorderStyle.NONE, size: 0, color: "FFFFFF" },
@ -1970,6 +1984,10 @@ export class ReportController {
component.imageBase64.split(",")[1] || component.imageBase64; component.imageBase64.split(",")[1] || component.imageBase64;
const imageBuffer = Buffer.from(base64Data, "base64"); const imageBuffer = Buffer.from(base64Data, "base64");
// 서명 이미지 크기: 라벨 옆에 인라인으로 표시될 수 있도록 적절한 크기로 조정
const sigImageHeight = 30; // 고정 높이
const sigImageWidth = Math.round((component.width / component.height) * sigImageHeight) || 80;
const paragraph = new Paragraph({ const paragraph = new Paragraph({
spacing: { before: spacingBefore, after: 0 }, spacing: { before: spacingBefore, after: 0 },
indent: { left: indentLeft }, indent: { left: indentLeft },
@ -1978,8 +1996,8 @@ export class ReportController {
new ImageRun({ new ImageRun({
data: imageBuffer, data: imageBuffer,
transformation: { transformation: {
width: Math.round(component.width * 0.75), width: sigImageWidth,
height: Math.round(component.height * 0.75), height: sigImageHeight,
}, },
type: "png", type: "png",
}), }),

View File

@ -279,11 +279,90 @@ export class MenuCopyService {
logger.debug(` 📐 분할 패널 우측 화면 참조 발견: ${numId}`); logger.debug(` 📐 분할 패널 우측 화면 참조 발견: ${numId}`);
} }
} }
// 5) 모달 화면 ID (addModalScreenId, editModalScreenId, modalScreenId)
if (props?.componentConfig?.addModalScreenId) {
const addModalScreenId = props.componentConfig.addModalScreenId;
const numId =
typeof addModalScreenId === "number"
? addModalScreenId
: parseInt(addModalScreenId);
if (!isNaN(numId) && numId > 0) {
referenced.push(numId);
logger.debug(` 📋 추가 모달 화면 참조 발견: ${numId}`);
}
}
if (props?.componentConfig?.editModalScreenId) {
const editModalScreenId = props.componentConfig.editModalScreenId;
const numId =
typeof editModalScreenId === "number"
? editModalScreenId
: parseInt(editModalScreenId);
if (!isNaN(numId) && numId > 0) {
referenced.push(numId);
logger.debug(` 📝 수정 모달 화면 참조 발견: ${numId}`);
}
}
if (props?.componentConfig?.modalScreenId) {
const modalScreenId = props.componentConfig.modalScreenId;
const numId =
typeof modalScreenId === "number"
? modalScreenId
: parseInt(modalScreenId);
if (!isNaN(numId) && numId > 0) {
referenced.push(numId);
logger.debug(` 🔲 모달 화면 참조 발견: ${numId}`);
}
}
// 6) 재귀적으로 모든 properties에서 화면 ID 추출 (깊은 탐색)
this.extractScreenIdsFromObject(props, referenced);
} }
return referenced; return referenced;
} }
/**
* ID를
*/
private extractScreenIdsFromObject(obj: any, referenced: number[]): void {
if (!obj || typeof obj !== "object") return;
if (Array.isArray(obj)) {
for (const item of obj) {
this.extractScreenIdsFromObject(item, referenced);
}
return;
}
for (const key of Object.keys(obj)) {
const value = obj[key];
// 화면 ID 키 패턴 확인
if (
key === "screenId" ||
key === "targetScreenId" ||
key === "leftScreenId" ||
key === "rightScreenId" ||
key === "addModalScreenId" ||
key === "editModalScreenId" ||
key === "modalScreenId"
) {
const numId = typeof value === "number" ? value : parseInt(value);
if (!isNaN(numId) && numId > 0 && !referenced.includes(numId)) {
referenced.push(numId);
}
}
// 재귀 탐색
if (typeof value === "object" && value !== null) {
this.extractScreenIdsFromObject(value, referenced);
}
}
}
/** /**
* ( , ) * ( , )
*/ */
@ -483,7 +562,8 @@ export class MenuCopyService {
properties: any, properties: any,
screenIdMap: Map<number, number>, screenIdMap: Map<number, number>,
flowIdMap: Map<number, number>, flowIdMap: Map<number, number>,
numberingRuleIdMap?: Map<string, string> numberingRuleIdMap?: Map<string, string>,
menuIdMap?: Map<number, number>
): any { ): any {
if (!properties) return properties; if (!properties) return properties;
@ -496,7 +576,8 @@ export class MenuCopyService {
screenIdMap, screenIdMap,
flowIdMap, flowIdMap,
"", "",
numberingRuleIdMap numberingRuleIdMap,
menuIdMap
); );
return updated; return updated;
@ -510,7 +591,8 @@ export class MenuCopyService {
screenIdMap: Map<number, number>, screenIdMap: Map<number, number>,
flowIdMap: Map<number, number>, flowIdMap: Map<number, number>,
path: string = "", path: string = "",
numberingRuleIdMap?: Map<string, string> numberingRuleIdMap?: Map<string, string>,
menuIdMap?: Map<number, number>
): void { ): void {
if (!obj || typeof obj !== "object") return; if (!obj || typeof obj !== "object") return;
@ -522,7 +604,8 @@ export class MenuCopyService {
screenIdMap, screenIdMap,
flowIdMap, flowIdMap,
`${path}[${index}]`, `${path}[${index}]`,
numberingRuleIdMap numberingRuleIdMap,
menuIdMap
); );
}); });
return; return;
@ -533,13 +616,16 @@ export class MenuCopyService {
const value = obj[key]; const value = obj[key];
const currentPath = path ? `${path}.${key}` : key; const currentPath = path ? `${path}.${key}` : key;
// screen_id, screenId, targetScreenId, leftScreenId, rightScreenId 매핑 (숫자 또는 숫자 문자열) // screen_id, screenId, targetScreenId, leftScreenId, rightScreenId, addModalScreenId, editModalScreenId, modalScreenId 매핑 (숫자 또는 숫자 문자열)
if ( if (
key === "screen_id" || key === "screen_id" ||
key === "screenId" || key === "screenId" ||
key === "targetScreenId" || key === "targetScreenId" ||
key === "leftScreenId" || key === "leftScreenId" ||
key === "rightScreenId" key === "rightScreenId" ||
key === "addModalScreenId" ||
key === "editModalScreenId" ||
key === "modalScreenId"
) { ) {
const numValue = typeof value === "number" ? value : parseInt(value); const numValue = typeof value === "number" ? value : parseInt(value);
if (!isNaN(numValue) && numValue > 0) { if (!isNaN(numValue) && numValue > 0) {
@ -549,6 +635,11 @@ export class MenuCopyService {
logger.info( logger.info(
` 🔗 화면 참조 업데이트 (${currentPath}): ${value}${newId}` ` 🔗 화면 참조 업데이트 (${currentPath}): ${value}${newId}`
); );
} else {
// 매핑이 없으면 경고 로그 (복사되지 않은 화면 참조)
logger.warn(
` ⚠️ 화면 매핑 없음 (${currentPath}): ${value} - 원본 화면이 복사되지 않았을 수 있음`
);
} }
} }
} }
@ -573,9 +664,9 @@ export class MenuCopyService {
} }
} }
// numberingRuleId 매핑 (문자열) // numberingRuleId, ruleId 매핑 (문자열) - 채번규칙 참조
if ( if (
key === "numberingRuleId" && (key === "numberingRuleId" || key === "ruleId") &&
numberingRuleIdMap && numberingRuleIdMap &&
typeof value === "string" && typeof value === "string" &&
value value
@ -595,6 +686,25 @@ export class MenuCopyService {
} }
} }
// selectedMenuObjid 매핑 (메뉴 objid 참조)
if (key === "selectedMenuObjid" && menuIdMap) {
const numValue = typeof value === "number" ? value : parseInt(value);
if (!isNaN(numValue) && numValue > 0) {
const newId = menuIdMap.get(numValue);
if (newId) {
obj[key] = typeof value === "number" ? newId : String(newId);
logger.info(
` 🔗 메뉴 참조 업데이트 (${currentPath}): ${value}${newId}`
);
} else {
// 매핑이 없으면 경고 로그 (복사되지 않은 메뉴 참조)
logger.warn(
` ⚠️ 메뉴 매핑 없음 (${currentPath}): ${value} - 원본 메뉴가 복사되지 않았을 수 있음`
);
}
}
}
// 재귀 호출 // 재귀 호출
if (typeof value === "object" && value !== null) { if (typeof value === "object" && value !== null) {
this.recursiveUpdateReferences( this.recursiveUpdateReferences(
@ -602,7 +712,8 @@ export class MenuCopyService {
screenIdMap, screenIdMap,
flowIdMap, flowIdMap,
currentPath, currentPath,
numberingRuleIdMap numberingRuleIdMap,
menuIdMap
); );
} }
} }
@ -981,7 +1092,8 @@ export class MenuCopyService {
userId, userId,
client, client,
screenNameConfig, screenNameConfig,
numberingRuleIdMap numberingRuleIdMap,
menuIdMap
); );
// === 6단계: 화면-메뉴 할당 === // === 6단계: 화면-메뉴 할당 ===
@ -1315,7 +1427,8 @@ export class MenuCopyService {
removeText?: string; removeText?: string;
addPrefix?: string; addPrefix?: string;
}, },
numberingRuleIdMap?: Map<string, string> numberingRuleIdMap?: Map<string, string>,
menuIdMap?: Map<number, number>
): Promise<Map<number, number>> { ): Promise<Map<number, number>> {
const screenIdMap = new Map<number, number>(); const screenIdMap = new Map<number, number>();
@ -1601,7 +1714,8 @@ export class MenuCopyService {
layout.properties, layout.properties,
screenIdMap, screenIdMap,
flowIdMap, flowIdMap,
numberingRuleIdMap numberingRuleIdMap,
menuIdMap
); );
layoutValues.push( layoutValues.push(

View File

@ -234,10 +234,23 @@ export class ReportService {
`; `;
const queries = await query<ReportQuery>(queriesQuery, [reportId]); const queries = await query<ReportQuery>(queriesQuery, [reportId]);
// 메뉴 매핑 조회
const menuMappingQuery = `
SELECT menu_objid
FROM report_menu_mapping
WHERE report_id = $1
ORDER BY created_at
`;
const menuMappings = await query<{ menu_objid: number }>(menuMappingQuery, [
reportId,
]);
const menuObjids = menuMappings?.map((m) => Number(m.menu_objid)) || [];
return { return {
report, report,
layout, layout,
queries: queries || [], queries: queries || [],
menuObjids,
}; };
} }
@ -696,6 +709,43 @@ export class ReportService {
} }
} }
// 3. 메뉴 매핑 저장 (있는 경우)
if (data.menuObjids !== undefined) {
// 기존 메뉴 매핑 모두 삭제
await client.query(
`DELETE FROM report_menu_mapping WHERE report_id = $1`,
[reportId]
);
// 새 메뉴 매핑 삽입
if (data.menuObjids.length > 0) {
// 리포트의 company_code 조회
const reportResult = await client.query(
`SELECT company_code FROM report_master WHERE report_id = $1`,
[reportId]
);
const companyCode = reportResult.rows[0]?.company_code || "*";
const insertMappingSql = `
INSERT INTO report_menu_mapping (
report_id,
menu_objid,
company_code,
created_by
) VALUES ($1, $2, $3, $4)
`;
for (const menuObjid of data.menuObjids) {
await client.query(insertMappingSql, [
reportId,
menuObjid,
companyCode,
userId,
]);
}
}
}
return true; return true;
}); });
} }

View File

@ -71,11 +71,12 @@ export interface ReportQuery {
updated_by: string | null; updated_by: string | null;
} }
// 리포트 상세 (마스터 + 레이아웃 + 쿼리) // 리포트 상세 (마스터 + 레이아웃 + 쿼리 + 연결된 메뉴)
export interface ReportDetail { export interface ReportDetail {
report: ReportMaster; report: ReportMaster;
layout: ReportLayout | null; layout: ReportLayout | null;
queries: ReportQuery[]; queries: ReportQuery[];
menuObjids?: number[]; // 연결된 메뉴 ID 목록
} }
// 리포트 목록 조회 파라미터 // 리포트 목록 조회 파라미터
@ -166,6 +167,17 @@ export interface SaveLayoutRequest {
parameters: string[]; parameters: string[];
externalConnectionId?: number; externalConnectionId?: number;
}>; }>;
menuObjids?: number[]; // 연결할 메뉴 ID 목록
}
// 리포트-메뉴 매핑
export interface ReportMenuMapping {
mapping_id: number;
report_id: string;
menu_objid: number;
company_code: string;
created_at: Date;
created_by: string | null;
} }
// 템플릿 목록 응답 // 템플릿 목록 응답

View File

@ -317,12 +317,16 @@ export default function MultiLangPage() {
<div> <div>
<Label htmlFor="menu"></Label> <Label htmlFor="menu"></Label>
<Select value={selectedMenu} onValueChange={setSelectedMenu}> {/* Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__all__" 사용 */}
<Select
value={selectedMenu || "__all__"}
onValueChange={(value) => setSelectedMenu(value === "__all__" ? "" : value)}
>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="전체 메뉴" /> <SelectValue placeholder="전체 메뉴" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value=""> </SelectItem> <SelectItem value="__all__"> </SelectItem>
{menus.map((menu) => ( {menus.map((menu) => (
<SelectItem key={menu.code} value={menu.code}> <SelectItem key={menu.code} value={menu.code}>
{menu.name} {menu.name}
@ -334,12 +338,16 @@ export default function MultiLangPage() {
<div> <div>
<Label htmlFor="keyType"> </Label> <Label htmlFor="keyType"> </Label>
<Select value={selectedKeyType} onValueChange={setSelectedKeyType}> {/* Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__all__" 사용 */}
<Select
value={selectedKeyType || "__all__"}
onValueChange={(value) => setSelectedKeyType(value === "__all__" ? "" : value)}
>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="전체 타입" /> <SelectValue placeholder="전체 타입" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value=""> </SelectItem> <SelectItem value="__all__"> </SelectItem>
{keyTypes.map((type) => ( {keyTypes.map((type) => (
<SelectItem key={type.code} value={type.code}> <SelectItem key={type.code} value={type.code}>
{type.name} {type.name}

View File

@ -172,8 +172,9 @@ export const ScreenAssignmentTab: React.FC<ScreenAssignmentTabProps> = ({ menus
// }); // });
if (!menuList || menuList.length === 0) { if (!menuList || menuList.length === 0) {
// Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__placeholder__" 사용
return [ return [
<SelectItem key="no-menu" value="" disabled> <SelectItem key="no-menu" value="__placeholder__" disabled>
</SelectItem>, </SelectItem>,
]; ];

View File

@ -151,12 +151,16 @@ export function TableLogViewer({ tableName, open, onOpenChange }: TableLogViewer
<div className="grid grid-cols-2 gap-3 md:grid-cols-3"> <div className="grid grid-cols-2 gap-3 md:grid-cols-3">
<div> <div>
<label className="mb-1 block text-sm text-gray-600"> </label> <label className="mb-1 block text-sm text-gray-600"> </label>
<Select value={operationType} onValueChange={setOperationType}> {/* Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__all__" 사용 */}
<Select
value={operationType || "__all__"}
onValueChange={(value) => setOperationType(value === "__all__" ? "" : value)}
>
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="전체" /> <SelectValue placeholder="전체" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value=""></SelectItem> <SelectItem value="__all__"></SelectItem>
<SelectItem value="INSERT"></SelectItem> <SelectItem value="INSERT"></SelectItem>
<SelectItem value="UPDATE"></SelectItem> <SelectItem value="UPDATE"></SelectItem>
<SelectItem value="DELETE"></SelectItem> <SelectItem value="DELETE"></SelectItem>

View File

@ -236,12 +236,13 @@ export const DataMappingSettings: React.FC<DataMappingSettingsProps> = ({
<SelectValue placeholder={tablesLoading ? "테이블 목록 로딩 중..." : "저장할 테이블을 선택하세요"} /> <SelectValue placeholder={tablesLoading ? "테이블 목록 로딩 중..." : "저장할 테이블을 선택하세요"} />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
{/* Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__placeholder__" 사용 */}
{tablesLoading ? ( {tablesLoading ? (
<SelectItem value="" disabled> <SelectItem value="__placeholder__" disabled>
... ...
</SelectItem> </SelectItem>
) : availableTables.length === 0 ? ( ) : availableTables.length === 0 ? (
<SelectItem value="" disabled> <SelectItem value="__placeholder__" disabled>
</SelectItem> </SelectItem>
) : ( ) : (

View File

@ -1173,7 +1173,8 @@ export function FlowStepPanel({
REST API REST API
</SelectItem> </SelectItem>
) : ( ) : (
<SelectItem value="" disabled> // Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__placeholder__" 사용
<SelectItem value="__placeholder__" disabled>
REST API가 REST API가
</SelectItem> </SelectItem>
)} )}

View File

@ -357,11 +357,11 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
height: snappedSize, height: snappedSize,
}); });
} else { } else {
// Grid Snap 적용 // Grid Snap 적용
updateComponent(component.id, { updateComponent(component.id, {
width: snapValueToGrid(boundedWidth), width: snapValueToGrid(boundedWidth),
height: snapValueToGrid(boundedHeight), height: snapValueToGrid(boundedHeight),
}); });
} }
} }
}; };
@ -444,17 +444,17 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
case "text": case "text":
case "label": case "label":
return ( return (
<div <div
className="h-full w-full" className="h-full w-full"
style={{ style={{
fontSize: `${component.fontSize}px`, fontSize: `${component.fontSize}px`,
color: component.fontColor, color: component.fontColor,
fontWeight: component.fontWeight, fontWeight: component.fontWeight,
textAlign: component.textAlign as "left" | "center" | "right", textAlign: component.textAlign as "left" | "center" | "right",
whiteSpace: "pre-wrap", whiteSpace: "pre-wrap",
}} }}
> >
{displayValue} {displayValue}
</div> </div>
); );
@ -534,7 +534,7 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
// 기본 테이블 (데이터 없을 때) // 기본 테이블 (데이터 없을 때)
return ( return (
<div className="flex h-full w-full items-center justify-center border-2 border-dashed border-gray-300 bg-gray-50 text-xs text-gray-400"> <div className="flex h-full w-full items-center justify-center border-2 border-dashed border-gray-300 bg-gray-50 text-xs text-gray-400">
</div> </div>
); );
@ -606,7 +606,6 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
const sigLabelPos = component.labelPosition || "left"; const sigLabelPos = component.labelPosition || "left";
const sigShowLabel = component.showLabel !== false; const sigShowLabel = component.showLabel !== false;
const sigLabelText = component.labelText || "서명:"; const sigLabelText = component.labelText || "서명:";
const sigShowUnderline = component.showUnderline !== false;
return ( return (
<div className="h-full w-full"> <div className="h-full w-full">
@ -653,14 +652,6 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
</div> </div>
)} )}
{sigShowUnderline && (
<div
className="absolute right-0 bottom-0 left-0"
style={{
borderBottom: "2px solid #000000",
}}
/>
)}
</div> </div>
</div> </div>
</div> </div>
@ -867,12 +858,12 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
// 계산 결과 (첫 번째 항목은 기준값, 두 번째부터 연산자 적용) // 계산 결과 (첫 번째 항목은 기준값, 두 번째부터 연산자 적용)
const calculateResult = (): number => { const calculateResult = (): number => {
if (calcItems.length === 0) return 0; if (calcItems.length === 0) return 0;
// 첫 번째 항목은 기준값 // 첫 번째 항목은 기준값
let result = getCalcItemValue( let result = getCalcItemValue(
calcItems[0] as { label: string; value: number | string; operator: string; fieldName?: string }, calcItems[0] as { label: string; value: number | string; operator: string; fieldName?: string },
); );
// 두 번째 항목부터 연산자 적용 // 두 번째 항목부터 연산자 적용
for (let i = 1; i < calcItems.length; i++) { for (let i = 1; i < calcItems.length; i++) {
const item = calcItems[i]; const item = calcItems[i];
@ -908,30 +899,30 @@ export function CanvasComponent({ component }: CanvasComponentProps) {
item: { label: string; value: number | string; operator: string; fieldName?: string }, item: { label: string; value: number | string; operator: string; fieldName?: string },
index: number, index: number,
) => { ) => {
const itemValue = getCalcItemValue(item); const itemValue = getCalcItemValue(item);
return ( return (
<div key={index} className="flex items-center justify-between py-1"> <div key={index} className="flex items-center justify-between py-1">
<span <span
className="flex-shrink-0" className="flex-shrink-0"
style={{ style={{
width: `${calcLabelWidth}px`, width: `${calcLabelWidth}px`,
fontSize: `${calcLabelFontSize}px`, fontSize: `${calcLabelFontSize}px`,
color: calcLabelColor, color: calcLabelColor,
}} }}
> >
{item.label} {item.label}
</span> </span>
<span <span
className="text-right" className="text-right"
style={{ style={{
fontSize: `${calcValueFontSize}px`, fontSize: `${calcValueFontSize}px`,
color: calcValueColor, color: calcValueColor,
}} }}
> >
{formatNumber(itemValue)} {formatNumber(itemValue)}
</span> </span>
</div> </div>
); );
}, },
)} )}
</div> </div>

View File

@ -0,0 +1,320 @@
"use client";
import { useState, useEffect, useCallback, useMemo } from "react";
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogDescription,
DialogFooter,
} from "@/components/ui/dialog";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Loader2, Search, ChevronRight, ChevronDown, FolderOpen, FileText } from "lucide-react";
import { menuApi } from "@/lib/api/menu";
import { MenuItem } from "@/types/menu";
import { cn } from "@/lib/utils";
interface MenuSelectModalProps {
isOpen: boolean;
onClose: () => void;
onConfirm: (menuObjids: number[]) => void;
selectedMenuObjids?: number[];
}
// 트리 구조의 메뉴 노드
interface MenuTreeNode {
objid: string;
menuNameKor: string;
menuUrl: string;
level: number;
children: MenuTreeNode[];
parentObjId: string;
}
export function MenuSelectModal({
isOpen,
onClose,
onConfirm,
selectedMenuObjids = [],
}: MenuSelectModalProps) {
const [menus, setMenus] = useState<MenuItem[]>([]);
const [isLoading, setIsLoading] = useState(false);
const [searchText, setSearchText] = useState("");
const [selectedIds, setSelectedIds] = useState<Set<number>>(new Set(selectedMenuObjids));
const [expandedIds, setExpandedIds] = useState<Set<string>>(new Set());
// 초기 선택 상태 동기화
useEffect(() => {
if (isOpen) {
setSelectedIds(new Set(selectedMenuObjids));
}
}, [isOpen, selectedMenuObjids]);
// 메뉴 목록 로드
useEffect(() => {
if (isOpen) {
fetchMenus();
}
}, [isOpen]);
const fetchMenus = async () => {
setIsLoading(true);
try {
const response = await menuApi.getUserMenus();
if (response.success && response.data) {
setMenus(response.data);
// 처음 2레벨까지 자동 확장
const initialExpanded = new Set<string>();
response.data.forEach((menu) => {
const level = menu.lev || menu.LEV || 1;
if (level <= 2) {
initialExpanded.add(menu.objid || menu.OBJID || "");
}
});
setExpandedIds(initialExpanded);
}
} catch (error) {
console.error("메뉴 로드 오류:", error);
} finally {
setIsLoading(false);
}
};
// 메뉴 트리 구조 생성
const menuTree = useMemo(() => {
const menuMap = new Map<string, MenuTreeNode>();
const rootMenus: MenuTreeNode[] = [];
// 모든 메뉴를 노드로 변환
menus.forEach((menu) => {
const objid = menu.objid || menu.OBJID || "";
const parentObjId = menu.parentObjId || menu.PARENT_OBJ_ID || "";
const menuNameKor = menu.menuNameKor || menu.MENU_NAME_KOR || menu.translated_name || menu.TRANSLATED_NAME || "";
const menuUrl = menu.menuUrl || menu.MENU_URL || "";
const level = menu.lev || menu.LEV || 1;
menuMap.set(objid, {
objid,
menuNameKor,
menuUrl,
level,
children: [],
parentObjId,
});
});
// 부모-자식 관계 설정
menus.forEach((menu) => {
const objid = menu.objid || menu.OBJID || "";
const parentObjId = menu.parentObjId || menu.PARENT_OBJ_ID || "";
const node = menuMap.get(objid);
if (!node) return;
// 최상위 메뉴인지 확인 (parent가 없거나, 특정 루트 ID)
const parent = menuMap.get(parentObjId);
if (parent) {
parent.children.push(node);
} else {
rootMenus.push(node);
}
});
// 자식 메뉴 정렬
const sortChildren = (nodes: MenuTreeNode[]) => {
nodes.sort((a, b) => a.menuNameKor.localeCompare(b.menuNameKor, "ko"));
nodes.forEach((node) => sortChildren(node.children));
};
sortChildren(rootMenus);
return rootMenus;
}, [menus]);
// 검색 필터링
const filteredTree = useMemo(() => {
if (!searchText.trim()) return menuTree;
const searchLower = searchText.toLowerCase();
// 검색어에 맞는 노드와 그 조상 노드를 포함
const filterNodes = (nodes: MenuTreeNode[]): MenuTreeNode[] => {
return nodes
.map((node) => {
const filteredChildren = filterNodes(node.children);
const matches = node.menuNameKor.toLowerCase().includes(searchLower);
if (matches || filteredChildren.length > 0) {
return {
...node,
children: filteredChildren,
};
}
return null;
})
.filter((node): node is MenuTreeNode => node !== null);
};
return filterNodes(menuTree);
}, [menuTree, searchText]);
// 체크박스 토글
const toggleSelect = useCallback((objid: string) => {
const numericId = Number(objid);
setSelectedIds((prev) => {
const next = new Set(prev);
if (next.has(numericId)) {
next.delete(numericId);
} else {
next.add(numericId);
}
return next;
});
}, []);
// 확장/축소 토글
const toggleExpand = useCallback((objid: string) => {
setExpandedIds((prev) => {
const next = new Set(prev);
if (next.has(objid)) {
next.delete(objid);
} else {
next.add(objid);
}
return next;
});
}, []);
// 확인 버튼 클릭
const handleConfirm = () => {
onConfirm(Array.from(selectedIds));
onClose();
};
// 메뉴 노드 렌더링
const renderMenuNode = (node: MenuTreeNode, depth: number = 0) => {
const hasChildren = node.children.length > 0;
const isExpanded = expandedIds.has(node.objid);
const isSelected = selectedIds.has(Number(node.objid));
return (
<div key={node.objid}>
<div
className={cn(
"flex items-center gap-2 py-1.5 px-2 rounded-md hover:bg-muted/50 cursor-pointer",
isSelected && "bg-primary/10",
)}
style={{ paddingLeft: `${depth * 20 + 8}px` }}
onClick={() => toggleSelect(node.objid)}
>
{/* 확장/축소 버튼 */}
{hasChildren ? (
<button
type="button"
onClick={(e) => {
e.stopPropagation();
toggleExpand(node.objid);
}}
className="p-0.5 hover:bg-muted rounded"
>
{isExpanded ? (
<ChevronDown className="h-4 w-4 text-muted-foreground" />
) : (
<ChevronRight className="h-4 w-4 text-muted-foreground" />
)}
</button>
) : (
<div className="w-5" />
)}
{/* 체크박스 - 모든 메뉴에서 선택 가능 */}
<Checkbox
checked={isSelected}
onCheckedChange={() => toggleSelect(node.objid)}
onClick={(e) => e.stopPropagation()}
/>
{/* 아이콘 */}
{hasChildren ? (
<FolderOpen className="h-4 w-4 text-amber-500" />
) : (
<FileText className="h-4 w-4 text-muted-foreground" />
)}
{/* 메뉴명 */}
<span
className={cn(
"text-sm flex-1 truncate",
isSelected && "font-medium text-primary",
)}
>
{node.menuNameKor}
</span>
</div>
{/* 자식 메뉴 */}
{hasChildren && isExpanded && (
<div>{node.children.map((child) => renderMenuNode(child, depth + 1))}</div>
)}
</div>
);
};
return (
<Dialog open={isOpen} onOpenChange={onClose}>
<DialogContent className="max-w-[600px] max-h-[80vh] flex flex-col">
<DialogHeader>
<DialogTitle> </DialogTitle>
<DialogDescription>
. .
</DialogDescription>
</DialogHeader>
{/* 검색 */}
<div className="relative">
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
<Input
placeholder="메뉴 검색..."
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
className="pl-10"
/>
</div>
{/* 선택된 메뉴 수 */}
<div className="text-sm text-muted-foreground">
{selectedIds.size}
</div>
{/* 메뉴 트리 */}
<ScrollArea className="flex-1 border rounded-md">
{isLoading ? (
<div className="flex items-center justify-center py-8">
<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
<span className="ml-2 text-sm text-muted-foreground"> ...</span>
</div>
) : filteredTree.length === 0 ? (
<div className="flex items-center justify-center py-8 text-sm text-muted-foreground">
{searchText ? "검색 결과가 없습니다." : "표시할 메뉴가 없습니다."}
</div>
) : (
<div className="p-2">{filteredTree.map((node) => renderMenuNode(node))}</div>
)}
</ScrollArea>
<DialogFooter>
<Button variant="outline" onClick={onClose}>
</Button>
<Button onClick={handleConfirm}>
({selectedIds.size} )
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
}

View File

@ -319,7 +319,6 @@ export function ReportDesignerCanvas() {
showLabel: true, showLabel: true,
labelText: "서명:", labelText: "서명:",
labelPosition: "left" as const, labelPosition: "left" as const,
showUnderline: true,
borderWidth: 0, borderWidth: 0,
borderColor: "#cccccc", borderColor: "#cccccc",
}), }),

View File

@ -947,26 +947,6 @@ export function ReportDesignerRightPanel() {
</> </>
)} )}
{/* 밑줄 표시 (서명란만) */}
{selectedComponent.type === "signature" && (
<div className="flex items-center gap-2">
<input
type="checkbox"
id="showUnderline"
checked={selectedComponent.showUnderline !== false}
onChange={(e) =>
updateComponent(selectedComponent.id, {
showUnderline: e.target.checked,
})
}
className="h-4 w-4"
/>
<Label htmlFor="showUnderline" className="text-xs">
</Label>
</div>
)}
{/* 이름 입력 (도장란만) */} {/* 이름 입력 (도장란만) */}
{selectedComponent.type === "stamp" && ( {selectedComponent.type === "stamp" && (
<div> <div>
@ -2502,10 +2482,11 @@ export function ReportDesignerRightPanel() {
<Label className="text-xs"> (mm)</Label> <Label className="text-xs"> (mm)</Label>
<Input <Input
type="number" type="number"
min={1}
value={currentPage.width} value={currentPage.width}
onChange={(e) => onChange={(e) =>
updatePageSettings(currentPageId, { updatePageSettings(currentPageId, {
width: Number(e.target.value), width: Math.max(1, Number(e.target.value)),
}) })
} }
className="mt-1" className="mt-1"
@ -2515,10 +2496,11 @@ export function ReportDesignerRightPanel() {
<Label className="text-xs"> (mm)</Label> <Label className="text-xs"> (mm)</Label>
<Input <Input
type="number" type="number"
min={1}
value={currentPage.height} value={currentPage.height}
onChange={(e) => onChange={(e) =>
updatePageSettings(currentPageId, { updatePageSettings(currentPageId, {
height: Number(e.target.value), height: Math.max(1, Number(e.target.value)),
}) })
} }
className="mt-1" className="mt-1"
@ -2589,12 +2571,13 @@ export function ReportDesignerRightPanel() {
<Label className="text-xs"></Label> <Label className="text-xs"></Label>
<Input <Input
type="number" type="number"
min={0}
value={currentPage.margins.top} value={currentPage.margins.top}
onChange={(e) => onChange={(e) =>
updatePageSettings(currentPageId, { updatePageSettings(currentPageId, {
margins: { margins: {
...currentPage.margins, ...currentPage.margins,
top: Number(e.target.value), top: Math.max(0, Number(e.target.value)),
}, },
}) })
} }
@ -2605,12 +2588,13 @@ export function ReportDesignerRightPanel() {
<Label className="text-xs"></Label> <Label className="text-xs"></Label>
<Input <Input
type="number" type="number"
min={0}
value={currentPage.margins.bottom} value={currentPage.margins.bottom}
onChange={(e) => onChange={(e) =>
updatePageSettings(currentPageId, { updatePageSettings(currentPageId, {
margins: { margins: {
...currentPage.margins, ...currentPage.margins,
bottom: Number(e.target.value), bottom: Math.max(0, Number(e.target.value)),
}, },
}) })
} }
@ -2621,12 +2605,13 @@ export function ReportDesignerRightPanel() {
<Label className="text-xs"></Label> <Label className="text-xs"></Label>
<Input <Input
type="number" type="number"
min={0}
value={currentPage.margins.left} value={currentPage.margins.left}
onChange={(e) => onChange={(e) =>
updatePageSettings(currentPageId, { updatePageSettings(currentPageId, {
margins: { margins: {
...currentPage.margins, ...currentPage.margins,
left: Number(e.target.value), left: Math.max(0, Number(e.target.value)),
}, },
}) })
} }
@ -2637,12 +2622,13 @@ export function ReportDesignerRightPanel() {
<Label className="text-xs"></Label> <Label className="text-xs"></Label>
<Input <Input
type="number" type="number"
min={0}
value={currentPage.margins.right} value={currentPage.margins.right}
onChange={(e) => onChange={(e) =>
updatePageSettings(currentPageId, { updatePageSettings(currentPageId, {
margins: { margins: {
...currentPage.margins, ...currentPage.margins,
right: Number(e.target.value), right: Math.max(0, Number(e.target.value)),
}, },
}) })
} }

View File

@ -42,8 +42,19 @@ import {
DropdownMenuSeparator, DropdownMenuSeparator,
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"; } from "@/components/ui/dropdown-menu";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { SaveAsTemplateModal } from "./SaveAsTemplateModal"; import { SaveAsTemplateModal } from "./SaveAsTemplateModal";
import { MenuSelectModal } from "./MenuSelectModal";
import { reportApi } from "@/lib/api/reportApi"; import { reportApi } from "@/lib/api/reportApi";
import { useToast } from "@/hooks/use-toast"; import { useToast } from "@/hooks/use-toast";
import { ReportPreviewModal } from "./ReportPreviewModal"; import { ReportPreviewModal } from "./ReportPreviewModal";
@ -52,7 +63,7 @@ export function ReportDesignerToolbar() {
const router = useRouter(); const router = useRouter();
const { const {
reportDetail, reportDetail,
saveLayout, saveLayoutWithMenus,
isSaving, isSaving,
loadLayout, loadLayout,
components, components,
@ -90,9 +101,14 @@ export function ReportDesignerToolbar() {
setShowRuler, setShowRuler,
groupComponents, groupComponents,
ungroupComponents, ungroupComponents,
menuObjids,
} = useReportDesigner(); } = useReportDesigner();
const [showPreview, setShowPreview] = useState(false); const [showPreview, setShowPreview] = useState(false);
const [showSaveAsTemplate, setShowSaveAsTemplate] = useState(false); const [showSaveAsTemplate, setShowSaveAsTemplate] = useState(false);
const [showBackConfirm, setShowBackConfirm] = useState(false);
const [showResetConfirm, setShowResetConfirm] = useState(false);
const [showMenuSelect, setShowMenuSelect] = useState(false);
const [pendingSaveAndClose, setPendingSaveAndClose] = useState(false);
const { toast } = useToast(); const { toast } = useToast();
// 버튼 활성화 조건 // 버튼 활성화 조건
@ -111,27 +127,33 @@ export function ReportDesignerToolbar() {
setShowGrid(newValue); setShowGrid(newValue);
}; };
const handleSave = async () => { const handleSave = () => {
await saveLayout(); setPendingSaveAndClose(false);
setShowMenuSelect(true);
}; };
const handleSaveAndClose = async () => { const handleSaveAndClose = () => {
await saveLayout(); setPendingSaveAndClose(true);
router.push("/admin/report"); setShowMenuSelect(true);
}; };
const handleReset = async () => { const handleMenuSelectConfirm = async (selectedMenuObjids: number[]) => {
if (confirm("현재 변경사항을 모두 취소하고 마지막 저장 상태로 되돌리시겠습니까?")) { await saveLayoutWithMenus(selectedMenuObjids);
await loadLayout(); if (pendingSaveAndClose) {
}
};
const handleBack = () => {
if (confirm("저장하지 않은 변경사항이 있을 수 있습니다. 목록으로 돌아가시겠습니까?")) {
router.push("/admin/report"); router.push("/admin/report");
} }
}; };
const handleResetConfirm = async () => {
setShowResetConfirm(false);
await loadLayout();
};
const handleBackConfirm = () => {
setShowBackConfirm(false);
router.push("/admin/report");
};
const handleSaveAsTemplate = async (data: { const handleSaveAsTemplate = async (data: {
templateNameKor: string; templateNameKor: string;
templateNameEng?: string; templateNameEng?: string;
@ -193,7 +215,7 @@ export function ReportDesignerToolbar() {
<> <>
<div className="flex items-center justify-between border-b bg-white px-4 py-3 shadow-sm"> <div className="flex items-center justify-between border-b bg-white px-4 py-3 shadow-sm">
<div className="flex items-center gap-4"> <div className="flex items-center gap-4">
<Button variant="ghost" size="sm" onClick={handleBack} className="gap-2"> <Button variant="ghost" size="sm" onClick={() => setShowBackConfirm(true)} className="gap-2">
<ArrowLeft className="h-4 w-4" /> <ArrowLeft className="h-4 w-4" />
</Button> </Button>
@ -437,7 +459,7 @@ export function ReportDesignerToolbar() {
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
<Button variant="outline" size="sm" onClick={handleReset} className="gap-2"> <Button variant="outline" size="sm" onClick={() => setShowResetConfirm(true)} className="gap-2">
<RotateCcw className="h-4 w-4" /> <RotateCcw className="h-4 w-4" />
</Button> </Button>
@ -491,6 +513,46 @@ export function ReportDesignerToolbar() {
onClose={() => setShowSaveAsTemplate(false)} onClose={() => setShowSaveAsTemplate(false)}
onSave={handleSaveAsTemplate} onSave={handleSaveAsTemplate}
/> />
<MenuSelectModal
isOpen={showMenuSelect}
onClose={() => setShowMenuSelect(false)}
onConfirm={handleMenuSelectConfirm}
selectedMenuObjids={menuObjids}
/>
{/* 목록으로 돌아가기 확인 모달 */}
<AlertDialog open={showBackConfirm} onOpenChange={setShowBackConfirm}>
<AlertDialogContent className="max-w-[400px]">
<AlertDialogHeader>
<AlertDialogTitle> </AlertDialogTitle>
<AlertDialogDescription>
.
<br />
?
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel></AlertDialogCancel>
<AlertDialogAction onClick={handleBackConfirm}></AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
{/* 초기화 확인 모달 */}
<AlertDialog open={showResetConfirm} onOpenChange={setShowResetConfirm}>
<AlertDialogContent className="max-w-[400px]">
<AlertDialogHeader>
<AlertDialogTitle></AlertDialogTitle>
<AlertDialogDescription>
?
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel></AlertDialogCancel>
<AlertDialogAction onClick={handleResetConfirm}></AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</> </>
); );
} }

View File

@ -17,6 +17,9 @@ import { getFullImageUrl } from "@/lib/api/client";
import JsBarcode from "jsbarcode"; import JsBarcode from "jsbarcode";
import QRCode from "qrcode"; import QRCode from "qrcode";
// mm -> px 변환 상수
const MM_TO_PX = 4;
interface ReportPreviewModalProps { interface ReportPreviewModalProps {
isOpen: boolean; isOpen: boolean;
onClose: () => void; onClose: () => void;
@ -149,8 +152,8 @@ function PreviewWatermarkLayer({ watermark, pageWidth, pageHeight }: PreviewWate
// 타일 스타일 // 타일 스타일
if (watermark.style === "tile") { if (watermark.style === "tile") {
const tileSize = watermark.type === "text" ? (watermark.fontSize || 48) * 4 : 150; const tileSize = watermark.type === "text" ? (watermark.fontSize || 48) * 4 : 150;
const cols = Math.ceil((pageWidth * 3.7795) / tileSize) + 2; const cols = Math.ceil((pageWidth * MM_TO_PX) / tileSize) + 2;
const rows = Math.ceil((pageHeight * 3.7795) / tileSize) + 2; const rows = Math.ceil((pageHeight * MM_TO_PX) / tileSize) + 2;
return ( return (
<div style={baseStyle}> <div style={baseStyle}>
@ -514,7 +517,7 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
printWindow.document.write(printHtml); printWindow.document.write(printHtml);
printWindow.document.close(); printWindow.document.close();
printWindow.print(); // print()는 HTML 내 스크립트에서 이미지 로드 완료 후 자동 호출됨
}; };
// 워터마크 HTML 생성 헬퍼 함수 // 워터마크 HTML 생성 헬퍼 함수
@ -554,8 +557,8 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
if (watermark.style === "tile") { if (watermark.style === "tile") {
const tileSize = watermark.type === "text" ? (watermark.fontSize || 48) * 4 : 150; const tileSize = watermark.type === "text" ? (watermark.fontSize || 48) * 4 : 150;
const cols = Math.ceil((pageWidth * 3.7795) / tileSize) + 2; const cols = Math.ceil((pageWidth * MM_TO_PX) / tileSize) + 2;
const rows = Math.ceil((pageHeight * 3.7795) / tileSize) + 2; const rows = Math.ceil((pageHeight * MM_TO_PX) / tileSize) + 2;
const tileItems = Array.from({ length: rows * cols }) const tileItems = Array.from({ length: rows * cols })
.map(() => `<div style="width: ${tileSize}px; height: ${tileSize}px; display: flex; align-items: center; justify-content: center;">${textContent}</div>`) .map(() => `<div style="width: ${tileSize}px; height: ${tileSize}px; display: flex; align-items: center; justify-content: center;">${textContent}</div>`)
.join(""); .join("");
@ -624,7 +627,6 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
${showLabel ? `<div style="font-size: 12px; white-space: nowrap;">${labelText}</div>` : ""} ${showLabel ? `<div style="font-size: 12px; white-space: nowrap;">${labelText}</div>` : ""}
<div style="flex: 1; position: relative;"> <div style="flex: 1; position: relative;">
${imageUrl ? `<img src="${imageUrl}" style="width: 100%; height: 100%; object-fit: ${component.objectFit || "contain"};" />` : ""} ${imageUrl ? `<img src="${imageUrl}" style="width: 100%; height: 100%; object-fit: ${component.objectFit || "contain"};" />` : ""}
${component.showUnderline ? '<div style="position: absolute; bottom: 0; left: 0; right: 0; height: 1px; background-color: #000000;"></div>' : ""}
</div> </div>
</div>`; </div>`;
} else { } else {
@ -633,7 +635,6 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
${showLabel && labelPosition === "top" ? `<div style="font-size: 12px;">${labelText}</div>` : ""} ${showLabel && labelPosition === "top" ? `<div style="font-size: 12px;">${labelText}</div>` : ""}
<div style="flex: 1; width: 100%; position: relative;"> <div style="flex: 1; width: 100%; position: relative;">
${imageUrl ? `<img src="${imageUrl}" style="width: 100%; height: 100%; object-fit: ${component.objectFit || "contain"};" />` : ""} ${imageUrl ? `<img src="${imageUrl}" style="width: 100%; height: 100%; object-fit: ${component.objectFit || "contain"};" />` : ""}
${component.showUnderline ? '<div style="position: absolute; bottom: 0; left: 0; right: 0; height: 1px; background-color: #000000;"></div>' : ""}
</div> </div>
${showLabel && labelPosition === "bottom" ? `<div style="font-size: 12px;">${labelText}</div>` : ""} ${showLabel && labelPosition === "bottom" ? `<div style="font-size: 12px;">${labelText}</div>` : ""}
</div>`; </div>`;
@ -652,9 +653,9 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
: ""; : "";
content = ` content = `
<div style="display: flex; align-items: center; gap: 8px; height: 100%;"> <div style="display: flex; align-items: center; gap: 8px; width: 100%; height: 100%;">
${personName ? `<div style="font-size: 12px;">${personName}</div>` : ""} ${personName ? `<div style="font-size: 12px; white-space: nowrap;">${personName}</div>` : ""}
<div style="position: relative; width: ${component.width}px; height: ${component.height}px;"> <div style="position: relative; flex: 1; height: 100%;">
${imageUrl ? `<img src="${imageUrl}" style="width: 100%; height: 100%; object-fit: ${component.objectFit || "contain"}; border-radius: 50%;" />` : ""} ${imageUrl ? `<img src="${imageUrl}" style="width: 100%; height: 100%; object-fit: ${component.objectFit || "contain"}; border-radius: 50%;" />` : ""}
${showLabel ? `<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); font-size: 12px; font-weight: bold; color: #dc2626;">${labelText}</div>` : ""} ${showLabel ? `<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); font-size: 12px; font-weight: bold; color: #dc2626;">${labelText}</div>` : ""}
</div> </div>
@ -893,8 +894,15 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
</table>`; </table>`;
} }
// 컴포넌트 값은 px로 저장됨 (캔버스는 pageWidth * MM_TO_PX px)
// 인쇄용 mm 단위로 변환: px / MM_TO_PX = mm
const xMm = component.x / MM_TO_PX;
const yMm = component.y / MM_TO_PX;
const widthMm = component.width / MM_TO_PX;
const heightMm = component.height / MM_TO_PX;
return ` return `
<div style="position: absolute; left: ${component.x}px; top: ${component.y}px; width: ${component.width}px; height: ${component.height}px; background-color: ${component.backgroundColor || "transparent"}; border: ${component.borderWidth ? `${component.borderWidth}px solid ${component.borderColor}` : "none"}; padding: 8px; box-sizing: border-box;"> <div style="position: absolute; left: ${xMm}mm; top: ${yMm}mm; width: ${widthMm}mm; height: ${heightMm}mm; background-color: ${component.backgroundColor || "transparent"}; border: ${component.borderWidth ? `${component.borderWidth}px solid ${component.borderColor}` : "none"}; box-sizing: border-box; overflow: hidden;">
${content} ${content}
</div>`; </div>`;
}) })
@ -903,7 +911,7 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
const watermarkHTML = generateWatermarkHTML(watermark, pageWidth, pageHeight); const watermarkHTML = generateWatermarkHTML(watermark, pageWidth, pageHeight);
return ` return `
<div style="position: relative; width: ${pageWidth}mm; min-height: ${pageHeight}mm; background-color: ${backgroundColor}; margin: 0 auto;"> <div class="print-page" style="position: relative; width: ${pageWidth}mm; min-height: ${pageHeight}mm; background-color: ${backgroundColor};">
${watermarkHTML} ${watermarkHTML}
${componentsHTML} ${componentsHTML}
</div>`; </div>`;
@ -935,20 +943,18 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
<meta charset="UTF-8"> <meta charset="UTF-8">
<title> </title> <title> </title>
<style> <style>
* { box-sizing: border-box; } * { box-sizing: border-box; margin: 0; padding: 0; }
@page { @page {
size: A4; size: A4;
margin: 10mm; margin: 0;
} }
@media print { @media print {
body { margin: 0; padding: 0; } html, body { width: 210mm; height: 297mm; }
.print-page { page-break-after: always; page-break-inside: avoid; } .print-page { page-break-after: always; page-break-inside: avoid; }
.print-page:last-child { page-break-after: auto; } .print-page:last-child { page-break-after: auto; }
} }
body { body {
font-family: 'Malgun Gothic', 'Apple SD Gothic Neo', sans-serif; font-family: 'Malgun Gothic', 'Apple SD Gothic Neo', sans-serif;
margin: 0;
padding: 20px;
-webkit-print-color-adjust: exact; -webkit-print-color-adjust: exact;
print-color-adjust: exact; print-color-adjust: exact;
} }
@ -1052,7 +1058,7 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
description: "WORD 파일을 생성하고 있습니다...", description: "WORD 파일을 생성하고 있습니다...",
}); });
// 이미지를 Base64로 변환하여 컴포넌트 데이터에 포함 // 이미지 및 바코드를 Base64로 변환하여 컴포넌트 데이터에 포함
const pagesWithBase64 = await Promise.all( const pagesWithBase64 = await Promise.all(
layoutConfig.pages.map(async (page) => { layoutConfig.pages.map(async (page) => {
const componentsWithBase64 = await Promise.all( const componentsWithBase64 = await Promise.all(
@ -1066,11 +1072,20 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
return component; return component;
} }
} }
// 바코드/QR코드 컴포넌트는 이미지로 변환
if (component.type === "barcode") {
try {
const barcodeImage = await generateBarcodeImage(component);
return { ...component, barcodeImageBase64: barcodeImage };
} catch {
return component; return component;
}), }
}
return component;
})
); );
return { ...page, components: componentsWithBase64 }; return { ...page, components: componentsWithBase64 };
}), })
); );
// 쿼리 결과 수집 // 쿼리 결과 수집
@ -1377,17 +1392,6 @@ export function ReportPreviewModal({ isOpen, onClose }: ReportPreviewModalProps)
}} }}
/> />
)} )}
{component.showUnderline !== false && (
<div
style={{
position: "absolute",
bottom: "0",
left: "0",
right: "0",
borderBottom: "2px solid #000000",
}}
/>
)}
</div> </div>
</div> </div>
)} )}

View File

@ -109,6 +109,22 @@ export function SignatureGenerator({ onSignatureSelect }: SignatureGeneratorProp
}); });
} }
// 사용자가 입력한 텍스트로 각 폰트의 글리프를 미리 로드
const preloadCanvas = document.createElement("canvas");
preloadCanvas.width = 500;
preloadCanvas.height = 200;
const preloadCtx = preloadCanvas.getContext("2d");
if (preloadCtx) {
for (const font of fonts) {
preloadCtx.font = `${font.weight} 124px ${font.style}`;
preloadCtx.fillText(name, 0, 100);
}
}
// 글리프 로드 대기 (중요: 첫 렌더링 후 폰트가 완전히 로드되도록)
await new Promise((resolve) => setTimeout(resolve, 300));
const newSignatures: string[] = []; const newSignatures: string[] = [];
// 동기적으로 하나씩 생성 // 동기적으로 하나씩 생성

View File

@ -3,6 +3,16 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Trash2, Loader2, RefreshCw } from "lucide-react"; import { Trash2, Loader2, RefreshCw } from "lucide-react";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { useReportDesigner } from "@/contexts/ReportDesignerContext"; import { useReportDesigner } from "@/contexts/ReportDesignerContext";
import { reportApi } from "@/lib/api/reportApi"; import { reportApi } from "@/lib/api/reportApi";
import { useToast } from "@/hooks/use-toast"; import { useToast } from "@/hooks/use-toast";
@ -19,6 +29,7 @@ export function TemplatePalette() {
const [customTemplates, setCustomTemplates] = useState<Template[]>([]); const [customTemplates, setCustomTemplates] = useState<Template[]>([]);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [deletingId, setDeletingId] = useState<string | null>(null); const [deletingId, setDeletingId] = useState<string | null>(null);
const [deleteTarget, setDeleteTarget] = useState<{ id: string; name: string } | null>(null);
const { toast } = useToast(); const { toast } = useToast();
const fetchTemplates = async () => { const fetchTemplates = async () => {
@ -49,14 +60,18 @@ export function TemplatePalette() {
await applyTemplate(templateId); await applyTemplate(templateId);
}; };
const handleDeleteTemplate = async (templateId: string, templateName: string) => { const handleDeleteClick = (templateId: string, templateName: string) => {
if (!confirm(`"${templateName}" 템플릿을 삭제하시겠습니까?`)) { setDeleteTarget({ id: templateId, name: templateName });
return; };
}
const handleDeleteConfirm = async () => {
if (!deleteTarget) return;
setDeletingId(deleteTarget.id);
setDeleteTarget(null);
setDeletingId(templateId);
try { try {
const response = await reportApi.deleteTemplate(templateId); const response = await reportApi.deleteTemplate(deleteTarget.id);
if (response.success) { if (response.success) {
toast({ toast({
title: "성공", title: "성공",
@ -108,7 +123,7 @@ export function TemplatePalette() {
size="sm" size="sm"
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
handleDeleteTemplate(template.template_id, template.template_name_kor); handleDeleteClick(template.template_id, template.template_name_kor);
}} }}
disabled={deletingId === template.template_id} disabled={deletingId === template.template_id}
className="absolute top-1/2 right-1 h-6 w-6 -translate-y-1/2 p-0 opacity-0 transition-opacity group-hover:opacity-100" className="absolute top-1/2 right-1 h-6 w-6 -translate-y-1/2 p-0 opacity-0 transition-opacity group-hover:opacity-100"
@ -123,6 +138,29 @@ export function TemplatePalette() {
)) ))
)} )}
</div> </div>
{/* 삭제 확인 모달 */}
<AlertDialog open={!!deleteTarget} onOpenChange={(open) => !open && setDeleteTarget(null)}>
<AlertDialogContent className="max-w-[400px]">
<AlertDialogHeader>
<AlertDialogTitle>릿 </AlertDialogTitle>
<AlertDialogDescription>
&quot;{deleteTarget?.name}&quot; 릿 ?
<br />
릿 .
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel></AlertDialogCancel>
<AlertDialogAction
onClick={handleDeleteConfirm}
className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
>
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div> </div>
); );
} }

View File

@ -138,10 +138,49 @@ interface ReportDesignerContextType {
// 그룹화 // 그룹화
groupComponents: () => void; groupComponents: () => void;
ungroupComponents: () => void; ungroupComponents: () => void;
// 메뉴 연결
menuObjids: number[];
setMenuObjids: (menuObjids: number[]) => void;
saveLayoutWithMenus: (menuObjids: number[]) => Promise<void>;
} }
const ReportDesignerContext = createContext<ReportDesignerContextType | undefined>(undefined); const ReportDesignerContext = createContext<ReportDesignerContextType | undefined>(undefined);
// 페이지 사이즈 변경 시 컴포넌트 위치 및 크기 재계산 유틸리티 함수
const recalculateComponentPositions = (
components: ComponentConfig[],
oldWidth: number,
oldHeight: number,
newWidth: number,
newHeight: number
): ComponentConfig[] => {
// 사이즈가 동일하면 그대로 반환
if (oldWidth === newWidth && oldHeight === newHeight) {
return components;
}
const widthRatio = newWidth / oldWidth;
const heightRatio = newHeight / oldHeight;
return components.map((comp) => {
// 위치와 크기 모두 비율대로 재계산
// 소수점 2자리까지만 유지
const newX = Math.round(comp.x * widthRatio * 100) / 100;
const newY = Math.round(comp.y * heightRatio * 100) / 100;
const newCompWidth = Math.round(comp.width * widthRatio * 100) / 100;
const newCompHeight = Math.round(comp.height * heightRatio * 100) / 100;
return {
...comp,
x: newX,
y: newY,
width: newCompWidth,
height: newCompHeight,
};
});
};
export function ReportDesignerProvider({ reportId, children }: { reportId: string; children: ReactNode }) { export function ReportDesignerProvider({ reportId, children }: { reportId: string; children: ReactNode }) {
const [reportDetail, setReportDetail] = useState<ReportDetail | null>(null); const [reportDetail, setReportDetail] = useState<ReportDetail | null>(null);
const [layout, setLayout] = useState<ReportLayout | null>(null); const [layout, setLayout] = useState<ReportLayout | null>(null);
@ -158,6 +197,7 @@ export function ReportDesignerProvider({ reportId, children }: { reportId: strin
const [selectedComponentIds, setSelectedComponentIds] = useState<string[]>([]); // 다중 선택 const [selectedComponentIds, setSelectedComponentIds] = useState<string[]>([]); // 다중 선택
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [isSaving, setIsSaving] = useState(false); const [isSaving, setIsSaving] = useState(false);
const [menuObjids, setMenuObjids] = useState<number[]>([]); // 연결된 메뉴 ID 목록
const { toast } = useToast(); const { toast } = useToast();
// 현재 페이지 계산 // 현재 페이지 계산
@ -988,10 +1028,42 @@ export function ReportDesignerProvider({ reportId, children }: { reportId: strin
}, []); }, []);
const updatePageSettings = useCallback((pageId: string, settings: Partial<ReportPage>) => { const updatePageSettings = useCallback((pageId: string, settings: Partial<ReportPage>) => {
setLayoutConfig((prev) => ({ setLayoutConfig((prev) => {
...prev, const targetPage = prev.pages.find((p) => p.page_id === pageId);
pages: prev.pages.map((page) => (page.page_id === pageId ? { ...page, ...settings } : page)), if (!targetPage) {
})); return prev;
}
// 페이지 사이즈 변경 감지
const isWidthChanging = settings.width !== undefined && settings.width !== targetPage.width;
const isHeightChanging = settings.height !== undefined && settings.height !== targetPage.height;
// 사이즈 변경 시 컴포넌트 위치 재계산
let updatedComponents = targetPage.components;
if (isWidthChanging || isHeightChanging) {
const oldWidth = targetPage.width;
const oldHeight = targetPage.height;
const newWidth = settings.width ?? targetPage.width;
const newHeight = settings.height ?? targetPage.height;
updatedComponents = recalculateComponentPositions(
targetPage.components,
oldWidth,
oldHeight,
newWidth,
newHeight
);
}
return {
...prev,
pages: prev.pages.map((page) =>
page.page_id === pageId
? { ...page, ...settings, components: updatedComponents }
: page
),
};
});
}, []); }, []);
// 전체 페이지 공유 워터마크 업데이트 // 전체 페이지 공유 워터마크 업데이트
@ -1043,6 +1115,13 @@ export function ReportDesignerProvider({ reportId, children }: { reportId: strin
})); }));
setQueries(loadedQueries); setQueries(loadedQueries);
} }
// 연결된 메뉴 로드
if (detailResponse.data.menuObjids && detailResponse.data.menuObjids.length > 0) {
setMenuObjids(detailResponse.data.menuObjids);
} else {
setMenuObjids([]);
}
} }
// 레이아웃 조회 // 레이아웃 조회
@ -1331,6 +1410,7 @@ export function ReportDesignerProvider({ reportId, children }: { reportId: strin
...q, ...q,
externalConnectionId: q.externalConnectionId || undefined, externalConnectionId: q.externalConnectionId || undefined,
})), })),
menuObjids, // 연결된 메뉴 목록
}); });
toast({ toast({
@ -1352,7 +1432,68 @@ export function ReportDesignerProvider({ reportId, children }: { reportId: strin
} finally { } finally {
setIsSaving(false); setIsSaving(false);
} }
}, [reportId, layoutConfig, queries, toast, loadLayout]); }, [reportId, layoutConfig, queries, menuObjids, toast, loadLayout]);
// 메뉴를 선택하고 저장하는 함수
const saveLayoutWithMenus = useCallback(
async (selectedMenuObjids: number[]) => {
// 먼저 메뉴 상태 업데이트
setMenuObjids(selectedMenuObjids);
setIsSaving(true);
try {
let actualReportId = reportId;
// 새 리포트인 경우 먼저 리포트 생성
if (reportId === "new") {
const createResponse = await reportApi.createReport({
reportNameKor: "새 리포트",
reportType: "BASIC",
description: "새로 생성된 리포트입니다.",
});
if (!createResponse.success || !createResponse.data) {
throw new Error("리포트 생성에 실패했습니다.");
}
actualReportId = createResponse.data.reportId;
// URL 업데이트 (페이지 리로드 없이)
window.history.replaceState({}, "", `/admin/report/designer/${actualReportId}`);
}
// 레이아웃 저장 (선택된 메뉴와 함께)
await reportApi.saveLayout(actualReportId, {
layoutConfig,
queries: queries.map((q) => ({
...q,
externalConnectionId: q.externalConnectionId || undefined,
})),
menuObjids: selectedMenuObjids,
});
toast({
title: "성공",
description: reportId === "new" ? "리포트가 생성되었습니다." : "레이아웃이 저장되었습니다.",
});
// 새 리포트였다면 데이터 다시 로드
if (reportId === "new") {
await loadLayout();
}
} catch (error) {
const errorMessage = error instanceof Error ? error.message : "저장에 실패했습니다.";
toast({
title: "오류",
description: errorMessage,
variant: "destructive",
});
} finally {
setIsSaving(false);
}
},
[reportId, layoutConfig, queries, toast, loadLayout],
);
// 템플릿 적용 // 템플릿 적용
const applyTemplate = useCallback( const applyTemplate = useCallback(
@ -1553,6 +1694,10 @@ export function ReportDesignerProvider({ reportId, children }: { reportId: strin
// 그룹화 // 그룹화
groupComponents, groupComponents,
ungroupComponents, ungroupComponents,
// 메뉴 연결
menuObjids,
setMenuObjids,
saveLayoutWithMenus,
}; };
return <ReportDesignerContext.Provider value={value}>{children}</ReportDesignerContext.Provider>; return <ReportDesignerContext.Provider value={value}>{children}</ReportDesignerContext.Provider>;

View File

@ -315,16 +315,17 @@ export default function MapConfigPanel({ config, onChange }: MapConfigPanelProps
{/* 라벨 컬럼 (선택) */} {/* 라벨 컬럼 (선택) */}
<div className="space-y-2 mb-3"> <div className="space-y-2 mb-3">
<Label> ()</Label> <Label> ()</Label>
{/* Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__none__" 사용 */}
<Select <Select
value={config.dataSource?.labelColumn || ""} value={config.dataSource?.labelColumn || "__none__"}
onValueChange={(value) => updateConfig("dataSource.labelColumn", value)} onValueChange={(value) => updateConfig("dataSource.labelColumn", value === "__none__" ? "" : value)}
disabled={isLoadingColumns || !config.dataSource?.tableName} disabled={isLoadingColumns || !config.dataSource?.tableName}
> >
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="라벨 컬럼 선택" /> <SelectValue placeholder="라벨 컬럼 선택" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value=""> </SelectItem> <SelectItem value="__none__"> </SelectItem>
{columns.map((col) => ( {columns.map((col) => (
<SelectItem key={col.column_name} value={col.column_name}> <SelectItem key={col.column_name} value={col.column_name}>
{col.column_name} ({col.data_type}) {col.column_name} ({col.data_type})
@ -337,16 +338,17 @@ export default function MapConfigPanel({ config, onChange }: MapConfigPanelProps
{/* 상태 컬럼 (선택) */} {/* 상태 컬럼 (선택) */}
<div className="space-y-2 mb-3"> <div className="space-y-2 mb-3">
<Label> ()</Label> <Label> ()</Label>
{/* Radix UI Select v2.x: 빈 문자열 value="" 금지 → "__none__" 사용 */}
<Select <Select
value={config.dataSource?.statusColumn || ""} value={config.dataSource?.statusColumn || "__none__"}
onValueChange={(value) => updateConfig("dataSource.statusColumn", value)} onValueChange={(value) => updateConfig("dataSource.statusColumn", value === "__none__" ? "" : value)}
disabled={isLoadingColumns || !config.dataSource?.tableName} disabled={isLoadingColumns || !config.dataSource?.tableName}
> >
<SelectTrigger> <SelectTrigger>
<SelectValue placeholder="상태 컬럼 선택" /> <SelectValue placeholder="상태 컬럼 선택" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value=""> </SelectItem> <SelectItem value="__none__"> </SelectItem>
{columns.map((col) => ( {columns.map((col) => (
<SelectItem key={col.column_name} value={col.column_name}> <SelectItem key={col.column_name} value={col.column_name}>
{col.column_name} ({col.data_type}) {col.column_name} ({col.data_type})

View File

@ -0,0 +1,674 @@
"use client";
import React, { useState, useEffect, useCallback } from "react";
import {
DndContext,
closestCenter,
KeyboardSensor,
PointerSensor,
useSensor,
useSensors,
type DragEndEvent,
} from "@dnd-kit/core";
import {
arrayMove,
SortableContext,
sortableKeyboardCoordinates,
verticalListSortingStrategy,
useSortable,
} from "@dnd-kit/sortable";
import { CSS } from "@dnd-kit/utilities";
import { Plus, GripVertical, Settings, X, Check, ChevronsUpDown } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@/components/ui/command";
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import { apiClient } from "@/lib/api/client";
import type { ActionButtonConfig, ModalParamMapping, ColumnConfig } from "./types";
interface ScreenInfo {
screen_id: number;
screen_name: string;
screen_code: string;
}
// 정렬 가능한 버튼 아이템
const SortableButtonItem: React.FC<{
id: string;
button: ActionButtonConfig;
index: number;
onSettingsClick: () => void;
onRemove: () => void;
}> = ({ id, button, index, onSettingsClick, onRemove }) => {
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id });
const style = {
transform: CSS.Transform.toString(transform),
transition,
};
const getVariantColor = (variant?: string) => {
switch (variant) {
case "destructive":
return "bg-destructive/10 text-destructive";
case "outline":
return "bg-background border";
case "ghost":
return "bg-muted/50";
case "secondary":
return "bg-secondary text-secondary-foreground";
default:
return "bg-primary/10 text-primary";
}
};
const getActionLabel = (action?: string) => {
switch (action) {
case "add":
return "추가";
case "edit":
return "수정";
case "delete":
return "삭제";
case "bulk-delete":
return "일괄삭제";
case "api":
return "API";
case "custom":
return "커스텀";
default:
return "추가";
}
};
return (
<div
ref={setNodeRef}
style={style}
className={cn("flex items-center gap-2 rounded-md border bg-card p-3", isDragging && "opacity-50 shadow-lg")}
>
{/* 드래그 핸들 */}
<div {...attributes} {...listeners} className="cursor-grab touch-none text-muted-foreground hover:text-foreground">
<GripVertical className="h-4 w-4" />
</div>
{/* 버튼 정보 */}
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2">
<span className={cn("px-2 py-0.5 rounded text-xs font-medium", getVariantColor(button.variant))}>
{button.label || `버튼 ${index + 1}`}
</span>
</div>
<div className="flex flex-wrap gap-1 mt-1">
<Badge variant="outline" className="text-[10px] h-4">
{getActionLabel(button.action)}
</Badge>
{button.icon && (
<Badge variant="secondary" className="text-[10px] h-4">
{button.icon}
</Badge>
)}
{button.showCondition && button.showCondition !== "always" && (
<Badge variant="secondary" className="text-[10px] h-4">
{button.showCondition === "selected" ? "선택시만" : "미선택시만"}
</Badge>
)}
</div>
</div>
{/* 액션 버튼들 */}
<div className="flex items-center gap-1 shrink-0">
<Button size="sm" variant="ghost" className="h-7 w-7 p-0" onClick={onSettingsClick} title="세부설정">
<Settings className="h-3.5 w-3.5" />
</Button>
<Button
size="sm"
variant="ghost"
className="h-7 w-7 p-0 text-destructive hover:text-destructive"
onClick={onRemove}
title="삭제"
>
<X className="h-3.5 w-3.5" />
</Button>
</div>
</div>
);
};
interface ActionButtonConfigModalProps {
open: boolean;
onOpenChange: (open: boolean) => void;
actionButtons: ActionButtonConfig[];
displayColumns?: ColumnConfig[]; // 모달 파라미터 매핑용
onSave: (buttons: ActionButtonConfig[]) => void;
side: "left" | "right";
}
export const ActionButtonConfigModal: React.FC<ActionButtonConfigModalProps> = ({
open,
onOpenChange,
actionButtons: initialButtons,
displayColumns = [],
onSave,
side,
}) => {
// 로컬 상태
const [buttons, setButtons] = useState<ActionButtonConfig[]>([]);
// 버튼 세부설정 모달
const [detailModalOpen, setDetailModalOpen] = useState(false);
const [editingButtonIndex, setEditingButtonIndex] = useState<number | null>(null);
const [editingButton, setEditingButton] = useState<ActionButtonConfig | null>(null);
// 화면 목록
const [screens, setScreens] = useState<ScreenInfo[]>([]);
const [screensLoading, setScreensLoading] = useState(false);
const [screenSelectOpen, setScreenSelectOpen] = useState(false);
// 드래그 센서
const sensors = useSensors(
useSensor(PointerSensor, {
activationConstraint: {
distance: 8,
},
}),
useSensor(KeyboardSensor, {
coordinateGetter: sortableKeyboardCoordinates,
})
);
// 초기값 설정
useEffect(() => {
if (open) {
setButtons(initialButtons || []);
}
}, [open, initialButtons]);
// 화면 목록 로드
const loadScreens = useCallback(async () => {
setScreensLoading(true);
try {
const response = await apiClient.get("/screen-management/screens?size=1000");
let screenList: any[] = [];
if (response.data?.success && Array.isArray(response.data?.data)) {
screenList = response.data.data;
} else if (Array.isArray(response.data?.data)) {
screenList = response.data.data;
}
const transformedScreens = screenList.map((s: any) => ({
screen_id: s.screenId ?? s.screen_id ?? s.id,
screen_name: s.screenName ?? s.screen_name ?? s.name ?? `화면 ${s.screenId || s.screen_id || s.id}`,
screen_code: s.screenCode ?? s.screen_code ?? s.code ?? "",
}));
setScreens(transformedScreens);
} catch (error) {
console.error("화면 목록 로드 실패:", error);
setScreens([]);
} finally {
setScreensLoading(false);
}
}, []);
useEffect(() => {
if (open) {
loadScreens();
}
}, [open, loadScreens]);
// 드래그 종료 핸들러
const handleDragEnd = (event: DragEndEvent) => {
const { active, over } = event;
if (over && active.id !== over.id) {
const oldIndex = buttons.findIndex((btn) => btn.id === active.id);
const newIndex = buttons.findIndex((btn) => btn.id === over.id);
if (oldIndex !== -1 && newIndex !== -1) {
setButtons(arrayMove(buttons, oldIndex, newIndex));
}
}
};
// 버튼 추가
const handleAddButton = () => {
const newButton: ActionButtonConfig = {
id: `btn-${Date.now()}`,
label: "새 버튼",
variant: "default",
action: "add",
showCondition: "always",
};
setButtons([...buttons, newButton]);
};
// 버튼 삭제
const handleRemoveButton = (index: number) => {
setButtons(buttons.filter((_, i) => i !== index));
};
// 버튼 업데이트
const handleUpdateButton = (index: number, updates: Partial<ActionButtonConfig>) => {
const newButtons = [...buttons];
newButtons[index] = { ...newButtons[index], ...updates };
setButtons(newButtons);
};
// 버튼 세부설정 열기
const handleOpenDetailSettings = (index: number) => {
setEditingButtonIndex(index);
setEditingButton({ ...buttons[index] });
setDetailModalOpen(true);
};
// 버튼 세부설정 저장
const handleSaveDetailSettings = () => {
if (editingButtonIndex !== null && editingButton) {
handleUpdateButton(editingButtonIndex, editingButton);
}
setDetailModalOpen(false);
setEditingButtonIndex(null);
setEditingButton(null);
};
// 저장
const handleSave = () => {
onSave(buttons);
onOpenChange(false);
};
// 선택된 화면 정보
const getScreenInfo = (screenId?: number) => {
return screens.find((s) => s.screen_id === screenId);
};
return (
<>
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="max-w-[95vw] sm:max-w-[600px] max-h-[90vh] flex flex-col">
<DialogHeader>
<DialogTitle>
{side === "left" ? "좌측" : "우측"}
</DialogTitle>
<DialogDescription>
.
</DialogDescription>
</DialogHeader>
<div className="flex-1 overflow-hidden flex flex-col">
<div className="flex items-center justify-between mb-3">
<Label className="text-sm font-medium">
({buttons.length})
</Label>
<Button size="sm" variant="outline" onClick={handleAddButton}>
<Plus className="mr-1 h-4 w-4" />
</Button>
</div>
<ScrollArea className="flex-1 pr-4">
{buttons.length === 0 ? (
<div className="flex flex-col items-center justify-center py-12 text-center">
<p className="text-muted-foreground text-sm mb-2">
</p>
<Button size="sm" variant="outline" onClick={handleAddButton}>
<Plus className="mr-1 h-4 w-4" />
</Button>
</div>
) : (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleDragEnd}
>
<SortableContext
items={buttons.map((btn) => btn.id)}
strategy={verticalListSortingStrategy}
>
<div className="space-y-2">
{buttons.map((btn, index) => (
<SortableButtonItem
key={btn.id}
id={btn.id}
button={btn}
index={index}
onSettingsClick={() => handleOpenDetailSettings(index)}
onRemove={() => handleRemoveButton(index)}
/>
))}
</div>
</SortableContext>
</DndContext>
)}
</ScrollArea>
</div>
<DialogFooter className="mt-4">
<Button variant="outline" onClick={() => onOpenChange(false)}>
</Button>
<Button onClick={handleSave}></Button>
</DialogFooter>
</DialogContent>
</Dialog>
{/* 버튼 세부설정 모달 */}
<Dialog open={detailModalOpen} onOpenChange={setDetailModalOpen}>
<DialogContent className="max-w-[95vw] sm:max-w-[500px] max-h-[85vh]">
<DialogHeader>
<DialogTitle> </DialogTitle>
<DialogDescription>
{editingButton?.label || "버튼"} .
</DialogDescription>
</DialogHeader>
{editingButton && (
<ScrollArea className="max-h-[60vh]">
<div className="space-y-4 pr-4">
{/* 기본 설정 */}
<div className="space-y-3 p-3 border rounded-lg">
<h4 className="text-sm font-medium"> </h4>
<div>
<Label className="text-xs"> </Label>
<Input
value={editingButton.label}
onChange={(e) =>
setEditingButton({ ...editingButton, label: e.target.value })
}
placeholder="버튼 라벨"
className="mt-1 h-9"
/>
</div>
<div>
<Label className="text-xs"> </Label>
<Select
value={editingButton.variant || "default"}
onValueChange={(value) =>
setEditingButton({
...editingButton,
variant: value as ActionButtonConfig["variant"],
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="default"> (Primary)</SelectItem>
<SelectItem value="secondary"> (Secondary)</SelectItem>
<SelectItem value="outline"></SelectItem>
<SelectItem value="ghost"></SelectItem>
<SelectItem value="destructive"> ()</SelectItem>
</SelectContent>
</Select>
</div>
<div>
<Label className="text-xs"></Label>
<Select
value={editingButton.icon || "none"}
onValueChange={(value) =>
setEditingButton({
...editingButton,
icon: value === "none" ? undefined : value,
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="none"></SelectItem>
<SelectItem value="Plus">+ ()</SelectItem>
<SelectItem value="Edit"></SelectItem>
<SelectItem value="Trash2"></SelectItem>
<SelectItem value="Download"></SelectItem>
<SelectItem value="Upload"></SelectItem>
<SelectItem value="RefreshCw"></SelectItem>
</SelectContent>
</Select>
</div>
<div>
<Label className="text-xs"> </Label>
<Select
value={editingButton.showCondition || "always"}
onValueChange={(value) =>
setEditingButton({
...editingButton,
showCondition: value as ActionButtonConfig["showCondition"],
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="always"> </SelectItem>
<SelectItem value="selected"> </SelectItem>
<SelectItem value="notSelected"> </SelectItem>
</SelectContent>
</Select>
</div>
</div>
{/* 동작 설정 */}
<div className="space-y-3 p-3 border rounded-lg">
<h4 className="text-sm font-medium"> </h4>
<div>
<Label className="text-xs"> </Label>
<Select
value={editingButton.action || "add"}
onValueChange={(value) =>
setEditingButton({
...editingButton,
action: value as ActionButtonConfig["action"],
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="add"> ( )</SelectItem>
<SelectItem value="edit"> ( )</SelectItem>
<SelectItem value="delete"> ( )</SelectItem>
<SelectItem value="bulk-delete"> ( )</SelectItem>
<SelectItem value="api">API </SelectItem>
<SelectItem value="custom"> </SelectItem>
</SelectContent>
</Select>
</div>
{/* 모달 설정 (add, edit 액션) */}
{(editingButton.action === "add" || editingButton.action === "edit") && (
<div>
<Label className="text-xs"> </Label>
<Popover open={screenSelectOpen} onOpenChange={setScreenSelectOpen}>
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
className="mt-1 h-9 w-full justify-between"
disabled={screensLoading}
>
{screensLoading
? "로딩 중..."
: editingButton.modalScreenId
? getScreenInfo(editingButton.modalScreenId)?.screen_name ||
`화면 ${editingButton.modalScreenId}`
: "화면 선택"}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="w-full p-0" align="start">
<Command>
<CommandInput placeholder="화면 검색..." className="h-9" />
<CommandList>
<CommandEmpty> </CommandEmpty>
<CommandGroup>
{screens.map((screen) => (
<CommandItem
key={screen.screen_id}
value={`${screen.screen_id}-${screen.screen_name}`}
onSelect={() => {
setEditingButton({
...editingButton,
modalScreenId: screen.screen_id,
});
setScreenSelectOpen(false);
}}
>
<Check
className={cn(
"mr-2 h-4 w-4",
editingButton.modalScreenId === screen.screen_id
? "opacity-100"
: "opacity-0"
)}
/>
<span className="flex flex-col">
<span>{screen.screen_name}</span>
<span className="text-xs text-muted-foreground">
{screen.screen_code}
</span>
</span>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
</div>
)}
{/* API 설정 */}
{editingButton.action === "api" && (
<>
<div>
<Label className="text-xs">API </Label>
<Input
value={editingButton.apiEndpoint || ""}
onChange={(e) =>
setEditingButton({
...editingButton,
apiEndpoint: e.target.value,
})
}
placeholder="/api/example"
className="mt-1 h-9"
/>
</div>
<div>
<Label className="text-xs">HTTP </Label>
<Select
value={editingButton.apiMethod || "POST"}
onValueChange={(value) =>
setEditingButton({
...editingButton,
apiMethod: value as ActionButtonConfig["apiMethod"],
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="GET">GET</SelectItem>
<SelectItem value="POST">POST</SelectItem>
<SelectItem value="PUT">PUT</SelectItem>
<SelectItem value="DELETE">DELETE</SelectItem>
</SelectContent>
</Select>
</div>
</>
)}
{/* 확인 메시지 (삭제 계열) */}
{(editingButton.action === "delete" ||
editingButton.action === "bulk-delete" ||
(editingButton.action === "api" && editingButton.apiMethod === "DELETE")) && (
<div>
<Label className="text-xs"> </Label>
<Input
value={editingButton.confirmMessage || ""}
onChange={(e) =>
setEditingButton({
...editingButton,
confirmMessage: e.target.value,
})
}
placeholder="정말 삭제하시겠습니까?"
className="mt-1 h-9"
/>
</div>
)}
{/* 커스텀 액션 ID */}
{editingButton.action === "custom" && (
<div>
<Label className="text-xs"> ID</Label>
<Input
value={editingButton.customActionId || ""}
onChange={(e) =>
setEditingButton({
...editingButton,
customActionId: e.target.value,
})
}
placeholder="customAction1"
className="mt-1 h-9"
/>
<p className="text-xs text-muted-foreground mt-1">
ID로
</p>
</div>
)}
</div>
</div>
</ScrollArea>
)}
<DialogFooter>
<Button variant="outline" onClick={() => setDetailModalOpen(false)}>
</Button>
<Button onClick={handleSaveDetailSettings}></Button>
</DialogFooter>
</DialogContent>
</Dialog>
</>
);
};
export default ActionButtonConfigModal;

View File

@ -0,0 +1,805 @@
"use client";
import React, { useState, useEffect, useCallback } from "react";
import {
DndContext,
closestCenter,
KeyboardSensor,
PointerSensor,
useSensor,
useSensors,
type DragEndEvent,
} from "@dnd-kit/core";
import {
arrayMove,
SortableContext,
sortableKeyboardCoordinates,
verticalListSortingStrategy,
} from "@dnd-kit/sortable";
import { Plus, Settings2 } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
import { Input } from "@/components/ui/input";
import { Switch } from "@/components/ui/switch";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { cn } from "@/lib/utils";
import { apiClient } from "@/lib/api/client";
import { entityJoinApi } from "@/lib/api/entityJoin";
import { Checkbox } from "@/components/ui/checkbox";
import type { ColumnConfig, SearchColumnConfig, GroupingConfig, ColumnDisplayConfig, EntityReferenceConfig } from "./types";
import { SortableColumnItem } from "./components/SortableColumnItem";
import { SearchableColumnSelect } from "./components/SearchableColumnSelect";
interface ColumnInfo {
column_name: string;
data_type: string;
column_comment?: string;
input_type?: string;
web_type?: string;
reference_table?: string;
reference_column?: string;
}
// 참조 테이블 컬럼 정보
interface ReferenceColumnInfo {
columnName: string;
displayName: string;
dataType: string;
}
interface ColumnConfigModalProps {
open: boolean;
onOpenChange: (open: boolean) => void;
tableName: string;
displayColumns: ColumnConfig[];
searchColumns?: SearchColumnConfig[];
grouping?: GroupingConfig;
showSearch?: boolean;
onSave: (config: {
displayColumns: ColumnConfig[];
searchColumns: SearchColumnConfig[];
grouping: GroupingConfig;
showSearch: boolean;
}) => void;
side: "left" | "right"; // 좌측/우측 패널 구분
}
export const ColumnConfigModal: React.FC<ColumnConfigModalProps> = ({
open,
onOpenChange,
tableName,
displayColumns: initialDisplayColumns,
searchColumns: initialSearchColumns,
grouping: initialGrouping,
showSearch: initialShowSearch,
onSave,
side,
}) => {
// 로컬 상태 (모달 내에서만 사용, 저장 시 부모로 전달)
const [displayColumns, setDisplayColumns] = useState<ColumnConfig[]>([]);
const [searchColumns, setSearchColumns] = useState<SearchColumnConfig[]>([]);
const [grouping, setGrouping] = useState<GroupingConfig>({ enabled: false, groupByColumn: "" });
const [showSearch, setShowSearch] = useState(false);
// 컬럼 세부설정 모달
const [detailModalOpen, setDetailModalOpen] = useState(false);
const [editingColumnIndex, setEditingColumnIndex] = useState<number | null>(null);
const [editingColumn, setEditingColumn] = useState<ColumnConfig | null>(null);
// 테이블 컬럼 목록
const [columns, setColumns] = useState<ColumnInfo[]>([]);
const [columnsLoading, setColumnsLoading] = useState(false);
// 엔티티 참조 관련 상태
const [entityReferenceColumns, setEntityReferenceColumns] = useState<Map<string, ReferenceColumnInfo[]>>(new Map());
const [loadingEntityColumns, setLoadingEntityColumns] = useState<Set<string>>(new Set());
// 드래그 센서
const sensors = useSensors(
useSensor(PointerSensor, {
activationConstraint: {
distance: 8,
},
}),
useSensor(KeyboardSensor, {
coordinateGetter: sortableKeyboardCoordinates,
})
);
// 초기값 설정
useEffect(() => {
if (open) {
setDisplayColumns(initialDisplayColumns || []);
setSearchColumns(initialSearchColumns || []);
setGrouping(initialGrouping || { enabled: false, groupByColumn: "" });
setShowSearch(initialShowSearch || false);
}
}, [open, initialDisplayColumns, initialSearchColumns, initialGrouping, initialShowSearch]);
// 테이블 컬럼 로드 (entity 타입 정보 포함)
const loadColumns = useCallback(async () => {
if (!tableName) {
setColumns([]);
return;
}
setColumnsLoading(true);
try {
const response = await apiClient.get(`/table-management/tables/${tableName}/columns?size=200`);
let columnList: any[] = [];
if (response.data?.success && response.data?.data?.columns) {
columnList = response.data.data.columns;
} else if (Array.isArray(response.data?.data?.columns)) {
columnList = response.data.data.columns;
} else if (Array.isArray(response.data?.data)) {
columnList = response.data.data;
}
// entity 타입 정보를 포함하여 변환
const transformedColumns = columnList.map((c: any) => ({
column_name: c.columnName ?? c.column_name ?? c.name ?? "",
data_type: c.dataType ?? c.data_type ?? c.type ?? "",
column_comment: c.displayName ?? c.column_comment ?? c.label ?? "",
input_type: c.inputType ?? c.input_type ?? "",
web_type: c.webType ?? c.web_type ?? "",
reference_table: c.referenceTable ?? c.reference_table ?? "",
reference_column: c.referenceColumn ?? c.reference_column ?? "",
}));
setColumns(transformedColumns);
} catch (error) {
console.error("컬럼 목록 로드 실패:", error);
setColumns([]);
} finally {
setColumnsLoading(false);
}
}, [tableName]);
// 엔티티 참조 테이블의 컬럼 목록 로드
const loadEntityReferenceColumns = useCallback(async (columnName: string, referenceTable: string) => {
if (!referenceTable || entityReferenceColumns.has(columnName)) {
return;
}
setLoadingEntityColumns(prev => new Set(prev).add(columnName));
try {
const result = await entityJoinApi.getReferenceTableColumns(referenceTable);
if (result?.columns) {
setEntityReferenceColumns(prev => {
const newMap = new Map(prev);
newMap.set(columnName, result.columns);
return newMap;
});
}
} catch (error) {
console.error(`엔티티 참조 컬럼 로드 실패 (${referenceTable}):`, error);
} finally {
setLoadingEntityColumns(prev => {
const newSet = new Set(prev);
newSet.delete(columnName);
return newSet;
});
}
}, [entityReferenceColumns]);
useEffect(() => {
if (open && tableName) {
loadColumns();
}
}, [open, tableName, loadColumns]);
// 드래그 종료 핸들러
const handleDragEnd = (event: DragEndEvent) => {
const { active, over } = event;
if (over && active.id !== over.id) {
const oldIndex = displayColumns.findIndex((col, idx) => `col-${idx}` === active.id);
const newIndex = displayColumns.findIndex((col, idx) => `col-${idx}` === over.id);
if (oldIndex !== -1 && newIndex !== -1) {
setDisplayColumns(arrayMove(displayColumns, oldIndex, newIndex));
}
}
};
// 컬럼 추가
const handleAddColumn = () => {
setDisplayColumns([
...displayColumns,
{
name: "",
label: "",
displayRow: side === "left" ? "name" : "info",
sourceTable: tableName,
},
]);
};
// 컬럼 삭제
const handleRemoveColumn = (index: number) => {
setDisplayColumns(displayColumns.filter((_, i) => i !== index));
};
// 컬럼 업데이트 (entity 타입이면 참조 테이블 컬럼도 로드)
const handleUpdateColumn = (index: number, updates: Partial<ColumnConfig>) => {
const newColumns = [...displayColumns];
newColumns[index] = { ...newColumns[index], ...updates };
setDisplayColumns(newColumns);
// 컬럼명이 변경된 경우 entity 타입인지 확인하고 참조 테이블 컬럼 로드
if (updates.name) {
const columnInfo = columns.find(c => c.column_name === updates.name);
if (columnInfo && (columnInfo.input_type === 'entity' || columnInfo.web_type === 'entity')) {
if (columnInfo.reference_table) {
loadEntityReferenceColumns(updates.name, columnInfo.reference_table);
}
}
}
};
// 컬럼 세부설정 열기 (entity 타입이면 참조 테이블 컬럼도 로드)
const handleOpenDetailSettings = (index: number) => {
const column = displayColumns[index];
setEditingColumnIndex(index);
setEditingColumn({ ...column });
setDetailModalOpen(true);
// entity 타입인지 확인하고 참조 테이블 컬럼 로드
if (column.name) {
const columnInfo = columns.find(c => c.column_name === column.name);
if (columnInfo && (columnInfo.input_type === 'entity' || columnInfo.web_type === 'entity')) {
if (columnInfo.reference_table) {
loadEntityReferenceColumns(column.name, columnInfo.reference_table);
}
}
}
};
// 컬럼 세부설정 저장
const handleSaveDetailSettings = () => {
if (editingColumnIndex !== null && editingColumn) {
handleUpdateColumn(editingColumnIndex, editingColumn);
}
setDetailModalOpen(false);
setEditingColumnIndex(null);
setEditingColumn(null);
};
// 검색 컬럼 추가
const handleAddSearchColumn = () => {
setSearchColumns([...searchColumns, { columnName: "", label: "" }]);
};
// 검색 컬럼 삭제
const handleRemoveSearchColumn = (index: number) => {
setSearchColumns(searchColumns.filter((_, i) => i !== index));
};
// 검색 컬럼 업데이트
const handleUpdateSearchColumn = (index: number, columnName: string) => {
const newColumns = [...searchColumns];
newColumns[index] = { ...newColumns[index], columnName };
setSearchColumns(newColumns);
};
// 저장
const handleSave = () => {
onSave({
displayColumns,
searchColumns,
grouping,
showSearch,
});
onOpenChange(false);
};
// 엔티티 표시 컬럼 토글
const toggleEntityDisplayColumn = (selectedColumn: string) => {
if (!editingColumn) return;
const currentDisplayColumns = editingColumn.entityReference?.displayColumns || [];
const newDisplayColumns = currentDisplayColumns.includes(selectedColumn)
? currentDisplayColumns.filter(col => col !== selectedColumn)
: [...currentDisplayColumns, selectedColumn];
setEditingColumn({
...editingColumn,
entityReference: {
...editingColumn.entityReference,
displayColumns: newDisplayColumns,
} as EntityReferenceConfig,
});
};
// 현재 편집 중인 컬럼이 entity 타입인지 확인
const getEditingColumnEntityInfo = useCallback(() => {
if (!editingColumn?.name) return null;
const columnInfo = columns.find(c => c.column_name === editingColumn.name);
if (!columnInfo) return null;
if (columnInfo.input_type !== 'entity' && columnInfo.web_type !== 'entity') return null;
return {
referenceTable: columnInfo.reference_table || '',
referenceColumns: entityReferenceColumns.get(editingColumn.name) || [],
isLoading: loadingEntityColumns.has(editingColumn.name),
};
}, [editingColumn, columns, entityReferenceColumns, loadingEntityColumns]);
// 이미 선택된 컬럼명 목록 (중복 선택 방지용)
const selectedColumnNames = displayColumns.map((col) => col.name).filter(Boolean);
return (
<>
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="flex h-[80vh] max-w-[95vw] flex-col overflow-hidden sm:max-w-[700px]">
<DialogHeader className="shrink-0">
<DialogTitle className="flex items-center gap-2">
<Settings2 className="h-5 w-5" />
{side === "left" ? "좌측" : "우측"}
</DialogTitle>
<DialogDescription>
.
</DialogDescription>
</DialogHeader>
<Tabs defaultValue="columns" className="flex min-h-0 flex-1 flex-col overflow-hidden">
<TabsList className="grid w-full shrink-0 grid-cols-3">
<TabsTrigger value="columns"> </TabsTrigger>
<TabsTrigger value="grouping" disabled={side === "right"}>
</TabsTrigger>
<TabsTrigger value="search"></TabsTrigger>
</TabsList>
{/* 표시 컬럼 탭 */}
<TabsContent value="columns" className="mt-4 flex min-h-0 flex-1 flex-col overflow-hidden data-[state=inactive]:hidden">
<div className="flex shrink-0 items-center justify-between mb-3">
<Label className="text-sm font-medium">
({displayColumns.length})
</Label>
<Button size="sm" variant="outline" onClick={handleAddColumn}>
<Plus className="mr-1 h-4 w-4" />
</Button>
</div>
<ScrollArea className="min-h-0 flex-1">
<div className="pr-4">
{displayColumns.length === 0 ? (
<div className="flex flex-col items-center justify-center py-12 text-center">
<p className="text-muted-foreground text-sm mb-2">
</p>
<Button size="sm" variant="outline" onClick={handleAddColumn}>
<Plus className="mr-1 h-4 w-4" />
</Button>
</div>
) : (
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleDragEnd}
>
<SortableContext
items={displayColumns.map((_, idx) => `col-${idx}`)}
strategy={verticalListSortingStrategy}
>
<div className="space-y-2">
{displayColumns.map((col, index) => (
<div key={`col-${index}`} className="space-y-2">
<SortableColumnItem
id={`col-${index}`}
column={col}
index={index}
onSettingsClick={() => handleOpenDetailSettings(index)}
onRemove={() => handleRemoveColumn(index)}
showGroupingSettings={grouping.enabled}
/>
{/* 컬럼 빠른 선택 (인라인) */}
{!col.name && (
<div className="ml-6 pl-2 border-l-2 border-muted">
<SearchableColumnSelect
tableName={tableName}
value={col.name}
onValueChange={(value) => {
const colInfo = columns.find((c) => c.column_name === value);
handleUpdateColumn(index, {
name: value,
label: colInfo?.column_comment || "",
});
}}
excludeColumns={selectedColumnNames}
placeholder="컬럼을 선택하세요"
/>
</div>
)}
</div>
))}
</div>
</SortableContext>
</DndContext>
)}
</div>
</ScrollArea>
</TabsContent>
{/* 그룹핑 탭 (좌측 패널만) */}
<TabsContent value="grouping" className="mt-4 flex min-h-0 flex-1 flex-col overflow-hidden data-[state=inactive]:hidden">
<ScrollArea className="min-h-0 flex-1">
<div className="space-y-4 pr-4">
<div className="flex items-center justify-between rounded-lg border p-4">
<div>
<Label className="text-sm font-medium"> </Label>
<p className="text-xs text-muted-foreground mt-1">
</p>
</div>
<Switch
checked={grouping.enabled}
onCheckedChange={(checked) =>
setGrouping({ ...grouping, enabled: checked })
}
/>
</div>
{grouping.enabled && (
<div className="space-y-3 p-4 border rounded-lg bg-muted/30">
<div>
<Label className="text-sm"> </Label>
<SearchableColumnSelect
tableName={tableName}
value={grouping.groupByColumn}
onValueChange={(value) =>
setGrouping({ ...grouping, groupByColumn: value })
}
placeholder="그룹 기준 컬럼 선택"
className="mt-1"
/>
<p className="text-xs text-muted-foreground mt-1">
: item_id로
</p>
</div>
</div>
)}
</div>
</ScrollArea>
</TabsContent>
{/* 검색 탭 */}
<TabsContent value="search" className="mt-4 flex min-h-0 flex-1 flex-col overflow-hidden data-[state=inactive]:hidden">
<ScrollArea className="min-h-0 flex-1">
<div className="space-y-4 pr-4">
<div className="flex items-center justify-between rounded-lg border p-4">
<div>
<Label className="text-sm font-medium"> </Label>
<p className="text-xs text-muted-foreground mt-1">
</p>
</div>
<Switch checked={showSearch} onCheckedChange={setShowSearch} />
</div>
{showSearch && (
<div className="space-y-3 p-4 border rounded-lg bg-muted/30">
<div className="flex items-center justify-between">
<Label className="text-sm"> </Label>
<Button size="sm" variant="ghost" onClick={handleAddSearchColumn}>
<Plus className="mr-1 h-3 w-3" />
</Button>
</div>
{searchColumns.length === 0 ? (
<div className="text-center py-4 text-muted-foreground text-sm border rounded-md">
</div>
) : (
<div className="space-y-2">
{searchColumns.map((searchCol, index) => (
<div key={index} className="flex items-center gap-2">
<SearchableColumnSelect
tableName={tableName}
value={searchCol.columnName}
onValueChange={(value) => handleUpdateSearchColumn(index, value)}
placeholder="검색 컬럼 선택"
className="flex-1"
/>
<Button
size="sm"
variant="ghost"
className="h-9 w-9 p-0 text-destructive"
onClick={() => handleRemoveSearchColumn(index)}
>
×
</Button>
</div>
))}
</div>
)}
</div>
)}
</div>
</ScrollArea>
</TabsContent>
</Tabs>
<DialogFooter className="mt-4 shrink-0">
<Button variant="outline" onClick={() => onOpenChange(false)}>
</Button>
<Button onClick={handleSave}></Button>
</DialogFooter>
</DialogContent>
</Dialog>
{/* 컬럼 세부설정 모달 */}
<Dialog open={detailModalOpen} onOpenChange={setDetailModalOpen}>
<DialogContent className="max-w-[95vw] sm:max-w-[500px]">
<DialogHeader>
<DialogTitle> </DialogTitle>
<DialogDescription>
{editingColumn?.label || editingColumn?.name || "컬럼"} .
</DialogDescription>
</DialogHeader>
{editingColumn && (
<div className="space-y-4">
{/* 기본 설정 */}
<div className="space-y-3 p-3 border rounded-lg">
<h4 className="text-sm font-medium"> </h4>
<div>
<Label className="text-xs"> </Label>
<SearchableColumnSelect
tableName={tableName}
value={editingColumn.name}
onValueChange={(value) => {
const colInfo = columns.find((c) => c.column_name === value);
setEditingColumn({
...editingColumn,
name: value,
label: colInfo?.column_comment || editingColumn.label,
});
}}
className="mt-1"
/>
</div>
<div>
<Label className="text-xs"> </Label>
<Input
value={editingColumn.label || ""}
onChange={(e) =>
setEditingColumn({ ...editingColumn, label: e.target.value })
}
placeholder="라벨명 (미입력 시 컬럼명 사용)"
className="mt-1 h-9"
/>
</div>
<div>
<Label className="text-xs"> </Label>
<Select
value={editingColumn.displayRow || "name"}
onValueChange={(value: "name" | "info") =>
setEditingColumn({ ...editingColumn, displayRow: value })
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="name"> (Name Row)</SelectItem>
<SelectItem value="info"> (Info Row)</SelectItem>
</SelectContent>
</Select>
</div>
<div>
<Label className="text-xs"> (px)</Label>
<Input
type="number"
value={editingColumn.width || ""}
onChange={(e) =>
setEditingColumn({
...editingColumn,
width: e.target.value ? parseInt(e.target.value) : undefined,
})
}
placeholder="자동"
className="mt-1 h-9"
/>
</div>
</div>
{/* 그룹핑/집계 설정 (그룹핑 활성화 시만) */}
{grouping.enabled && (
<div className="space-y-3 p-3 border rounded-lg">
<h4 className="text-sm font-medium">/ </h4>
<div>
<Label className="text-xs"> </Label>
<Select
value={editingColumn.displayConfig?.displayType || "text"}
onValueChange={(value: "text" | "badge") =>
setEditingColumn({
...editingColumn,
displayConfig: {
...editingColumn.displayConfig,
displayType: value,
} as ColumnDisplayConfig,
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="text"> ()</SelectItem>
<SelectItem value="badge"> ( )</SelectItem>
</SelectContent>
</Select>
<p className="text-xs text-muted-foreground mt-1">
</p>
</div>
<div className="flex items-center justify-between">
<div>
<Label className="text-xs"> </Label>
<p className="text-[10px] text-muted-foreground">
</p>
</div>
<Switch
checked={editingColumn.displayConfig?.aggregate?.enabled || false}
onCheckedChange={(checked) =>
setEditingColumn({
...editingColumn,
displayConfig: {
displayType: editingColumn.displayConfig?.displayType || "text",
aggregate: {
enabled: checked,
function: editingColumn.displayConfig?.aggregate?.function || "DISTINCT",
},
},
})
}
/>
</div>
{editingColumn.displayConfig?.aggregate?.enabled && (
<div>
<Label className="text-xs"> </Label>
<Select
value={editingColumn.displayConfig?.aggregate?.function || "DISTINCT"}
onValueChange={(value: "DISTINCT" | "COUNT") =>
setEditingColumn({
...editingColumn,
displayConfig: {
displayType: editingColumn.displayConfig?.displayType || "text",
aggregate: {
enabled: true,
function: value,
},
},
})
}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="DISTINCT"> ()</SelectItem>
<SelectItem value="COUNT"></SelectItem>
</SelectContent>
</Select>
</div>
)}
</div>
)}
{/* 엔티티 참조 설정 (entity 타입 컬럼일 때만 표시) */}
{(() => {
const entityInfo = getEditingColumnEntityInfo();
if (!entityInfo) return null;
return (
<div className="space-y-3 p-3 border rounded-lg">
<h4 className="text-sm font-medium"> </h4>
<p className="text-xs text-muted-foreground">
: <span className="font-medium">{entityInfo.referenceTable}</span>
</p>
{entityInfo.isLoading ? (
<div className="flex items-center justify-center py-4">
<span className="text-sm text-muted-foreground"> ...</span>
</div>
) : entityInfo.referenceColumns.length === 0 ? (
<div className="text-center py-4 text-muted-foreground text-sm border rounded-md">
</div>
) : (
<ScrollArea className="max-h-40">
<div className="space-y-2 pr-4">
{entityInfo.referenceColumns.map((col) => {
const isSelected = (editingColumn.entityReference?.displayColumns || []).includes(col.columnName);
return (
<div
key={col.columnName}
className={cn(
"flex items-center gap-2 p-2 rounded-md cursor-pointer hover:bg-muted/50 transition-colors",
isSelected && "bg-muted"
)}
onClick={() => toggleEntityDisplayColumn(col.columnName)}
>
<Checkbox
checked={isSelected}
onCheckedChange={() => toggleEntityDisplayColumn(col.columnName)}
/>
<div className="flex-1 min-w-0">
<span className="text-sm font-medium truncate block">
{col.displayName || col.columnName}
</span>
<span className="text-xs text-muted-foreground truncate block">
{col.columnName} ({col.dataType})
</span>
</div>
</div>
);
})}
</div>
</ScrollArea>
)}
{(editingColumn.entityReference?.displayColumns || []).length > 0 && (
<div className="mt-2 pt-2 border-t">
<p className="text-xs text-muted-foreground mb-1">
: {(editingColumn.entityReference?.displayColumns || []).length}
</p>
<div className="flex flex-wrap gap-1">
{(editingColumn.entityReference?.displayColumns || []).map((colName) => {
const colInfo = entityInfo.referenceColumns.find(c => c.columnName === colName);
return (
<span
key={colName}
className="inline-flex items-center px-2 py-0.5 rounded-full text-xs bg-primary/10 text-primary"
>
{colInfo?.displayName || colName}
</span>
);
})}
</div>
</div>
)}
</div>
);
})()}
</div>
)}
<DialogFooter>
<Button variant="outline" onClick={() => setDetailModalOpen(false)}>
</Button>
<Button onClick={handleSaveDetailSettings}></Button>
</DialogFooter>
</DialogContent>
</Dialog>
</>
);
};
export default ColumnConfigModal;

View File

@ -0,0 +1,423 @@
"use client";
import React, { useState, useEffect } from "react";
import { Plus, X, Settings, ArrowRight } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ScrollArea } from "@/components/ui/scroll-area";
import { Badge } from "@/components/ui/badge";
import type { DataTransferField } from "./types";
interface ColumnInfo {
column_name: string;
column_comment?: string;
data_type?: string;
}
interface DataTransferConfigModalProps {
open: boolean;
onOpenChange: (open: boolean) => void;
dataTransferFields: DataTransferField[];
onChange: (fields: DataTransferField[]) => void;
leftColumns: ColumnInfo[];
rightColumns: ColumnInfo[];
leftTableName?: string;
rightTableName?: string;
}
// 컬럼 선택 컴포넌트
const ColumnSelect: React.FC<{
columns: ColumnInfo[];
value: string;
onValueChange: (value: string) => void;
placeholder: string;
disabled?: boolean;
}> = ({ columns, value, onValueChange, placeholder, disabled = false }) => {
return (
<Select value={value} onValueChange={onValueChange} disabled={disabled}>
<SelectTrigger className="h-8 text-xs">
<SelectValue placeholder={placeholder} />
</SelectTrigger>
<SelectContent>
{columns.map((col) => (
<SelectItem key={col.column_name} value={col.column_name}>
{col.column_comment || col.column_name}
<span className="text-muted-foreground ml-1 text-[10px]">({col.column_name})</span>
</SelectItem>
))}
</SelectContent>
</Select>
);
};
// 개별 필드 편집 모달
const FieldEditModal: React.FC<{
open: boolean;
onOpenChange: (open: boolean) => void;
field: DataTransferField | null;
onSave: (field: DataTransferField) => void;
leftColumns: ColumnInfo[];
rightColumns: ColumnInfo[];
leftTableName?: string;
rightTableName?: string;
isNew?: boolean;
}> = ({
open,
onOpenChange,
field,
onSave,
leftColumns,
rightColumns,
leftTableName,
rightTableName,
isNew = false,
}) => {
const [editingField, setEditingField] = useState<DataTransferField>({
id: "",
panel: "left",
sourceColumn: "",
targetColumn: "",
label: "",
description: "",
});
useEffect(() => {
if (field) {
setEditingField({ ...field });
} else {
setEditingField({
id: `field_${Date.now()}`,
panel: "left",
sourceColumn: "",
targetColumn: "",
label: "",
description: "",
});
}
}, [field, open]);
const handleSave = () => {
if (!editingField.sourceColumn || !editingField.targetColumn) {
return;
}
onSave(editingField);
onOpenChange(false);
};
const currentColumns = editingField.panel === "left" ? leftColumns : rightColumns;
const currentTableName = editingField.panel === "left" ? leftTableName : rightTableName;
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="max-w-[95vw] sm:max-w-[450px]">
<DialogHeader>
<DialogTitle className="text-base">{isNew ? "데이터 전달 필드 추가" : "데이터 전달 필드 편집"}</DialogTitle>
<DialogDescription className="text-xs">
.
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-2">
{/* 패널 선택 */}
<div>
<Label className="text-xs"> </Label>
<Select
value={editingField.panel}
onValueChange={(value: "left" | "right") => {
setEditingField({ ...editingField, panel: value, sourceColumn: "" });
}}
>
<SelectTrigger className="mt-1 h-9">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="left">
{leftTableName && <span className="text-muted-foreground">({leftTableName})</span>}
</SelectItem>
<SelectItem value="right">
{rightTableName && <span className="text-muted-foreground">({rightTableName})</span>}
</SelectItem>
</SelectContent>
</Select>
<p className="text-muted-foreground mt-1 text-[10px]"> .</p>
</div>
{/* 소스 컬럼 */}
<div>
<Label className="text-xs">
<span className="text-destructive">*</span>
</Label>
<div className="mt-1">
<ColumnSelect
columns={currentColumns}
value={editingField.sourceColumn}
onValueChange={(value) => {
const col = currentColumns.find((c) => c.column_name === value);
setEditingField({
...editingField,
sourceColumn: value,
// 타겟 컬럼이 비어있으면 소스와 동일하게 설정
targetColumn: editingField.targetColumn || value,
// 라벨이 비어있으면 컬럼 코멘트 사용
label: editingField.label || col?.column_comment || "",
});
}}
placeholder="컬럼 선택..."
disabled={currentColumns.length === 0}
/>
</div>
{currentColumns.length === 0 && (
<p className="text-destructive mt-1 text-[10px]">
{currentTableName ? "테이블에 컬럼이 없습니다." : "테이블을 먼저 선택해주세요."}
</p>
)}
</div>
{/* 타겟 컬럼 */}
<div>
<Label className="text-xs">
( ) <span className="text-destructive">*</span>
</Label>
<Input
value={editingField.targetColumn}
onChange={(e) => setEditingField({ ...editingField, targetColumn: e.target.value })}
placeholder="모달에서 사용할 필드명"
className="mt-1 h-9 text-sm"
/>
<p className="text-muted-foreground mt-1 text-[10px]"> .</p>
</div>
{/* 라벨 (선택) */}
<div>
<Label className="text-xs"> ()</Label>
<Input
value={editingField.label || ""}
onChange={(e) => setEditingField({ ...editingField, label: e.target.value })}
placeholder="표시용 이름"
className="mt-1 h-9 text-sm"
/>
</div>
{/* 설명 (선택) */}
<div>
<Label className="text-xs"> ()</Label>
<Input
value={editingField.description || ""}
onChange={(e) => setEditingField({ ...editingField, description: e.target.value })}
placeholder="이 필드에 대한 설명"
className="mt-1 h-9 text-sm"
/>
</div>
{/* 미리보기 */}
{editingField.sourceColumn && editingField.targetColumn && (
<div className="bg-muted/50 rounded-md p-3">
<p className="mb-2 text-xs font-medium"></p>
<div className="flex items-center gap-2 text-xs">
<Badge variant="outline" className="text-[10px]">
{editingField.panel === "left" ? "좌측" : "우측"}
</Badge>
<span className="font-mono">{editingField.sourceColumn}</span>
<ArrowRight className="h-3 w-3" />
<span className="font-mono">{editingField.targetColumn}</span>
</div>
</div>
)}
</div>
<DialogFooter className="gap-2 sm:gap-0">
<Button variant="outline" onClick={() => onOpenChange(false)} className="h-9 text-sm">
</Button>
<Button
onClick={handleSave}
disabled={!editingField.sourceColumn || !editingField.targetColumn}
className="h-9 text-sm"
>
{isNew ? "추가" : "저장"}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
};
// 메인 모달 컴포넌트
const DataTransferConfigModal: React.FC<DataTransferConfigModalProps> = ({
open,
onOpenChange,
dataTransferFields,
onChange,
leftColumns,
rightColumns,
leftTableName,
rightTableName,
}) => {
const [fields, setFields] = useState<DataTransferField[]>([]);
const [editModalOpen, setEditModalOpen] = useState(false);
const [editingField, setEditingField] = useState<DataTransferField | null>(null);
const [isNewField, setIsNewField] = useState(false);
useEffect(() => {
if (open) {
// 기존 필드에 panel이 없으면 left로 기본 설정 (하위 호환성)
const normalizedFields = (dataTransferFields || []).map((field, idx) => ({
...field,
id: field.id || `field_${idx}`,
panel: field.panel || ("left" as const),
}));
setFields(normalizedFields);
}
}, [open, dataTransferFields]);
const handleAddField = () => {
setEditingField(null);
setIsNewField(true);
setEditModalOpen(true);
};
const handleEditField = (field: DataTransferField) => {
setEditingField(field);
setIsNewField(false);
setEditModalOpen(true);
};
const handleSaveField = (field: DataTransferField) => {
if (isNewField) {
setFields([...fields, field]);
} else {
setFields(fields.map((f) => (f.id === field.id ? field : f)));
}
};
const handleRemoveField = (id: string) => {
setFields(fields.filter((f) => f.id !== id));
};
const handleSave = () => {
onChange(fields);
onOpenChange(false);
};
const getColumnLabel = (panel: "left" | "right", columnName: string) => {
const columns = panel === "left" ? leftColumns : rightColumns;
const col = columns.find((c) => c.column_name === columnName);
return col?.column_comment || columnName;
};
return (
<>
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="flex max-h-[85vh] max-w-[95vw] flex-col sm:max-w-[550px]">
<DialogHeader>
<DialogTitle className="text-base"> </DialogTitle>
<DialogDescription className="text-xs">
.
</DialogDescription>
</DialogHeader>
<div className="min-h-0 flex-1 overflow-hidden">
<div className="mb-3 flex items-center justify-between">
<span className="text-muted-foreground text-xs"> ({fields.length})</span>
<Button size="sm" variant="outline" className="h-7 text-xs" onClick={handleAddField}>
<Plus className="mr-1 h-3 w-3" />
</Button>
</div>
<ScrollArea className="h-[300px]">
<div className="space-y-2 pr-2">
{fields.length === 0 ? (
<div className="text-muted-foreground rounded-md border py-8 text-center text-xs">
<p className="mb-2"> </p>
<Button size="sm" variant="ghost" className="h-7 text-xs" onClick={handleAddField}>
<Plus className="mr-1 h-3 w-3" />
</Button>
</div>
) : (
fields.map((field) => (
<div
key={field.id}
className="hover:bg-muted/50 flex items-center gap-2 rounded-md border p-2 transition-colors"
>
<Badge variant={field.panel === "left" ? "default" : "secondary"} className="shrink-0 text-[10px]">
{field.panel === "left" ? "좌측" : "우측"}
</Badge>
<div className="min-w-0 flex-1">
<div className="flex items-center gap-1 text-xs">
<span className="font-mono">{getColumnLabel(field.panel, field.sourceColumn)}</span>
<ArrowRight className="text-muted-foreground h-3 w-3 shrink-0" />
<span className="font-mono truncate">{field.targetColumn}</span>
</div>
{field.description && (
<p className="text-muted-foreground mt-0.5 truncate text-[10px]">{field.description}</p>
)}
</div>
<div className="flex shrink-0 items-center gap-1">
<Button
size="sm"
variant="ghost"
className="h-6 w-6 p-0"
onClick={() => handleEditField(field)}
>
<Settings className="h-3 w-3" />
</Button>
<Button
size="sm"
variant="ghost"
className="text-destructive hover:text-destructive h-6 w-6 p-0"
onClick={() => handleRemoveField(field.id || "")}
>
<X className="h-3 w-3" />
</Button>
</div>
</div>
))
)}
</div>
</ScrollArea>
</div>
<div className="bg-muted/50 text-muted-foreground rounded-md p-2 text-[10px]">
<p> .</p>
</div>
<DialogFooter className="gap-2 sm:gap-0">
<Button variant="outline" onClick={() => onOpenChange(false)} className="h-9 text-sm">
</Button>
<Button onClick={handleSave} className="h-9 text-sm">
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
{/* 필드 편집 모달 */}
<FieldEditModal
open={editModalOpen}
onOpenChange={setEditModalOpen}
field={editingField}
onSave={handleSaveField}
leftColumns={leftColumns}
rightColumns={rightColumns}
leftTableName={leftTableName}
rightTableName={rightTableName}
isNew={isNewField}
/>
</>
);
};
export default DataTransferConfigModal;

View File

@ -2,7 +2,8 @@
import React, { useState, useEffect, useCallback, useMemo } from "react"; import React, { useState, useEffect, useCallback, useMemo } from "react";
import { ComponentRendererProps } from "@/types/component"; import { ComponentRendererProps } from "@/types/component";
import { SplitPanelLayout2Config, ColumnConfig, DataTransferField, ActionButtonConfig, JoinTableConfig } from "./types"; import { SplitPanelLayout2Config, ColumnConfig, DataTransferField, ActionButtonConfig, JoinTableConfig, GroupingConfig, ColumnDisplayConfig, TabConfig } from "./types";
import { Badge } from "@/components/ui/badge";
import { defaultConfig } from "./config"; import { defaultConfig } from "./config";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { import {
@ -86,6 +87,177 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
const [itemToDelete, setItemToDelete] = useState<any>(null); const [itemToDelete, setItemToDelete] = useState<any>(null);
const [isBulkDelete, setIsBulkDelete] = useState(false); const [isBulkDelete, setIsBulkDelete] = useState(false);
// 탭 상태 (좌측/우측 각각)
const [leftActiveTab, setLeftActiveTab] = useState<string | null>(null);
const [rightActiveTab, setRightActiveTab] = useState<string | null>(null);
// 프론트엔드 그룹핑 함수
const groupData = useCallback(
(data: Record<string, any>[], groupingConfig: GroupingConfig, columns: ColumnConfig[]): Record<string, any>[] => {
if (!groupingConfig.enabled || !groupingConfig.groupByColumn) {
return data;
}
const groupByColumn = groupingConfig.groupByColumn;
const groupMap = new Map<string, Record<string, any>>();
// 데이터를 그룹별로 수집
data.forEach((item) => {
const groupKey = String(item[groupByColumn] ?? "");
if (!groupMap.has(groupKey)) {
// 첫 번째 항목을 기준으로 그룹 초기화
const groupedItem: Record<string, any> = { ...item };
// 각 컬럼의 displayConfig 확인하여 집계 준비
columns.forEach((col) => {
if (col.displayConfig?.aggregate?.enabled) {
// 집계가 활성화된 컬럼은 배열로 초기화
groupedItem[`__agg_${col.name}`] = [item[col.name]];
}
});
groupMap.set(groupKey, groupedItem);
} else {
// 기존 그룹에 값 추가
const existingGroup = groupMap.get(groupKey)!;
columns.forEach((col) => {
if (col.displayConfig?.aggregate?.enabled) {
const aggKey = `__agg_${col.name}`;
if (!existingGroup[aggKey]) {
existingGroup[aggKey] = [];
}
existingGroup[aggKey].push(item[col.name]);
}
});
}
});
// 집계 처리 및 결과 변환
const result: Record<string, any>[] = [];
groupMap.forEach((groupedItem) => {
columns.forEach((col) => {
if (col.displayConfig?.aggregate?.enabled) {
const aggKey = `__agg_${col.name}`;
const values = groupedItem[aggKey] || [];
if (col.displayConfig.aggregate.function === "DISTINCT") {
// 중복 제거 후 배열로 저장
const uniqueValues = [...new Set(values.filter((v: any) => v !== null && v !== undefined))];
groupedItem[col.name] = uniqueValues;
} else if (col.displayConfig.aggregate.function === "COUNT") {
// 개수를 숫자로 저장
groupedItem[col.name] = values.filter((v: any) => v !== null && v !== undefined).length;
}
// 임시 집계 키 제거
delete groupedItem[aggKey];
}
});
result.push(groupedItem);
});
console.log(`[SplitPanelLayout2] 그룹핑 완료: ${data.length}건 → ${result.length}개 그룹`);
return result;
},
[],
);
// 탭 목록 생성 함수 (데이터에서 고유값 추출)
const generateTabs = useCallback(
(data: Record<string, unknown>[], tabConfig: TabConfig | undefined): { id: string; label: string; count: number }[] => {
if (!tabConfig?.enabled || !tabConfig.tabSourceColumn) {
return [];
}
const sourceColumn = tabConfig.tabSourceColumn;
// 데이터에서 고유값 추출 및 개수 카운트
const valueCount = new Map<string, number>();
data.forEach((item) => {
const value = String(item[sourceColumn] ?? "");
if (value) {
valueCount.set(value, (valueCount.get(value) || 0) + 1);
}
});
// 탭 목록 생성
const tabs = Array.from(valueCount.entries()).map(([value, count]) => ({
id: value,
label: value,
count: tabConfig.showCount ? count : 0,
}));
console.log(`[SplitPanelLayout2] 탭 생성: ${tabs.length}개 탭 (컬럼: ${sourceColumn})`);
return tabs;
},
[],
);
// 탭으로 필터링된 데이터 반환
const filterDataByTab = useCallback(
(data: Record<string, unknown>[], activeTab: string | null, tabConfig: TabConfig | undefined): Record<string, unknown>[] => {
if (!tabConfig?.enabled || !activeTab || !tabConfig.tabSourceColumn) {
return data;
}
const sourceColumn = tabConfig.tabSourceColumn;
return data.filter((item) => String(item[sourceColumn] ?? "") === activeTab);
},
[],
);
// 좌측 패널 탭 목록 (메모이제이션)
const leftTabs = useMemo(() => {
if (!config.leftPanel?.tabConfig?.enabled || !config.leftPanel?.tabConfig?.tabSourceColumn) {
return [];
}
return generateTabs(leftData, config.leftPanel.tabConfig);
}, [leftData, config.leftPanel?.tabConfig, generateTabs]);
// 우측 패널 탭 목록 (메모이제이션)
const rightTabs = useMemo(() => {
if (!config.rightPanel?.tabConfig?.enabled || !config.rightPanel?.tabConfig?.tabSourceColumn) {
return [];
}
return generateTabs(rightData, config.rightPanel.tabConfig);
}, [rightData, config.rightPanel?.tabConfig, generateTabs]);
// 탭 기본값 설정 (탭 목록이 변경되면 기본 탭 선택)
useEffect(() => {
if (leftTabs.length > 0 && !leftActiveTab) {
const defaultTab = config.leftPanel?.tabConfig?.defaultTab;
if (defaultTab && leftTabs.some((t) => t.id === defaultTab)) {
setLeftActiveTab(defaultTab);
} else {
setLeftActiveTab(leftTabs[0].id);
}
}
}, [leftTabs, leftActiveTab, config.leftPanel?.tabConfig?.defaultTab]);
useEffect(() => {
if (rightTabs.length > 0 && !rightActiveTab) {
const defaultTab = config.rightPanel?.tabConfig?.defaultTab;
if (defaultTab && rightTabs.some((t) => t.id === defaultTab)) {
setRightActiveTab(defaultTab);
} else {
setRightActiveTab(rightTabs[0].id);
}
}
}, [rightTabs, rightActiveTab, config.rightPanel?.tabConfig?.defaultTab]);
// 탭 필터링된 데이터 (메모이제이션)
const filteredLeftDataByTab = useMemo(() => {
return filterDataByTab(leftData, leftActiveTab, config.leftPanel?.tabConfig);
}, [leftData, leftActiveTab, config.leftPanel?.tabConfig, filterDataByTab]);
const filteredRightDataByTab = useMemo(() => {
return filterDataByTab(rightData, rightActiveTab, config.rightPanel?.tabConfig);
}, [rightData, rightActiveTab, config.rightPanel?.tabConfig, filterDataByTab]);
// 좌측 데이터 로드 // 좌측 데이터 로드
const loadLeftData = useCallback(async () => { const loadLeftData = useCallback(async () => {
if (!config.leftPanel?.tableName || isDesignMode) return; if (!config.leftPanel?.tableName || isDesignMode) return;
@ -115,6 +287,80 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
); );
} }
// 조인 테이블 처리 (좌측 패널) - 인라인 처리
if (config.leftPanel.joinTables && config.leftPanel.joinTables.length > 0) {
for (const joinTableConfig of config.leftPanel.joinTables) {
if (!joinTableConfig.joinTable || !joinTableConfig.mainColumn || !joinTableConfig.joinColumn) {
continue;
}
// 메인 데이터에서 조인할 키 값들 추출
const joinKeys = [
...new Set(data.map((item: Record<string, unknown>) => item[joinTableConfig.mainColumn]).filter(Boolean)),
];
if (joinKeys.length === 0) continue;
try {
const joinResponse = await apiClient.post(`/table-management/tables/${joinTableConfig.joinTable}/data`, {
page: 1,
size: 1000,
dataFilter: {
enabled: true,
matchType: "any",
filters: joinKeys.map((key, idx) => ({
id: `join_key_${idx}`,
columnName: joinTableConfig.joinColumn,
operator: "equals",
value: String(key),
valueType: "static",
})),
},
autoFilter: {
enabled: true,
filterColumn: "company_code",
filterType: "company",
},
});
if (joinResponse.data.success) {
const joinDataArray = joinResponse.data.data?.data || [];
const joinDataMap = new Map<string, Record<string, unknown>>();
joinDataArray.forEach((item: Record<string, unknown>) => {
const key = item[joinTableConfig.joinColumn];
if (key) joinDataMap.set(String(key), item);
});
if (joinDataMap.size > 0) {
data = data.map((item: Record<string, unknown>) => {
const joinKey = item[joinTableConfig.mainColumn];
const joinData = joinDataMap.get(String(joinKey));
if (joinData) {
const mergedData = { ...item };
joinTableConfig.selectColumns.forEach((col) => {
// 테이블.컬럼명 형식으로 저장
mergedData[`${joinTableConfig.joinTable}.${col}`] = joinData[col];
// 컬럼명만으로도 저장 (기존 값이 없을 때)
if (!(col in mergedData)) {
mergedData[col] = joinData[col];
}
});
return mergedData;
}
return item;
});
}
console.log(`[SplitPanelLayout2] 좌측 조인 테이블 로드: ${joinTableConfig.joinTable}, ${joinDataArray.length}`);
}
} catch (error) {
console.error(`[SplitPanelLayout2] 좌측 조인 테이블 로드 실패 (${joinTableConfig.joinTable}):`, error);
}
}
}
// 그룹핑 처리
if (config.leftPanel.grouping?.enabled && config.leftPanel.grouping.groupByColumn) {
data = groupData(data, config.leftPanel.grouping, config.leftPanel.displayColumns || []);
}
setLeftData(data); setLeftData(data);
console.log(`[SplitPanelLayout2] 좌측 데이터 로드: ${data.length}건 (company_code 필터 적용)`); console.log(`[SplitPanelLayout2] 좌측 데이터 로드: ${data.length}건 (company_code 필터 적용)`);
} }
@ -124,7 +370,7 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
} finally { } finally {
setLeftLoading(false); setLeftLoading(false);
} }
}, [config.leftPanel?.tableName, config.leftPanel?.hierarchyConfig, isDesignMode]); }, [config.leftPanel?.tableName, config.leftPanel?.hierarchyConfig, config.leftPanel?.grouping, config.leftPanel?.displayColumns, config.leftPanel?.joinTables, isDesignMode, groupData]);
// 조인 테이블 데이터 로드 (단일 테이블) // 조인 테이블 데이터 로드 (단일 테이블)
const loadJoinTableData = useCallback( const loadJoinTableData = useCallback(
@ -700,16 +946,20 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
}); });
}, []); }, []);
// 검색 필터링 // 검색 필터링 (탭 필터링 후 적용)
const filteredLeftData = useMemo(() => { const filteredLeftData = useMemo(() => {
if (!leftSearchTerm) return leftData; // 1. 먼저 탭 필터링 적용
const data = filteredLeftDataByTab;
// 2. 검색어가 없으면 탭 필터링된 데이터 반환
if (!leftSearchTerm) return data;
// 복수 검색 컬럼 지원 (searchColumns 우선, 없으면 searchColumn 사용) // 복수 검색 컬럼 지원 (searchColumns 우선, 없으면 searchColumn 사용)
const searchColumns = config.leftPanel?.searchColumns?.map((c) => c.columnName).filter(Boolean) || []; const searchColumns = config.leftPanel?.searchColumns?.map((c) => c.columnName).filter(Boolean) || [];
const legacyColumn = config.leftPanel?.searchColumn; const legacyColumn = config.leftPanel?.searchColumn;
const columnsToSearch = searchColumns.length > 0 ? searchColumns : legacyColumn ? [legacyColumn] : []; const columnsToSearch = searchColumns.length > 0 ? searchColumns : legacyColumn ? [legacyColumn] : [];
if (columnsToSearch.length === 0) return leftData; if (columnsToSearch.length === 0) return data;
const filterRecursive = (items: any[]): any[] => { const filterRecursive = (items: any[]): any[] => {
return items.filter((item) => { return items.filter((item) => {
@ -731,27 +981,31 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
}); });
}; };
return filterRecursive([...leftData]); return filterRecursive([...data]);
}, [leftData, leftSearchTerm, config.leftPanel?.searchColumns, config.leftPanel?.searchColumn]); }, [filteredLeftDataByTab, leftSearchTerm, config.leftPanel?.searchColumns, config.leftPanel?.searchColumn]);
const filteredRightData = useMemo(() => { const filteredRightData = useMemo(() => {
if (!rightSearchTerm) return rightData; // 1. 먼저 탭 필터링 적용
const data = filteredRightDataByTab;
// 2. 검색어가 없으면 탭 필터링된 데이터 반환
if (!rightSearchTerm) return data;
// 복수 검색 컬럼 지원 (searchColumns 우선, 없으면 searchColumn 사용) // 복수 검색 컬럼 지원 (searchColumns 우선, 없으면 searchColumn 사용)
const searchColumns = config.rightPanel?.searchColumns?.map((c) => c.columnName).filter(Boolean) || []; const searchColumns = config.rightPanel?.searchColumns?.map((c) => c.columnName).filter(Boolean) || [];
const legacyColumn = config.rightPanel?.searchColumn; const legacyColumn = config.rightPanel?.searchColumn;
const columnsToSearch = searchColumns.length > 0 ? searchColumns : legacyColumn ? [legacyColumn] : []; const columnsToSearch = searchColumns.length > 0 ? searchColumns : legacyColumn ? [legacyColumn] : [];
if (columnsToSearch.length === 0) return rightData; if (columnsToSearch.length === 0) return data;
return rightData.filter((item) => { return data.filter((item) => {
// 여러 컬럼 중 하나라도 매칭되면 포함 // 여러 컬럼 중 하나라도 매칭되면 포함
return columnsToSearch.some((col) => { return columnsToSearch.some((col) => {
const value = String(item[col] || "").toLowerCase(); const value = String(item[col] || "").toLowerCase();
return value.includes(rightSearchTerm.toLowerCase()); return value.includes(rightSearchTerm.toLowerCase());
}); });
}); });
}, [rightData, rightSearchTerm, config.rightPanel?.searchColumns, config.rightPanel?.searchColumn]); }, [filteredRightDataByTab, rightSearchTerm, config.rightPanel?.searchColumns, config.rightPanel?.searchColumn]);
// 체크박스 전체 선택/해제 (filteredRightData 정의 이후에 위치해야 함) // 체크박스 전체 선택/해제 (filteredRightData 정의 이후에 위치해야 함)
const handleSelectAll = useCallback( const handleSelectAll = useCallback(
@ -835,7 +1089,7 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
}; };
}, [screenContext, component.id]); }, [screenContext, component.id]);
// 컬럼 값 가져오기 (sourceTable 고려) // 컬럼 값 가져오기 (sourceTable 및 엔티티 참조 고려)
const getColumnValue = useCallback( const getColumnValue = useCallback(
(item: any, col: ColumnConfig): any => { (item: any, col: ColumnConfig): any => {
// col.name이 "테이블명.컬럼명" 형식인 경우 처리 // col.name이 "테이블명.컬럼명" 형식인 경우 처리
@ -843,28 +1097,66 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
const tableFromName = col.name.includes(".") ? col.name.split(".")[0] : null; const tableFromName = col.name.includes(".") ? col.name.split(".")[0] : null;
const effectiveSourceTable = col.sourceTable || tableFromName; const effectiveSourceTable = col.sourceTable || tableFromName;
// 기본 값 가져오기
let baseValue: any;
// sourceTable이 설정되어 있고, 메인 테이블이 아닌 경우 // sourceTable이 설정되어 있고, 메인 테이블이 아닌 경우
if (effectiveSourceTable && effectiveSourceTable !== config.rightPanel?.tableName) { if (effectiveSourceTable && effectiveSourceTable !== config.rightPanel?.tableName) {
// 1. 테이블명.컬럼명 형식으로 먼저 시도 (mergeJoinData에서 저장한 형식) // 1. 테이블명.컬럼명 형식으로 먼저 시도 (mergeJoinData에서 저장한 형식)
const tableColumnKey = `${effectiveSourceTable}.${actualColName}`; const tableColumnKey = `${effectiveSourceTable}.${actualColName}`;
if (item[tableColumnKey] !== undefined) { if (item[tableColumnKey] !== undefined) {
return item[tableColumnKey]; baseValue = item[tableColumnKey];
} } else {
// 2. 조인 테이블의 alias가 설정된 경우 alias_컬럼명으로 시도 // 2. 조인 테이블의 alias가 설정된 경우 alias_컬럼명으로 시도
const joinTable = config.rightPanel?.joinTables?.find((jt) => jt.joinTable === effectiveSourceTable); const joinTable = config.rightPanel?.joinTables?.find((jt) => jt.joinTable === effectiveSourceTable);
if (joinTable?.alias) { if (joinTable?.alias) {
const aliasKey = `${joinTable.alias}_${actualColName}`; const aliasKey = `${joinTable.alias}_${actualColName}`;
if (item[aliasKey] !== undefined) { if (item[aliasKey] !== undefined) {
return item[aliasKey]; baseValue = item[aliasKey];
}
}
// 3. 그냥 컬럼명으로 시도 (메인 테이블에 없는 경우 조인 데이터가 직접 들어감)
if (baseValue === undefined && item[actualColName] !== undefined) {
baseValue = item[actualColName];
} }
} }
// 3. 그냥 컬럼명으로 시도 (메인 테이블에 없는 경우 조인 데이터가 직접 들어감) } else {
if (item[actualColName] !== undefined) { // 4. 기본: 컬럼명으로 직접 접근
return item[actualColName]; baseValue = item[actualColName];
}
// 엔티티 참조 설정이 있는 경우 - 선택된 컬럼들의 값을 결합
if (col.entityReference?.displayColumns && col.entityReference.displayColumns.length > 0) {
// 엔티티 참조 컬럼들의 값을 수집
// 백엔드에서 entity 조인을 통해 "컬럼명_참조테이블컬럼" 형태로 데이터가 들어옴
const entityValues: string[] = [];
for (const displayCol of col.entityReference.displayColumns) {
// 다양한 형식으로 값을 찾아봄
// 1. 직접 컬럼명 (entity 조인 결과)
if (item[displayCol] !== undefined && item[displayCol] !== null) {
entityValues.push(String(item[displayCol]));
}
// 2. 컬럼명_참조컬럼 형식
else if (item[`${actualColName}_${displayCol}`] !== undefined) {
entityValues.push(String(item[`${actualColName}_${displayCol}`]));
}
// 3. 참조테이블.컬럼 형식
else if (col.entityReference.entityId) {
const refTableCol = `${col.entityReference.entityId}.${displayCol}`;
if (item[refTableCol] !== undefined && item[refTableCol] !== null) {
entityValues.push(String(item[refTableCol]));
}
}
}
// 엔티티 값들이 있으면 결합하여 반환
if (entityValues.length > 0) {
return entityValues.join(" - ");
} }
} }
// 4. 기본: 컬럼명으로 직접 접근
return item[actualColName]; return baseValue;
}, },
[config.rightPanel?.tableName, config.rightPanel?.joinTables], [config.rightPanel?.tableName, config.rightPanel?.joinTables],
); );
@ -969,15 +1261,39 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
{/* 아이콘 */} {/* 아이콘 */}
<Building2 className="text-muted-foreground h-5 w-5" /> <Building2 className="text-muted-foreground h-5 w-5" />
{/* 내용 */} {/* 내용 */}
<div className="min-w-0 flex-1"> <div className="min-w-0 flex-1">
{/* 이름 행 (Name Row) */} {/* 이름 행 (Name Row) */}
<div className="flex items-center gap-2"> <div className="flex flex-wrap items-center gap-2">
<span className="truncate text-base font-medium">{primaryValue || "이름 없음"}</span> <span className="truncate text-base font-medium">{primaryValue || "이름 없음"}</span>
{/* 이름 행의 추가 컬럼들 (배지 스타일) */} {/* 이름 행의 추가 컬럼들 */}
{nameRowColumns.slice(1).map((col, idx) => { {nameRowColumns.slice(1).map((col, idx) => {
const value = item[col.name]; const value = item[col.name];
if (!value) return null; if (value === null || value === undefined) return null;
// 배지 타입이고 배열인 경우
if (col.displayConfig?.displayType === "badge" && Array.isArray(value)) {
return (
<div key={idx} className="flex flex-wrap gap-1">
{value.map((v, vIdx) => (
<Badge key={vIdx} variant="secondary" className="shrink-0 text-xs">
{formatValue(v, col.format)}
</Badge>
))}
</div>
);
}
// 배지 타입이지만 단일 값인 경우
if (col.displayConfig?.displayType === "badge") {
return (
<Badge key={idx} variant="secondary" className="shrink-0 text-xs">
{formatValue(value, col.format)}
</Badge>
);
}
// 기본 텍스트 스타일
return ( return (
<span key={idx} className="bg-muted shrink-0 rounded px-1.5 py-0.5 text-xs"> <span key={idx} className="bg-muted shrink-0 rounded px-1.5 py-0.5 text-xs">
{formatValue(value, col.format)} {formatValue(value, col.format)}
@ -987,16 +1303,40 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
</div> </div>
{/* 정보 행 (Info Row) */} {/* 정보 행 (Info Row) */}
{infoRowColumns.length > 0 && ( {infoRowColumns.length > 0 && (
<div className="text-muted-foreground flex items-center gap-2 truncate text-sm"> <div className="text-muted-foreground flex flex-wrap items-center gap-2 text-sm">
{infoRowColumns {infoRowColumns
.map((col, idx) => { .map((col, idx) => {
const value = item[col.name]; const value = item[col.name];
if (!value) return null; if (value === null || value === undefined) return null;
// 배지 타입이고 배열인 경우
if (col.displayConfig?.displayType === "badge" && Array.isArray(value)) {
return (
<div key={idx} className="flex flex-wrap gap-1">
{value.map((v, vIdx) => (
<Badge key={vIdx} variant="outline" className="text-xs">
{formatValue(v, col.format)}
</Badge>
))}
</div>
);
}
// 배지 타입이지만 단일 값인 경우
if (col.displayConfig?.displayType === "badge") {
return (
<Badge key={idx} variant="outline" className="text-xs">
{formatValue(value, col.format)}
</Badge>
);
}
// 기본 텍스트
return <span key={idx}>{formatValue(value, col.format)}</span>; return <span key={idx}>{formatValue(value, col.format)}</span>;
}) })
.filter(Boolean) .filter(Boolean)
.reduce((acc: React.ReactNode[], curr, idx) => { .reduce((acc: React.ReactNode[], curr, idx) => {
if (idx > 0) if (idx > 0 && !React.isValidElement(curr))
acc.push( acc.push(
<span key={`sep-${idx}`} className="text-muted-foreground/50"> <span key={`sep-${idx}`} className="text-muted-foreground/50">
| |
@ -1020,6 +1360,95 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
); );
}; };
// 왼쪽 패널 기본키 컬럼명 가져오기
const getLeftPrimaryKeyColumn = useCallback(() => {
return config.leftPanel?.primaryKeyColumn || config.leftPanel?.hierarchyConfig?.idColumn || "id";
}, [config.leftPanel?.primaryKeyColumn, config.leftPanel?.hierarchyConfig?.idColumn]);
// 왼쪽 패널 테이블 렌더링
const renderLeftTable = () => {
const displayColumns = config.leftPanel?.displayColumns || [];
const pkColumn = getLeftPrimaryKeyColumn();
// 값 렌더링 (배지 지원)
const renderCellValue = (item: any, col: ColumnConfig) => {
const value = item[col.name];
if (value === null || value === undefined) return "-";
// 배지 타입이고 배열인 경우
if (col.displayConfig?.displayType === "badge" && Array.isArray(value)) {
return (
<div className="flex flex-wrap gap-1">
{value.map((v, vIdx) => (
<Badge key={vIdx} variant="secondary" className="text-xs">
{formatValue(v, col.format)}
</Badge>
))}
</div>
);
}
// 배지 타입이지만 단일 값인 경우
if (col.displayConfig?.displayType === "badge") {
return (
<Badge variant="secondary" className="text-xs">
{formatValue(value, col.format)}
</Badge>
);
}
// 기본 텍스트
return formatValue(value, col.format);
};
return (
<div className="rounded-md border">
<Table>
<TableHeader>
<TableRow>
{displayColumns.map((col, idx) => (
<TableHead key={idx} style={{ width: col.width ? `${col.width}px` : "auto" }}>
{col.label || col.name}
</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody>
{filteredLeftData.length === 0 ? (
<TableRow>
<TableCell colSpan={displayColumns.length} className="text-muted-foreground h-24 text-center">
</TableCell>
</TableRow>
) : (
filteredLeftData.map((item, index) => {
const itemId = item[pkColumn];
const isItemSelected =
selectedLeftItem &&
(selectedLeftItem === item ||
(item[pkColumn] !== undefined &&
selectedLeftItem[pkColumn] !== undefined &&
selectedLeftItem[pkColumn] === item[pkColumn]));
return (
<TableRow
key={itemId ?? index}
className={cn("cursor-pointer hover:bg-muted/50", isItemSelected && "bg-primary/10")}
onClick={() => handleLeftItemSelect(item)}
>
{displayColumns.map((col, colIdx) => (
<TableCell key={colIdx}>{renderCellValue(item, col)}</TableCell>
))}
</TableRow>
);
})
)}
</TableBody>
</Table>
</div>
);
};
// 우측 패널 카드 렌더링 // 우측 패널 카드 렌더링
const renderRightCard = (item: any, index: number) => { const renderRightCard = (item: any, index: number) => {
const displayColumns = config.rightPanel?.displayColumns || []; const displayColumns = config.rightPanel?.displayColumns || [];
@ -1285,6 +1714,11 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
// 디자인 모드 렌더링 // 디자인 모드 렌더링
if (isDesignMode) { if (isDesignMode) {
const leftButtons = config.leftPanel?.actionButtons || [];
const rightButtons = config.rightPanel?.actionButtons || [];
const leftDisplayColumns = config.leftPanel?.displayColumns || [];
const rightDisplayColumns = config.rightPanel?.displayColumns || [];
return ( return (
<div <div
className={cn( className={cn(
@ -1292,19 +1726,211 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
isSelected ? "border-primary" : "border-muted-foreground/30", isSelected ? "border-primary" : "border-muted-foreground/30",
)} )}
onClick={onClick} onClick={onClick}
style={{ minHeight: "300px" }}
> >
{/* 좌측 패널 미리보기 */} {/* 좌측 패널 미리보기 */}
<div className="bg-muted/30 flex flex-col border-r p-4" style={{ width: `${splitPosition}%` }}> <div className="bg-muted/20 flex flex-col border-r" style={{ width: `${splitPosition}%` }}>
<div className="mb-2 text-sm font-medium">{config.leftPanel?.title || "좌측 패널"}</div> {/* 헤더 */}
<div className="text-muted-foreground mb-2 text-xs">: {config.leftPanel?.tableName || "미설정"}</div> <div className="flex items-center justify-between border-b px-3 py-2">
<div className="text-muted-foreground flex flex-1 items-center justify-center text-xs"> </div> <div>
<div className="text-sm font-medium">{config.leftPanel?.title || "좌측 패널"}</div>
<div className="text-muted-foreground text-[10px]">
{config.leftPanel?.tableName || "테이블 미설정"}
</div>
</div>
{leftButtons.length > 0 && (
<div className="flex gap-1">
{leftButtons.slice(0, 2).map((btn) => (
<div
key={btn.id}
className="bg-primary/10 text-primary rounded px-2 py-0.5 text-[10px]"
>
{btn.label}
</div>
))}
{leftButtons.length > 2 && (
<div className="text-muted-foreground text-[10px]">+{leftButtons.length - 2}</div>
)}
</div>
)}
</div>
{/* 검색 표시 */}
{config.leftPanel?.showSearch && (
<div className="border-b px-3 py-2">
<div className="bg-muted h-7 w-full rounded text-[10px] leading-7 text-center text-muted-foreground">
</div>
</div>
)}
{/* 컬럼 미리보기 */}
<div className="flex-1 overflow-hidden p-3">
{leftDisplayColumns.length > 0 ? (
<div className="space-y-2">
{/* 샘플 카드 */}
{[1, 2, 3].map((i) => (
<div key={i} className="rounded-md border bg-background/50 p-2">
<div className="flex items-center gap-2">
{leftDisplayColumns
.filter((col) => col.displayRow === "name" || !col.displayRow)
.slice(0, 2)
.map((col, idx) => (
<div
key={col.name}
className={cn(
"text-[10px]",
idx === 0 ? "font-medium" : "text-muted-foreground"
)}
>
{col.label || col.name}
</div>
))}
</div>
{leftDisplayColumns.filter((col) => col.displayRow === "info").length > 0 && (
<div className="text-muted-foreground mt-1 flex gap-2 text-[10px]">
{leftDisplayColumns
.filter((col) => col.displayRow === "info")
.slice(0, 3)
.map((col) => (
<span key={col.name}>{col.label || col.name}</span>
))}
</div>
)}
</div>
))}
</div>
) : (
<div className="flex h-full items-center justify-center">
<div className="text-muted-foreground text-xs"> </div>
</div>
)}
</div>
</div> </div>
{/* 우측 패널 미리보기 */} {/* 우측 패널 미리보기 */}
<div className="flex flex-1 flex-col p-4"> <div className="flex flex-1 flex-col">
<div className="mb-2 text-sm font-medium">{config.rightPanel?.title || "우측 패널"}</div> {/* 헤더 */}
<div className="text-muted-foreground mb-2 text-xs">: {config.rightPanel?.tableName || "미설정"}</div> <div className="flex items-center justify-between border-b px-3 py-2">
<div className="text-muted-foreground flex flex-1 items-center justify-center text-xs"> </div> <div>
<div className="text-sm font-medium">{config.rightPanel?.title || "우측 패널"}</div>
<div className="text-muted-foreground text-[10px]">
{config.rightPanel?.tableName || "테이블 미설정"}
</div>
</div>
{rightButtons.length > 0 && (
<div className="flex gap-1">
{rightButtons.slice(0, 2).map((btn) => (
<div
key={btn.id}
className={cn(
"rounded px-2 py-0.5 text-[10px]",
btn.variant === "destructive"
? "bg-destructive/10 text-destructive"
: "bg-primary/10 text-primary"
)}
>
{btn.label}
</div>
))}
{rightButtons.length > 2 && (
<div className="text-muted-foreground text-[10px]">+{rightButtons.length - 2}</div>
)}
</div>
)}
</div>
{/* 검색 표시 */}
{config.rightPanel?.showSearch && (
<div className="border-b px-3 py-2">
<div className="bg-muted h-7 w-full rounded text-[10px] leading-7 text-center text-muted-foreground">
</div>
</div>
)}
{/* 컬럼 미리보기 */}
<div className="flex-1 overflow-hidden p-3">
{rightDisplayColumns.length > 0 ? (
config.rightPanel?.displayMode === "table" ? (
// 테이블 모드 미리보기
<div className="rounded-md border">
<div className="bg-muted/50 flex border-b px-2 py-1">
{config.rightPanel?.showCheckbox && (
<div className="w-8 text-[10px]"></div>
)}
{rightDisplayColumns.slice(0, 4).map((col) => (
<div key={col.name} className="flex-1 text-[10px] font-medium">
{col.label || col.name}
</div>
))}
</div>
{[1, 2, 3].map((i) => (
<div key={i} className="flex border-b px-2 py-1 last:border-b-0">
{config.rightPanel?.showCheckbox && (
<div className="w-8">
<div className="border h-3 w-3 rounded-sm"></div>
</div>
)}
{rightDisplayColumns.slice(0, 4).map((col) => (
<div key={col.name} className="text-muted-foreground flex-1 text-[10px]">
---
</div>
))}
</div>
))}
</div>
) : (
// 카드 모드 미리보기
<div className="space-y-2">
{[1, 2].map((i) => (
<div key={i} className="rounded-md border bg-background/50 p-2">
<div className="flex items-center gap-2">
{rightDisplayColumns
.filter((col) => col.displayRow === "name" || !col.displayRow)
.slice(0, 2)
.map((col, idx) => (
<div
key={col.name}
className={cn(
"text-[10px]",
idx === 0 ? "font-medium" : "text-muted-foreground"
)}
>
{col.label || col.name}
</div>
))}
</div>
{rightDisplayColumns.filter((col) => col.displayRow === "info").length > 0 && (
<div className="text-muted-foreground mt-1 flex gap-2 text-[10px]">
{rightDisplayColumns
.filter((col) => col.displayRow === "info")
.slice(0, 3)
.map((col) => (
<span key={col.name}>{col.label || col.name}</span>
))}
</div>
)}
</div>
))}
</div>
)
) : (
<div className="flex h-full items-center justify-center">
<div className="text-muted-foreground text-xs"> </div>
</div>
)}
</div>
{/* 연결 설정 표시 */}
{(config.joinConfig?.leftColumn || config.joinConfig?.keys?.length) && (
<div className="border-t px-3 py-1">
<div className="text-muted-foreground text-[10px]">
: {config.joinConfig?.leftColumn || config.joinConfig?.keys?.[0]?.leftColumn} {" "}
{config.joinConfig?.rightColumn || config.joinConfig?.keys?.[0]?.rightColumn}
</div>
</div>
)}
</div> </div>
</div> </div>
); );
@ -1325,12 +1951,36 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
<div className="bg-muted/30 border-b p-4"> <div className="bg-muted/30 border-b p-4">
<div className="mb-3 flex items-center justify-between"> <div className="mb-3 flex items-center justify-between">
<h3 className="text-base font-semibold">{config.leftPanel?.title || "목록"}</h3> <h3 className="text-base font-semibold">{config.leftPanel?.title || "목록"}</h3>
{config.leftPanel?.showAddButton && ( {/* actionButtons 배열이 정의되어 있으면(빈 배열 포함) 해당 배열 사용, undefined면 기존 showAddButton 사용 (하위호환) */}
{config.leftPanel?.actionButtons !== undefined ? (
// 새로운 actionButtons 배열 기반 렌더링 (빈 배열이면 버튼 없음)
config.leftPanel.actionButtons.length > 0 && (
<div className="flex items-center gap-2">
{config.leftPanel.actionButtons.map((btn, idx) => (
<Button
key={idx}
size="sm"
variant={btn.variant || "default"}
className="h-8 text-sm"
onClick={() => {
if (btn.action === "add") {
handleLeftAddClick();
}
}}
>
{btn.icon && <span className="mr-1">{btn.icon}</span>}
{btn.label || "버튼"}
</Button>
))}
</div>
)
) : config.leftPanel?.showAddButton ? (
// 기존 showAddButton 기반 렌더링 (하위호환 - actionButtons가 undefined일 때만)
<Button size="sm" variant="default" className="h-8 text-sm" onClick={handleLeftAddClick}> <Button size="sm" variant="default" className="h-8 text-sm" onClick={handleLeftAddClick}>
<Plus className="mr-1 h-4 w-4" /> <Plus className="mr-1 h-4 w-4" />
{config.leftPanel?.addButtonLabel || "추가"} {config.leftPanel?.addButtonLabel || "추가"}
</Button> </Button>
)} ) : null}
</div> </div>
{/* 검색 */} {/* 검색 */}
@ -1347,15 +1997,49 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
)} )}
</div> </div>
{/* 좌측 패널 탭 */}
{config.leftPanel?.tabConfig?.enabled && leftTabs.length > 0 && (
<div className="flex flex-wrap gap-2 border-b px-4 py-3">
{leftTabs.map((tab) => (
<button
key={tab.id}
onClick={() => setLeftActiveTab(tab.id)}
className={cn(
"inline-flex items-center gap-2 rounded-lg border-2 px-4 py-2 text-sm font-medium transition-all",
leftActiveTab === tab.id
? "border-primary bg-primary/5 text-primary"
: "border-muted bg-background text-muted-foreground hover:border-primary/50 hover:text-foreground"
)}
>
<span>{tab.label}</span>
{config.leftPanel?.tabConfig?.showCount && (
<span
className={cn(
"rounded-full px-2 py-0.5 text-xs",
leftActiveTab === tab.id ? "bg-primary text-primary-foreground" : "bg-muted text-muted-foreground"
)}
>
{tab.count}
</span>
)}
</button>
))}
</div>
)}
{/* 목록 */} {/* 목록 */}
<div className="flex-1 overflow-auto"> <div className="flex-1 overflow-auto p-2">
{leftLoading ? ( {leftLoading ? (
<div className="text-muted-foreground flex h-full items-center justify-center text-base"> ...</div> <div className="text-muted-foreground flex h-full items-center justify-center text-base"> ...</div>
) : (config.leftPanel?.displayMode || "card") === "table" ? (
// 테이블 모드
renderLeftTable()
) : filteredLeftData.length === 0 ? ( ) : filteredLeftData.length === 0 ? (
<div className="text-muted-foreground flex h-full items-center justify-center text-base"> <div className="text-muted-foreground flex h-full items-center justify-center text-base">
</div> </div>
) : ( ) : (
// 카드 모드 (기본)
<div className="py-1">{filteredLeftData.map((item, index) => renderLeftItem(item, 0, index))}</div> <div className="py-1">{filteredLeftData.map((item, index) => renderLeftItem(item, 0, index))}</div>
)} )}
</div> </div>
@ -1389,15 +2073,18 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
)} )}
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
{/* 복수 액션 버튼 (actionButtons 설정 시) */} {/* actionButtons 배열이 정의되어 있으면(빈 배열 포함) 해당 배열 사용, undefined면 기존 showAddButton 사용 (하위호환) */}
{selectedLeftItem && renderActionButtons()} {selectedLeftItem && (
config.rightPanel?.actionButtons !== undefined ? (
{/* 기존 단일 추가 버튼 (하위 호환성) */} // 새로운 actionButtons 배열 기반 렌더링 (빈 배열이면 버튼 없음)
{config.rightPanel?.showAddButton && selectedLeftItem && !config.rightPanel?.actionButtons?.length && ( config.rightPanel.actionButtons.length > 0 && renderActionButtons()
<Button size="sm" variant="default" className="h-8 text-sm" onClick={handleRightAddClick}> ) : config.rightPanel?.showAddButton ? (
<Plus className="mr-1 h-4 w-4" /> // 기존 showAddButton 기반 렌더링 (하위호환 - actionButtons가 undefined일 때만)
{config.rightPanel?.addButtonLabel || "추가"} <Button size="sm" variant="default" className="h-8 text-sm" onClick={handleRightAddClick}>
</Button> <Plus className="mr-1 h-4 w-4" />
{config.rightPanel?.addButtonLabel || "추가"}
</Button>
) : null
)} )}
</div> </div>
</div> </div>
@ -1416,6 +2103,36 @@ export const SplitPanelLayout2Component: React.FC<SplitPanelLayout2ComponentProp
)} )}
</div> </div>
{/* 우측 패널 탭 */}
{config.rightPanel?.tabConfig?.enabled && rightTabs.length > 0 && selectedLeftItem && (
<div className="flex flex-wrap gap-2 border-b px-4 py-3">
{rightTabs.map((tab) => (
<button
key={tab.id}
onClick={() => setRightActiveTab(tab.id)}
className={cn(
"inline-flex items-center gap-2 rounded-lg border-2 px-4 py-2 text-sm font-medium transition-all",
rightActiveTab === tab.id
? "border-primary bg-primary/5 text-primary"
: "border-muted bg-background text-muted-foreground hover:border-primary/50 hover:text-foreground"
)}
>
<span>{tab.label}</span>
{config.rightPanel?.tabConfig?.showCount && (
<span
className={cn(
"rounded-full px-2 py-0.5 text-xs",
rightActiveTab === tab.id ? "bg-primary text-primary-foreground" : "bg-muted text-muted-foreground"
)}
>
{tab.count}
</span>
)}
</button>
))}
</div>
)}
{/* 내용 */} {/* 내용 */}
<div className="flex-1 overflow-auto p-4"> <div className="flex-1 overflow-auto p-4">
{!selectedLeftItem ? ( {!selectedLeftItem ? (

View File

@ -0,0 +1,163 @@
"use client";
import React, { useState, useEffect, useCallback } from "react";
import { Check, ChevronsUpDown, Search } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@/components/ui/command";
import { cn } from "@/lib/utils";
import { apiClient } from "@/lib/api/client";
export interface ColumnInfo {
column_name: string;
data_type: string;
column_comment?: string;
}
interface SearchableColumnSelectProps {
tableName: string;
value: string;
onValueChange: (value: string) => void;
placeholder?: string;
disabled?: boolean;
excludeColumns?: string[]; // 이미 선택된 컬럼 제외
className?: string;
}
export const SearchableColumnSelect: React.FC<SearchableColumnSelectProps> = ({
tableName,
value,
onValueChange,
placeholder = "컬럼 선택",
disabled = false,
excludeColumns = [],
className,
}) => {
const [open, setOpen] = useState(false);
const [columns, setColumns] = useState<ColumnInfo[]>([]);
const [loading, setLoading] = useState(false);
// 컬럼 목록 로드
const loadColumns = useCallback(async () => {
if (!tableName) {
setColumns([]);
return;
}
setLoading(true);
try {
const response = await apiClient.get(`/table-management/tables/${tableName}/columns?size=200`);
let columnList: any[] = [];
if (response.data?.success && response.data?.data?.columns) {
columnList = response.data.data.columns;
} else if (Array.isArray(response.data?.data?.columns)) {
columnList = response.data.data.columns;
} else if (Array.isArray(response.data?.data)) {
columnList = response.data.data;
} else if (Array.isArray(response.data)) {
columnList = response.data;
}
const transformedColumns = columnList.map((c: any) => ({
column_name: c.columnName ?? c.column_name ?? c.name ?? "",
data_type: c.dataType ?? c.data_type ?? c.type ?? "",
column_comment: c.displayName ?? c.column_comment ?? c.label ?? "",
}));
setColumns(transformedColumns);
} catch (error) {
console.error("컬럼 목록 로드 실패:", error);
setColumns([]);
} finally {
setLoading(false);
}
}, [tableName]);
useEffect(() => {
loadColumns();
}, [loadColumns]);
// 선택된 컬럼 정보 가져오기
const selectedColumn = columns.find((col) => col.column_name === value);
const displayValue = selectedColumn
? selectedColumn.column_comment || selectedColumn.column_name
: value || "";
// 필터링된 컬럼 목록 (이미 선택된 컬럼 제외)
const filteredColumns = columns.filter(
(col) => !excludeColumns.includes(col.column_name) || col.column_name === value
);
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={open}
disabled={disabled || loading || !tableName}
className={cn("w-full justify-between h-9 text-sm", className)}
>
{loading ? (
"로딩 중..."
) : !tableName ? (
"테이블을 먼저 선택하세요"
) : (
<span className="truncate">
{displayValue || placeholder}
</span>
)}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="w-full p-0" align="start" style={{ width: "var(--radix-popover-trigger-width)" }}>
<Command>
<CommandInput placeholder="컬럼명 또는 라벨 검색..." className="h-9" />
<CommandList>
<CommandEmpty>
{filteredColumns.length === 0 ? "선택 가능한 컬럼이 없습니다" : "검색 결과가 없습니다"}
</CommandEmpty>
<CommandGroup>
{filteredColumns.map((col) => (
<CommandItem
key={col.column_name}
value={`${col.column_name} ${col.column_comment || ""}`}
onSelect={() => {
onValueChange(col.column_name);
setOpen(false);
}}
>
<Check
className={cn(
"mr-2 h-4 w-4 shrink-0",
value === col.column_name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col min-w-0">
<span className="truncate font-medium">
{col.column_comment || col.column_name}
</span>
<span className="text-xs text-muted-foreground truncate">
{col.column_name} ({col.data_type})
</span>
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
);
};
export default SearchableColumnSelect;

View File

@ -0,0 +1,118 @@
"use client";
import React from "react";
import { useSortable } from "@dnd-kit/sortable";
import { CSS } from "@dnd-kit/utilities";
import { GripVertical, Settings, X } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils";
import type { ColumnConfig } from "../types";
interface SortableColumnItemProps {
id: string;
column: ColumnConfig;
index: number;
onSettingsClick: () => void;
onRemove: () => void;
showGroupingSettings?: boolean;
}
export const SortableColumnItem: React.FC<SortableColumnItemProps> = ({
id,
column,
index,
onSettingsClick,
onRemove,
showGroupingSettings = false,
}) => {
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id });
const style = {
transform: CSS.Transform.toString(transform),
transition,
};
return (
<div
ref={setNodeRef}
style={style}
className={cn(
"flex items-center gap-2 rounded-md border bg-card p-2",
isDragging && "opacity-50 shadow-lg"
)}
>
{/* 드래그 핸들 */}
<div
{...attributes}
{...listeners}
className="cursor-grab touch-none text-muted-foreground hover:text-foreground"
>
<GripVertical className="h-4 w-4" />
</div>
{/* 컬럼 정보 */}
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2">
<span className="text-sm font-medium truncate">
{column.label || column.name || `컬럼 ${index + 1}`}
</span>
{column.name && column.label && (
<span className="text-xs text-muted-foreground truncate">
({column.name})
</span>
)}
</div>
{/* 설정 요약 뱃지 */}
<div className="flex flex-wrap gap-1 mt-1">
{column.displayRow && (
<Badge variant="outline" className="text-[10px] h-4">
{column.displayRow === "name" ? "이름행" : "정보행"}
</Badge>
)}
{showGroupingSettings && column.displayConfig?.displayType === "badge" && (
<Badge variant="secondary" className="text-[10px] h-4">
</Badge>
)}
{showGroupingSettings && column.displayConfig?.aggregate?.enabled && (
<Badge variant="secondary" className="text-[10px] h-4">
{column.displayConfig.aggregate.function === "DISTINCT" ? "중복제거" : "개수"}
</Badge>
)}
{column.sourceTable && (
<Badge variant="outline" className="text-[10px] h-4">
{column.sourceTable}
</Badge>
)}
</div>
</div>
{/* 액션 버튼들 */}
<div className="flex items-center gap-1 shrink-0">
<Button
size="sm"
variant="ghost"
className="h-7 w-7 p-0"
onClick={onSettingsClick}
title="세부설정"
>
<Settings className="h-3.5 w-3.5" />
</Button>
<Button
size="sm"
variant="ghost"
className="h-7 w-7 p-0 text-destructive hover:text-destructive"
onClick={onRemove}
title="삭제"
>
<X className="h-3.5 w-3.5" />
</Button>
</div>
</div>
);
};
export default SortableColumnItem;

View File

@ -37,5 +37,13 @@ export type {
JoinConfig, JoinConfig,
DataTransferField, DataTransferField,
ColumnConfig, ColumnConfig,
ActionButtonConfig,
ValueSourceConfig,
EntityReferenceConfig,
ModalParamMapping,
} from "./types"; } from "./types";
// 모달 컴포넌트 내보내기 (별도 사용 필요시)
export { ColumnConfigModal } from "./ColumnConfigModal";
export { ActionButtonConfigModal } from "./ActionButtonConfigModal";

View File

@ -3,6 +3,65 @@
* - ( ) * - ( )
*/ */
// =============================================================================
// 값 소스 및 연동 설정
// =============================================================================
/**
* ( / )
*/
export interface ValueSourceConfig {
type: "none" | "field" | "dataForm" | "component"; // 소스 유형
fieldId?: string; // 필드 컴포넌트 ID
formId?: string; // 데이터폼 ID
formFieldName?: string; // 데이터폼 내 필드명
componentId?: string; // 다른 컴포넌트 ID
componentColumn?: string; // 컴포넌트에서 참조할 컬럼
}
/**
* ( )
*/
export interface EntityReferenceConfig {
entityId?: string; // 연결된 엔티티 ID
displayColumns?: string[]; // 표시할 엔티티 컬럼들 (체크박스 선택)
primaryDisplayColumn?: string; // 주 표시 컬럼
}
// =============================================================================
// 컬럼 표시 설정
// =============================================================================
/**
* ( )
*/
export interface ColumnDisplayConfig {
displayType: "text" | "badge"; // 표시 방식 (텍스트 또는 배지)
aggregate?: {
enabled: boolean; // 집계 사용 여부
function: "DISTINCT" | "COUNT"; // 집계 방식 (중복제거 또는 개수)
};
}
/**
* ( )
*/
export interface GroupingConfig {
enabled: boolean; // 그룹핑 사용 여부
groupByColumn: string; // 그룹 기준 컬럼 (예: item_id)
}
/**
*
*/
export interface TabConfig {
enabled: boolean; // 탭 사용 여부
mode?: "auto" | "manual"; // 하위 호환성용 (실제로는 manual만 사용)
tabSourceColumn?: string; // 탭 생성 기준 컬럼
showCount?: boolean; // 탭에 항목 개수 표시 여부
defaultTab?: string; // 기본 선택 탭 (값 또는 ID)
}
/** /**
* *
*/ */
@ -13,6 +72,9 @@ export interface ColumnConfig {
displayRow?: "name" | "info"; // 표시 위치 (name: 이름 행, info: 정보 행) displayRow?: "name" | "info"; // 표시 위치 (name: 이름 행, info: 정보 행)
width?: number; // 너비 (px) width?: number; // 너비 (px)
bold?: boolean; // 굵게 표시 bold?: boolean; // 굵게 표시
displayConfig?: ColumnDisplayConfig; // 컬럼별 표시 설정 (그룹핑 시)
entityReference?: EntityReferenceConfig; // 엔티티 참조 설정
valueSource?: ValueSourceConfig; // 값 소스 설정 (화면 내 연동)
format?: { format?: {
type?: "text" | "number" | "currency" | "date"; type?: "text" | "number" | "currency" | "date";
thousandSeparator?: boolean; thousandSeparator?: boolean;
@ -23,27 +85,58 @@ export interface ColumnConfig {
}; };
} }
/**
*
*/
export interface ModalParamMapping {
sourceColumn: string; // 선택된 항목에서 가져올 컬럼
targetParam: string; // 모달에 전달할 파라미터명
}
/** /**
* *
*/ */
export interface ActionButtonConfig { export interface ActionButtonConfig {
id: string; // 고유 ID id: string; // 고유 ID
label: string; // 버튼 라벨 label: string; // 버튼 라벨
variant?: "default" | "outline" | "destructive" | "ghost"; // 버튼 스타일 variant?: "default" | "secondary" | "outline" | "destructive" | "ghost"; // 버튼 스타일
icon?: string; // lucide 아이콘명 (예: "Plus", "Edit", "Trash2") icon?: string; // lucide 아이콘명 (예: "Plus", "Edit", "Trash2")
showCondition?: "always" | "selected" | "notSelected"; // 표시 조건
action?: "add" | "edit" | "delete" | "bulk-delete" | "api" | "custom"; // 버튼 동작 유형
// 모달 관련
modalScreenId?: number; // 연결할 모달 화면 ID modalScreenId?: number; // 연결할 모달 화면 ID
action?: "add" | "edit" | "delete" | "bulk-delete" | "custom"; // 버튼 동작 유형 modalParams?: ModalParamMapping[]; // 모달에 전달할 파라미터 매핑
// API 호출 관련
apiEndpoint?: string; // API 엔드포인트
apiMethod?: "GET" | "POST" | "PUT" | "DELETE"; // HTTP 메서드
confirmMessage?: string; // 확인 메시지 (삭제 등)
// 커스텀 액션
customActionId?: string; // 커스텀 액션 식별자
} }
/** /**
* *
*/ */
export interface DataTransferField { export interface DataTransferField {
sourceColumn: string; // 좌측 패널의 컬럼명 sourceColumn: string; // 소스 패널의 컬럼명
targetColumn: string; // 모달로 전달할 컬럼명 targetColumn: string; // 모달로 전달할 컬럼명
label?: string; // 표시용 라벨 label?: string; // 표시용 라벨
} }
/**
*
*
*/
export interface ButtonDataTransferConfig {
id: string; // 고유 ID
targetPanel: "left" | "right"; // 대상 패널
targetButtonId: string; // 대상 버튼 ID
fields: DataTransferField[]; // 전달할 필드 목록
}
/** /**
* *
*/ */
@ -62,15 +155,24 @@ export interface LeftPanelConfig {
searchColumn?: string; // 검색 대상 컬럼 (단일, 하위 호환성) searchColumn?: string; // 검색 대상 컬럼 (단일, 하위 호환성)
searchColumns?: SearchColumnConfig[]; // 검색 대상 컬럼들 (복수) searchColumns?: SearchColumnConfig[]; // 검색 대상 컬럼들 (복수)
showSearch?: boolean; // 검색 표시 여부 showSearch?: boolean; // 검색 표시 여부
showAddButton?: boolean; // 추가 버튼 표시 showAddButton?: boolean; // 추가 버튼 표시 (하위 호환성)
addButtonLabel?: string; // 추가 버튼 라벨 addButtonLabel?: string; // 추가 버튼 라벨 (하위 호환성)
addModalScreenId?: number; // 추가 모달 화면 ID addModalScreenId?: number; // 추가 모달 화면 ID (하위 호환성)
actionButtons?: ActionButtonConfig[]; // 복수 액션 버튼 배열
displayMode?: "card" | "table"; // 표시 모드 (card: 카드형, table: 테이블형)
primaryKeyColumn?: string; // 기본키 컬럼명 (선택용, 기본: id)
// 계층 구조 설정 // 계층 구조 설정
hierarchyConfig?: { hierarchyConfig?: {
enabled: boolean; enabled: boolean;
parentColumn: string; // 부모 참조 컬럼 (예: parent_dept_code) parentColumn: string; // 부모 참조 컬럼 (예: parent_dept_code)
idColumn: string; // ID 컬럼 (예: dept_code) idColumn: string; // ID 컬럼 (예: dept_code)
}; };
// 그룹핑 설정
grouping?: GroupingConfig;
// 탭 설정
tabConfig?: TabConfig;
// 추가 조인 테이블 설정 (다른 테이블 참조하여 컬럼 추가 표시)
joinTables?: JoinTableConfig[];
} }
/** /**
@ -106,6 +208,8 @@ export interface RightPanelConfig {
* - 결과: 부서별 , * - 결과: 부서별 ,
*/ */
joinTables?: JoinTableConfig[]; joinTables?: JoinTableConfig[];
// 탭 설정
tabConfig?: TabConfig;
} }
/** /**
@ -157,9 +261,12 @@ export interface SplitPanelLayout2Config {
// 조인 설정 // 조인 설정
joinConfig: JoinConfig; joinConfig: JoinConfig;
// 데이터 전달 설정 (모달로 전달할 필드) // 데이터 전달 설정 (하위 호환성 - 기본 설정)
dataTransferFields?: DataTransferField[]; dataTransferFields?: DataTransferField[];
// 버튼별 데이터 전달 설정 (신규)
buttonDataTransfers?: ButtonDataTransferConfig[];
// 레이아웃 설정 // 레이아웃 설정
splitRatio?: number; // 좌우 비율 (0-100, 기본 30) splitRatio?: number; // 좌우 비율 (0-100, 기본 30)
resizable?: boolean; // 크기 조절 가능 여부 resizable?: boolean; // 크기 조절 가능 여부

View File

@ -621,6 +621,14 @@ export function TableSectionRenderer({
if (col.defaultValue !== undefined && newItem[col.field] === undefined) { if (col.defaultValue !== undefined && newItem[col.field] === undefined) {
newItem[col.field] = col.defaultValue; newItem[col.field] = col.defaultValue;
} }
// 부모에서 값 받기 (receiveFromParent)
if (col.receiveFromParent) {
const parentField = col.parentFieldName || col.field;
if (formData[parentField] !== undefined) {
newItem[col.field] = formData[parentField];
}
}
} }
return newItem; return newItem;

View File

@ -4,6 +4,7 @@ import React, { useState, useEffect, useCallback } from "react";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label"; import { Label } from "@/components/ui/label";
import { Checkbox } from "@/components/ui/checkbox";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"; import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
@ -47,13 +48,24 @@ const HelpText = ({ children }: { children: React.ReactNode }) => (
<p className="text-[10px] text-muted-foreground mt-0.5">{children}</p> <p className="text-[10px] text-muted-foreground mt-0.5">{children}</p>
); );
export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFormModalConfigPanelProps) { // 부모 화면에서 전달 가능한 필드 타입
interface AvailableParentField {
name: string; // 필드명 (columnName)
label: string; // 표시 라벨
sourceComponent?: string; // 출처 컴포넌트 (예: "TableList", "SplitPanelLayout2")
sourceTable?: string; // 출처 테이블명
}
export function UniversalFormModalConfigPanel({ config, onChange, allComponents = [] }: UniversalFormModalConfigPanelProps) {
// 테이블 목록 // 테이블 목록
const [tables, setTables] = useState<{ name: string; label: string }[]>([]); const [tables, setTables] = useState<{ name: string; label: string }[]>([]);
const [tableColumns, setTableColumns] = useState<{ const [tableColumns, setTableColumns] = useState<{
[tableName: string]: { name: string; type: string; label: string }[]; [tableName: string]: { name: string; type: string; label: string }[];
}>({}); }>({});
// 부모 화면에서 전달 가능한 필드 목록
const [availableParentFields, setAvailableParentFields] = useState<AvailableParentField[]>([]);
// 채번규칙 목록 // 채번규칙 목록
const [numberingRules, setNumberingRules] = useState<{ id: string; name: string }[]>([]); const [numberingRules, setNumberingRules] = useState<{ id: string; name: string }[]>([]);
@ -71,6 +83,186 @@ export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFor
loadNumberingRules(); loadNumberingRules();
}, []); }, []);
// allComponents에서 부모 화면에서 전달 가능한 필드 추출
useEffect(() => {
const extractParentFields = async () => {
if (!allComponents || allComponents.length === 0) {
setAvailableParentFields([]);
return;
}
const fields: AvailableParentField[] = [];
for (const comp of allComponents) {
// 컴포넌트 타입 추출 (여러 위치에서 확인)
const compType = comp.componentId || comp.componentConfig?.type || comp.componentConfig?.id || comp.type;
const compConfig = comp.componentConfig || {};
// 1. TableList / InteractiveDataTable - 테이블 컬럼 추출
if (compType === "table-list" || compType === "interactive-data-table") {
const tableName = compConfig.selectedTable || compConfig.tableName;
if (tableName) {
// 테이블 컬럼 로드
try {
const response = await apiClient.get(`/table-management/tables/${tableName}/columns`);
const columns = response.data?.data?.columns;
if (response.data?.success && Array.isArray(columns)) {
columns.forEach((col: any) => {
const colName = col.columnName || col.column_name;
const colLabel = col.displayName || col.columnComment || col.column_comment || colName;
fields.push({
name: colName,
label: colLabel,
sourceComponent: "TableList",
sourceTable: tableName,
});
});
}
} catch (error) {
console.error(`테이블 컬럼 로드 실패 (${tableName}):`, error);
}
}
}
// 2. SplitPanelLayout2 - 데이터 전달 필드 및 소스 테이블 컬럼 추출
if (compType === "split-panel-layout2") {
// dataTransferFields 추출
const transferFields = compConfig.dataTransferFields;
if (transferFields && Array.isArray(transferFields)) {
transferFields.forEach((field: any) => {
if (field.targetColumn) {
fields.push({
name: field.targetColumn,
label: field.targetColumn,
sourceComponent: "SplitPanelLayout2",
sourceTable: compConfig.leftPanel?.tableName,
});
}
});
}
// 좌측 패널 테이블 컬럼도 추출
const leftTableName = compConfig.leftPanel?.tableName;
if (leftTableName) {
try {
const response = await apiClient.get(`/table-management/tables/${leftTableName}/columns`);
const columns = response.data?.data?.columns;
if (response.data?.success && Array.isArray(columns)) {
columns.forEach((col: any) => {
const colName = col.columnName || col.column_name;
const colLabel = col.displayName || col.columnComment || col.column_comment || colName;
// 중복 방지
if (!fields.some(f => f.name === colName && f.sourceTable === leftTableName)) {
fields.push({
name: colName,
label: colLabel,
sourceComponent: "SplitPanelLayout2 (좌측)",
sourceTable: leftTableName,
});
}
});
}
} catch (error) {
console.error(`테이블 컬럼 로드 실패 (${leftTableName}):`, error);
}
}
}
// 3. 기타 테이블 관련 컴포넌트
if (compType === "card-display" || compType === "simple-repeater-table") {
const tableName = compConfig.tableName || compConfig.initialDataConfig?.sourceTable;
if (tableName) {
try {
const response = await apiClient.get(`/table-management/tables/${tableName}/columns`);
const columns = response.data?.data?.columns;
if (response.data?.success && Array.isArray(columns)) {
columns.forEach((col: any) => {
const colName = col.columnName || col.column_name;
const colLabel = col.displayName || col.columnComment || col.column_comment || colName;
if (!fields.some(f => f.name === colName && f.sourceTable === tableName)) {
fields.push({
name: colName,
label: colLabel,
sourceComponent: compType,
sourceTable: tableName,
});
}
});
}
} catch (error) {
console.error(`테이블 컬럼 로드 실패 (${tableName}):`, error);
}
}
}
// 4. 버튼 컴포넌트 - openModalWithData의 fieldMappings/dataMapping에서 소스 컬럼 추출
if (compType === "button-primary" || compType === "button" || compType === "button-secondary") {
const action = compConfig.action || {};
// fieldMappings에서 소스 컬럼 추출
const fieldMappings = action.fieldMappings || [];
fieldMappings.forEach((mapping: any) => {
if (mapping.sourceColumn && !fields.some(f => f.name === mapping.sourceColumn)) {
fields.push({
name: mapping.sourceColumn,
label: mapping.sourceColumn,
sourceComponent: "Button (fieldMappings)",
sourceTable: action.sourceTableName,
});
}
});
// dataMapping에서 소스 컬럼 추출
const dataMapping = action.dataMapping || [];
dataMapping.forEach((mapping: any) => {
if (mapping.sourceColumn && !fields.some(f => f.name === mapping.sourceColumn)) {
fields.push({
name: mapping.sourceColumn,
label: mapping.sourceColumn,
sourceComponent: "Button (dataMapping)",
sourceTable: action.sourceTableName,
});
}
});
}
}
// 5. 현재 모달의 저장 테이블 컬럼도 추가 (부모에서 전달받을 수 있는 값들)
const currentTableName = config.saveConfig?.tableName;
if (currentTableName) {
try {
const response = await apiClient.get(`/table-management/tables/${currentTableName}/columns`);
const columns = response.data?.data?.columns;
if (response.data?.success && Array.isArray(columns)) {
columns.forEach((col: any) => {
const colName = col.columnName || col.column_name;
const colLabel = col.displayName || col.columnComment || col.column_comment || colName;
if (!fields.some(f => f.name === colName)) {
fields.push({
name: colName,
label: colLabel,
sourceComponent: "현재 폼 테이블",
sourceTable: currentTableName,
});
}
});
}
} catch (error) {
console.error(`현재 테이블 컬럼 로드 실패 (${currentTableName}):`, error);
}
}
// 중복 제거 (같은 name이면 첫 번째만 유지)
const uniqueFields = fields.filter((field, index, self) =>
index === self.findIndex(f => f.name === field.name)
);
setAvailableParentFields(uniqueFields);
};
extractParentFields();
}, [allComponents, config.saveConfig?.tableName]);
// 저장 테이블 변경 시 컬럼 로드 // 저장 테이블 변경 시 컬럼 로드
useEffect(() => { useEffect(() => {
if (config.saveConfig.tableName) { if (config.saveConfig.tableName) {
@ -84,9 +276,10 @@ export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFor
const data = response.data?.data; const data = response.data?.data;
if (response.data?.success && Array.isArray(data)) { if (response.data?.success && Array.isArray(data)) {
setTables( setTables(
data.map((t: { tableName?: string; table_name?: string; tableLabel?: string; table_label?: string }) => ({ data.map((t: { tableName?: string; table_name?: string; displayName?: string; tableLabel?: string; table_label?: string }) => ({
name: t.tableName || t.table_name || "", name: t.tableName || t.table_name || "",
label: t.tableLabel || t.table_label || t.tableName || t.table_name || "", // displayName 우선, 없으면 tableLabel, 그것도 없으면 테이블명
label: t.displayName || t.tableLabel || t.table_label || "",
})), })),
); );
} }
@ -334,6 +527,21 @@ export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFor
<HelpText> </HelpText> <HelpText> </HelpText>
</div> </div>
{/* 저장 버튼 표시 설정 */}
<div className="w-full min-w-0">
<div className="flex items-center gap-2">
<Checkbox
id="show-save-button"
checked={config.modal.showSaveButton !== false}
onCheckedChange={(checked) => updateModalConfig({ showSaveButton: checked === true })}
/>
<Label htmlFor="show-save-button" className="text-xs font-medium cursor-pointer">
</Label>
</div>
<HelpText> </HelpText>
</div>
<div className="space-y-3 w-full min-w-0"> <div className="space-y-3 w-full min-w-0">
<div className="w-full min-w-0"> <div className="w-full min-w-0">
<Label className="text-xs font-medium mb-1.5 block"> </Label> <Label className="text-xs font-medium mb-1.5 block"> </Label>
@ -604,6 +812,12 @@ export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFor
setSelectedField(field); setSelectedField(field);
setFieldDetailModalOpen(true); setFieldDetailModalOpen(true);
}} }}
tableName={config.saveConfig.tableName}
tableColumns={tableColumns[config.saveConfig.tableName || ""]?.map(col => ({
name: col.name,
type: col.type,
label: col.label || col.name
})) || []}
/> />
)} )}
@ -650,6 +864,9 @@ export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFor
tableColumns={tableColumns} tableColumns={tableColumns}
numberingRules={numberingRules} numberingRules={numberingRules}
onLoadTableColumns={loadTableColumns} onLoadTableColumns={loadTableColumns}
availableParentFields={availableParentFields}
targetTableName={config.saveConfig?.tableName}
targetTableColumns={config.saveConfig?.tableName ? tableColumns[config.saveConfig.tableName] || [] : []}
/> />
)} )}
@ -690,6 +907,7 @@ export function UniversalFormModalConfigPanel({ config, onChange }: UniversalFor
)} )}
onLoadTableColumns={loadTableColumns} onLoadTableColumns={loadTableColumns}
allSections={config.sections as FormSectionConfig[]} allSections={config.sections as FormSectionConfig[]}
availableParentFields={availableParentFields}
/> />
)} )}
</div> </div>

View File

@ -10,7 +10,16 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Di
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"; import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
import { ScrollArea } from "@/components/ui/scroll-area"; import { ScrollArea } from "@/components/ui/scroll-area";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { Plus, Trash2, Settings as SettingsIcon } from "lucide-react"; import { Plus, Trash2, Settings as SettingsIcon, Check, ChevronsUpDown } from "lucide-react";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@/components/ui/command";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { import {
FormFieldConfig, FormFieldConfig,
@ -36,6 +45,17 @@ const HelpText = ({ children }: { children: React.ReactNode }) => (
<p className="text-[10px] text-muted-foreground mt-0.5">{children}</p> <p className="text-[10px] text-muted-foreground mt-0.5">{children}</p>
); );
/**
*
* "부모에서 값 받기"
*/
export interface AvailableParentField {
name: string; // 필드명 (columnName)
label: string; // 표시 라벨
sourceComponent?: string; // 출처 컴포넌트 (예: "TableList", "SplitPanelLayout2")
sourceTable?: string; // 출처 테이블명
}
interface FieldDetailSettingsModalProps { interface FieldDetailSettingsModalProps {
open: boolean; open: boolean;
onOpenChange: (open: boolean) => void; onOpenChange: (open: boolean) => void;
@ -45,6 +65,11 @@ interface FieldDetailSettingsModalProps {
tableColumns: { [tableName: string]: { name: string; type: string; label: string }[] }; tableColumns: { [tableName: string]: { name: string; type: string; label: string }[] };
numberingRules: { id: string; name: string }[]; numberingRules: { id: string; name: string }[];
onLoadTableColumns: (tableName: string) => void; onLoadTableColumns: (tableName: string) => void;
// 부모 화면에서 전달 가능한 필드 목록 (선택사항)
availableParentFields?: AvailableParentField[];
// 저장 테이블 정보 (타겟 컬럼 선택용)
targetTableName?: string;
targetTableColumns?: { name: string; type: string; label: string }[];
} }
export function FieldDetailSettingsModal({ export function FieldDetailSettingsModal({
@ -56,13 +81,23 @@ export function FieldDetailSettingsModal({
tableColumns, tableColumns,
numberingRules, numberingRules,
onLoadTableColumns, onLoadTableColumns,
availableParentFields = [],
// targetTableName은 타겟 컬럼 선택 시 참고용으로 전달됨 (현재 targetTableColumns만 사용)
targetTableName: _targetTableName,
targetTableColumns = [],
}: FieldDetailSettingsModalProps) { }: FieldDetailSettingsModalProps) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
void _targetTableName; // 향후 사용 가능성을 위해 유지
// 로컬 상태로 필드 설정 관리 // 로컬 상태로 필드 설정 관리
const [localField, setLocalField] = useState<FormFieldConfig>(field); const [localField, setLocalField] = useState<FormFieldConfig>(field);
// 전체 카테고리 컬럼 목록 상태 // 전체 카테고리 컬럼 목록 상태
const [categoryColumns, setCategoryColumns] = useState<CategoryColumnOption[]>([]); const [categoryColumns, setCategoryColumns] = useState<CategoryColumnOption[]>([]);
const [loadingCategoryColumns, setLoadingCategoryColumns] = useState(false); const [loadingCategoryColumns, setLoadingCategoryColumns] = useState(false);
// Combobox 열림 상태
const [sourceTableOpen, setSourceTableOpen] = useState(false);
const [targetColumnOpenMap, setTargetColumnOpenMap] = useState<Record<number, boolean>>({});
// open이 변경될 때마다 필드 데이터 동기화 // open이 변경될 때마다 필드 데이터 동기화
useEffect(() => { useEffect(() => {
@ -293,6 +328,49 @@ export function FieldDetailSettingsModal({
/> />
</div> </div>
<HelpText> </HelpText> <HelpText> </HelpText>
{/* 부모에서 값 받기 활성화 시 필드 선택 */}
{localField.receiveFromParent && (
<div className="mt-3 space-y-2 p-3 rounded-md bg-blue-50 border border-blue-200">
<Label className="text-xs font-medium text-blue-700"> </Label>
{availableParentFields.length > 0 ? (
<Select
value={localField.parentFieldName || localField.columnName}
onValueChange={(value) => updateField({ parentFieldName: value })}
>
<SelectTrigger className="h-7 text-xs">
<SelectValue placeholder="필드 선택" />
</SelectTrigger>
<SelectContent>
{availableParentFields.map((pf) => (
<SelectItem key={pf.name} value={pf.name}>
<div className="flex flex-col">
<span>{pf.label || pf.name}</span>
{pf.sourceComponent && (
<span className="text-[9px] text-muted-foreground">
{pf.sourceComponent}{pf.sourceTable && ` (${pf.sourceTable})`}
</span>
)}
</div>
</SelectItem>
))}
</SelectContent>
</Select>
) : (
<div className="space-y-1">
<Input
value={localField.parentFieldName || ""}
onChange={(e) => updateField({ parentFieldName: e.target.value })}
placeholder={`예: ${localField.columnName || "parent_field_name"}`}
className="h-8 text-xs"
/>
<p className="text-[10px] text-muted-foreground">
. "{localField.columnName}" .
</p>
</div>
)}
</div>
)}
</div> </div>
{/* Accordion으로 고급 설정 */} {/* Accordion으로 고급 설정 */}
@ -472,12 +550,12 @@ export function FieldDetailSettingsModal({
<Label className="text-[10px]"> </Label> <Label className="text-[10px]"> </Label>
{selectTableColumns.length > 0 ? ( {selectTableColumns.length > 0 ? (
<Select <Select
value={localField.selectOptions?.saveColumn || ""} value={localField.selectOptions?.saveColumn || "__default__"}
onValueChange={(value) => onValueChange={(value) =>
updateField({ updateField({
selectOptions: { selectOptions: {
...localField.selectOptions, ...localField.selectOptions,
saveColumn: value, saveColumn: value === "__default__" ? "" : value,
}, },
}) })
} }
@ -486,7 +564,7 @@ export function FieldDetailSettingsModal({
<SelectValue placeholder="컬럼 선택 (미선택 시 조인 컬럼 저장)" /> <SelectValue placeholder="컬럼 선택 (미선택 시 조인 컬럼 저장)" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value=""> ()</SelectItem> <SelectItem value="__default__"> ()</SelectItem>
{selectTableColumns.map((col) => ( {selectTableColumns.map((col) => (
<SelectItem key={col.name} value={col.name}> <SelectItem key={col.name} value={col.name}>
{col.name} {col.name}
@ -592,29 +670,68 @@ export function FieldDetailSettingsModal({
<div className="space-y-3 pt-2 border-t"> <div className="space-y-3 pt-2 border-t">
<div> <div>
<Label className="text-[10px]"> </Label> <Label className="text-[10px]"> </Label>
<Select <Popover open={sourceTableOpen} onOpenChange={setSourceTableOpen}>
value={localField.linkedFieldGroup?.sourceTable || ""} <PopoverTrigger asChild>
onValueChange={(value) => { <Button
updateField({ variant="outline"
linkedFieldGroup: { role="combobox"
...localField.linkedFieldGroup, aria-expanded={sourceTableOpen}
sourceTable: value, className="h-7 w-full justify-between text-xs mt-1 font-normal"
}, >
}); {localField.linkedFieldGroup?.sourceTable
onLoadTableColumns(value); ? (() => {
}} const selectedTable = tables.find(
> (t) => t.name === localField.linkedFieldGroup?.sourceTable
<SelectTrigger className="h-7 text-xs mt-1"> );
<SelectValue placeholder="테이블 선택" /> return selectedTable
</SelectTrigger> ? `${selectedTable.label || selectedTable.name} (${selectedTable.name})`
<SelectContent> : localField.linkedFieldGroup?.sourceTable;
{tables.map((t) => ( })()
<SelectItem key={t.name} value={t.name}> : "테이블 선택..."}
{t.label || t.name} <ChevronsUpDown className="ml-2 h-3 w-3 shrink-0 opacity-50" />
</SelectItem> </Button>
))} </PopoverTrigger>
</SelectContent> <PopoverContent className="w-[300px] p-0" align="start">
</Select> <Command>
<CommandInput placeholder="테이블 검색..." className="h-8 text-xs" />
<CommandList>
<CommandEmpty className="py-2 text-xs text-center">
.
</CommandEmpty>
<CommandGroup>
{tables.map((t) => (
<CommandItem
key={t.name}
value={`${t.name} ${t.label || ""}`}
onSelect={() => {
updateField({
linkedFieldGroup: {
...localField.linkedFieldGroup,
sourceTable: t.name,
},
});
onLoadTableColumns(t.name);
setSourceTableOpen(false);
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
localField.linkedFieldGroup?.sourceTable === t.name
? "opacity-100"
: "opacity-0"
)}
/>
<span className="font-medium">{t.label || t.name}</span>
<span className="ml-1 text-muted-foreground">({t.name})</span>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
<HelpText> (: customer_mng)</HelpText> <HelpText> (: customer_mng)</HelpText>
</div> </div>
@ -763,14 +880,78 @@ export function FieldDetailSettingsModal({
<div> <div>
<Label className="text-[9px]"> ( )</Label> <Label className="text-[9px]"> ( )</Label>
<Input {targetTableColumns.length > 0 ? (
value={mapping.targetColumn || ""} <Popover
onChange={(e) => open={targetColumnOpenMap[index] || false}
updateLinkedFieldMapping(index, { targetColumn: e.target.value }) onOpenChange={(open) =>
} setTargetColumnOpenMap((prev) => ({ ...prev, [index]: open }))
placeholder="partner_id" }
className="h-6 text-[9px] mt-0.5" >
/> <PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={targetColumnOpenMap[index] || false}
className="h-6 w-full justify-between text-[9px] mt-0.5 font-normal"
>
{mapping.targetColumn
? (() => {
const selectedCol = targetTableColumns.find(
(c) => c.name === mapping.targetColumn
);
return selectedCol
? `${selectedCol.name} (${selectedCol.label})`
: mapping.targetColumn;
})()
: "컬럼 선택..."}
<ChevronsUpDown className="ml-1 h-3 w-3 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="w-[250px] p-0" align="start">
<Command>
<CommandInput placeholder="컬럼 검색..." className="h-7 text-[9px]" />
<CommandList>
<CommandEmpty className="py-2 text-[9px] text-center">
.
</CommandEmpty>
<CommandGroup>
{targetTableColumns.map((col) => (
<CommandItem
key={col.name}
value={`${col.name} ${col.label}`}
onSelect={() => {
updateLinkedFieldMapping(index, { targetColumn: col.name });
setTargetColumnOpenMap((prev) => ({ ...prev, [index]: false }));
}}
className="text-[9px]"
>
<Check
className={cn(
"mr-2 h-3 w-3",
mapping.targetColumn === col.name
? "opacity-100"
: "opacity-0"
)}
/>
<span className="font-medium">{col.name}</span>
<span className="ml-1 text-muted-foreground">({col.label})</span>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
) : (
<Input
value={mapping.targetColumn || ""}
onChange={(e) =>
updateLinkedFieldMapping(index, { targetColumn: e.target.value })
}
placeholder="partner_id"
className="h-6 text-[9px] mt-0.5"
/>
)}
</div> </div>
</div> </div>
))} ))}
@ -909,3 +1090,4 @@ export function FieldDetailSettingsModal({

View File

@ -11,7 +11,9 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Di
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"; import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
import { ScrollArea } from "@/components/ui/scroll-area"; import { ScrollArea } from "@/components/ui/scroll-area";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { Plus, Trash2, Database, Layers, Info } from "lucide-react"; import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
import { Plus, Trash2, Database, Layers, Info, Check, ChevronsUpDown } from "lucide-react";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { SaveConfig, SubTableSaveConfig, SubTableFieldMapping, FormSectionConfig, FormFieldConfig, SectionSaveMode } from "../types"; import { SaveConfig, SubTableSaveConfig, SubTableFieldMapping, FormSectionConfig, FormFieldConfig, SectionSaveMode } from "../types";
@ -50,6 +52,11 @@ export function SaveSettingsModal({
saveConfig.customApiSave?.enabled && saveConfig.customApiSave?.multiTable?.enabled ? "multi" : "single" saveConfig.customApiSave?.enabled && saveConfig.customApiSave?.multiTable?.enabled ? "multi" : "single"
); );
// 테이블 검색 Popover 상태
const [singleTableSearchOpen, setSingleTableSearchOpen] = useState(false);
const [mainTableSearchOpen, setMainTableSearchOpen] = useState(false);
const [subTableSearchOpen, setSubTableSearchOpen] = useState<Record<number, boolean>>({});
// open이 변경될 때마다 데이터 동기화 // open이 변경될 때마다 데이터 동기화
useEffect(() => { useEffect(() => {
if (open) { if (open) {
@ -217,8 +224,8 @@ export function SaveSettingsModal({
const repeatSections = sections.filter((s) => s.repeatable); const repeatSections = sections.filter((s) => s.repeatable);
// 모든 필드 목록 (반복 섹션 포함) // 모든 필드 목록 (반복 섹션 포함)
const getAllFields = (): { columnName: string; label: string; sectionTitle: string }[] => { const getAllFields = (): { columnName: string; label: string; sectionTitle: string; sectionId: string }[] => {
const fields: { columnName: string; label: string; sectionTitle: string }[] = []; const fields: { columnName: string; label: string; sectionTitle: string; sectionId: string }[] = [];
sections.forEach((section) => { sections.forEach((section) => {
// 필드 타입 섹션만 처리 (테이블 타입은 fields가 undefined) // 필드 타입 섹션만 처리 (테이블 타입은 fields가 undefined)
if (section.fields && Array.isArray(section.fields)) { if (section.fields && Array.isArray(section.fields)) {
@ -227,6 +234,7 @@ export function SaveSettingsModal({
columnName: field.columnName, columnName: field.columnName,
label: field.label, label: field.label,
sectionTitle: section.title, sectionTitle: section.title,
sectionId: section.id,
}); });
}); });
} }
@ -375,24 +383,68 @@ export function SaveSettingsModal({
<div> <div>
<Label className="text-[10px]"> </Label> <Label className="text-[10px]"> </Label>
<Select <Popover open={singleTableSearchOpen} onOpenChange={setSingleTableSearchOpen}>
value={localSaveConfig.tableName || ""} <PopoverTrigger asChild>
onValueChange={(value) => { <Button
updateSaveConfig({ tableName: value }); variant="outline"
onLoadTableColumns(value); role="combobox"
}} aria-expanded={singleTableSearchOpen}
> className="h-8 w-full justify-between text-xs mt-1 font-normal"
<SelectTrigger className="h-7 text-xs mt-1"> >
<SelectValue placeholder="테이블 선택" /> {localSaveConfig.tableName ? (
</SelectTrigger> <div className="flex flex-col items-start text-left">
<SelectContent> <span className="font-medium">{localSaveConfig.tableName}</span>
{tables.map((t) => ( {(() => {
<SelectItem key={t.name} value={t.name}> const tableLabel = tables.find(t => t.name === localSaveConfig.tableName)?.label;
{t.label || t.name} return tableLabel && tableLabel !== localSaveConfig.tableName ? (
</SelectItem> <span className="text-[10px] text-muted-foreground">{tableLabel}</span>
))} ) : null;
</SelectContent> })()}
</Select> </div>
) : (
<span className="text-muted-foreground"> ...</span>
)}
<ChevronsUpDown className="ml-2 h-3 w-3 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="p-0 w-[300px]" align="start">
<Command>
<CommandInput placeholder="테이블 검색..." className="text-xs" />
<CommandList className="max-h-[250px]">
<CommandEmpty className="text-xs py-4 text-center">
.
</CommandEmpty>
<CommandGroup>
{tables.map((t) => (
<CommandItem
key={t.name}
value={`${t.name} ${t.label}`}
onSelect={() => {
updateSaveConfig({ tableName: t.name });
onLoadTableColumns(t.name);
setSingleTableSearchOpen(false);
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
localSaveConfig.tableName === t.name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col">
<span className="font-medium">{t.name}</span>
{t.label && (
<span className="text-[10px] text-muted-foreground">{t.label}</span>
)}
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
<HelpText> </HelpText> <HelpText> </HelpText>
</div> </div>
@ -425,37 +477,81 @@ export function SaveSettingsModal({
<div> <div>
<Label className="text-[10px]"> </Label> <Label className="text-[10px]"> </Label>
<Select <Popover open={mainTableSearchOpen} onOpenChange={setMainTableSearchOpen}>
value={localSaveConfig.customApiSave?.multiTable?.mainTable?.tableName || ""} <PopoverTrigger asChild>
onValueChange={(value) => { <Button
updateSaveConfig({ variant="outline"
customApiSave: { role="combobox"
...localSaveConfig.customApiSave, aria-expanded={mainTableSearchOpen}
apiType: "multi-table", className="h-8 w-full justify-between text-xs mt-1 font-normal"
multiTable: { >
...localSaveConfig.customApiSave?.multiTable, {localSaveConfig.customApiSave?.multiTable?.mainTable?.tableName ? (
enabled: true, <div className="flex flex-col items-start text-left">
mainTable: { <span className="font-medium">{localSaveConfig.customApiSave.multiTable.mainTable.tableName}</span>
...localSaveConfig.customApiSave?.multiTable?.mainTable, {(() => {
tableName: value, const tableLabel = tables.find(t => t.name === localSaveConfig.customApiSave?.multiTable?.mainTable?.tableName)?.label;
}, return tableLabel && tableLabel !== localSaveConfig.customApiSave?.multiTable?.mainTable?.tableName ? (
}, <span className="text-[10px] text-muted-foreground">{tableLabel}</span>
}, ) : null;
}); })()}
onLoadTableColumns(value); </div>
}} ) : (
> <span className="text-muted-foreground"> ...</span>
<SelectTrigger className="h-7 text-xs mt-1"> )}
<SelectValue placeholder="테이블 선택" /> <ChevronsUpDown className="ml-2 h-3 w-3 shrink-0 opacity-50" />
</SelectTrigger> </Button>
<SelectContent> </PopoverTrigger>
{tables.map((t) => ( <PopoverContent className="p-0 w-[300px]" align="start">
<SelectItem key={t.name} value={t.name}> <Command>
{t.label || t.name} <CommandInput placeholder="테이블 검색..." className="text-xs" />
</SelectItem> <CommandList className="max-h-[250px]">
))} <CommandEmpty className="text-xs py-4 text-center">
</SelectContent> .
</Select> </CommandEmpty>
<CommandGroup>
{tables.map((t) => (
<CommandItem
key={t.name}
value={`${t.name} ${t.label}`}
onSelect={() => {
updateSaveConfig({
customApiSave: {
...localSaveConfig.customApiSave,
apiType: "multi-table",
multiTable: {
...localSaveConfig.customApiSave?.multiTable,
enabled: true,
mainTable: {
...localSaveConfig.customApiSave?.multiTable?.mainTable,
tableName: t.name,
},
},
},
});
onLoadTableColumns(t.name);
setMainTableSearchOpen(false);
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
localSaveConfig.customApiSave?.multiTable?.mainTable?.tableName === t.name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col">
<span className="font-medium">{t.name}</span>
{t.label && (
<span className="text-[10px] text-muted-foreground">{t.label}</span>
)}
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
<HelpText> (: orders, user_info)</HelpText> <HelpText> (: orders, user_info)</HelpText>
</div> </div>
@ -550,8 +646,8 @@ export function SaveSettingsModal({
return ( return (
<Accordion key={subIndex} type="single" collapsible> <Accordion key={subIndex} type="single" collapsible>
<AccordionItem value={`sub-${subIndex}`} className="border rounded-lg bg-orange-50/30"> <AccordionItem value={`sub-${subIndex}`} className="border rounded-lg bg-orange-50/30">
<AccordionTrigger className="px-3 py-2 text-xs hover:no-underline"> <div className="flex items-center justify-between px-3 py-2">
<div className="flex items-center justify-between flex-1"> <AccordionTrigger className="flex-1 text-xs hover:no-underline p-0">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className="font-medium"> <span className="font-medium">
{subIndex + 1}: {subTable.tableName || "(미설정)"} {subIndex + 1}: {subTable.tableName || "(미설정)"}
@ -560,40 +656,86 @@ export function SaveSettingsModal({
({subTable.fieldMappings?.length || 0} ) ({subTable.fieldMappings?.length || 0} )
</span> </span>
</div> </div>
<Button </AccordionTrigger>
size="sm" <button
variant="ghost" type="button"
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
removeSubTable(subIndex); removeSubTable(subIndex);
}} }}
className="h-5 w-5 p-0 text-destructive hover:text-destructive mr-2" className="h-5 w-5 p-0 text-destructive hover:text-destructive/80 ml-2 inline-flex items-center justify-center"
> >
<Trash2 className="h-3 w-3" /> <Trash2 className="h-3 w-3" />
</Button> </button>
</div> </div>
</AccordionTrigger>
<AccordionContent className="px-3 pb-3 space-y-3"> <AccordionContent className="px-3 pb-3 space-y-3">
<div> <div>
<Label className="text-[10px]"> </Label> <Label className="text-[10px]"> </Label>
<Select <Popover
value={subTable.tableName || ""} open={subTableSearchOpen[subIndex] || false}
onValueChange={(value) => { onOpenChange={(open) => setSubTableSearchOpen(prev => ({ ...prev, [subIndex]: open }))}
updateSubTable(subIndex, { tableName: value });
onLoadTableColumns(value);
}}
> >
<SelectTrigger className="h-7 text-xs mt-1"> <PopoverTrigger asChild>
<SelectValue placeholder="테이블 선택" /> <Button
</SelectTrigger> variant="outline"
<SelectContent> role="combobox"
{tables.map((t) => ( aria-expanded={subTableSearchOpen[subIndex] || false}
<SelectItem key={t.name} value={t.name}> className="h-8 w-full justify-between text-xs mt-1 font-normal"
{t.label || t.name} >
</SelectItem> {subTable.tableName ? (
))} <div className="flex flex-col items-start text-left">
</SelectContent> <span className="font-medium">{subTable.tableName}</span>
</Select> {(() => {
const tableLabel = tables.find(t => t.name === subTable.tableName)?.label;
return tableLabel && tableLabel !== subTable.tableName ? (
<span className="text-[10px] text-muted-foreground">{tableLabel}</span>
) : null;
})()}
</div>
) : (
<span className="text-muted-foreground"> ...</span>
)}
<ChevronsUpDown className="ml-2 h-3 w-3 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="p-0 w-[280px]" align="start">
<Command>
<CommandInput placeholder="테이블 검색..." className="text-xs" />
<CommandList className="max-h-[200px]">
<CommandEmpty className="text-xs py-4 text-center">
.
</CommandEmpty>
<CommandGroup>
{tables.map((t) => (
<CommandItem
key={t.name}
value={`${t.name} ${t.label}`}
onSelect={() => {
updateSubTable(subIndex, { tableName: t.name });
onLoadTableColumns(t.name);
setSubTableSearchOpen(prev => ({ ...prev, [subIndex]: false }));
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
subTable.tableName === t.name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col">
<span className="font-medium">{t.name}</span>
{t.label && (
<span className="text-[10px] text-muted-foreground">{t.label}</span>
)}
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
<HelpText> </HelpText> <HelpText> </HelpText>
</div> </div>
@ -755,8 +897,8 @@ export function SaveSettingsModal({
<SelectValue placeholder="필드 선택" /> <SelectValue placeholder="필드 선택" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
{allFields.map((field) => ( {allFields.map((field, fieldIndex) => (
<SelectItem key={field.columnName} value={field.columnName}> <SelectItem key={`${field.sectionId}-${field.columnName}-${fieldIndex}`} value={field.columnName}>
{field.label} ({field.sectionTitle}) {field.label} ({field.sectionTitle})
</SelectItem> </SelectItem>
))} ))}

View File

@ -11,7 +11,9 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, Di
import { ScrollArea } from "@/components/ui/scroll-area"; import { ScrollArea } from "@/components/ui/scroll-area";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
import { Badge } from "@/components/ui/badge"; import { Badge } from "@/components/ui/badge";
import { Plus, Trash2, GripVertical, ChevronUp, ChevronDown, Settings as SettingsIcon } from "lucide-react"; import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
import { Plus, Trash2, GripVertical, ChevronUp, ChevronDown, Settings as SettingsIcon, Check, ChevronsUpDown } from "lucide-react";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { FormSectionConfig, FormFieldConfig, OptionalFieldGroupConfig, FIELD_TYPE_OPTIONS } from "../types"; import { FormSectionConfig, FormFieldConfig, OptionalFieldGroupConfig, FIELD_TYPE_OPTIONS } from "../types";
import { defaultFieldConfig, generateFieldId, generateUniqueId } from "../config"; import { defaultFieldConfig, generateFieldId, generateUniqueId } from "../config";
@ -21,12 +23,22 @@ const HelpText = ({ children }: { children: React.ReactNode }) => (
<p className="text-[10px] text-muted-foreground mt-0.5">{children}</p> <p className="text-[10px] text-muted-foreground mt-0.5">{children}</p>
); );
// 테이블 컬럼 정보 타입
interface TableColumnInfo {
name: string;
type: string;
label: string;
}
interface SectionLayoutModalProps { interface SectionLayoutModalProps {
open: boolean; open: boolean;
onOpenChange: (open: boolean) => void; onOpenChange: (open: boolean) => void;
section: FormSectionConfig; section: FormSectionConfig;
onSave: (updates: Partial<FormSectionConfig>) => void; onSave: (updates: Partial<FormSectionConfig>) => void;
onOpenFieldDetail: (field: FormFieldConfig) => void; onOpenFieldDetail: (field: FormFieldConfig) => void;
// 저장 테이블의 컬럼 정보
tableName?: string;
tableColumns?: TableColumnInfo[];
} }
export function SectionLayoutModal({ export function SectionLayoutModal({
@ -35,8 +47,13 @@ export function SectionLayoutModal({
section, section,
onSave, onSave,
onOpenFieldDetail, onOpenFieldDetail,
tableName = "",
tableColumns = [],
}: SectionLayoutModalProps) { }: SectionLayoutModalProps) {
// 컬럼 선택 Popover 상태 (필드별)
const [columnSearchOpen, setColumnSearchOpen] = useState<Record<string, boolean>>({});
// 로컬 상태로 섹션 관리 (fields가 없으면 빈 배열로 초기화) // 로컬 상태로 섹션 관리 (fields가 없으면 빈 배열로 초기화)
const [localSection, setLocalSection] = useState<FormSectionConfig>(() => ({ const [localSection, setLocalSection] = useState<FormSectionConfig>(() => ({
...section, ...section,
@ -443,11 +460,90 @@ export function SectionLayoutModal({
</div> </div>
<div> <div>
<Label className="text-[9px]"></Label> <Label className="text-[9px]"></Label>
<Input {tableColumns.length > 0 ? (
value={field.columnName} <Popover
onChange={(e) => updateField(field.id, { columnName: e.target.value })} open={columnSearchOpen[field.id] || false}
className="h-6 text-[9px] mt-0.5" onOpenChange={(open) => setColumnSearchOpen(prev => ({ ...prev, [field.id]: open }))}
/> >
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={columnSearchOpen[field.id] || false}
className="h-6 w-full justify-between text-[9px] mt-0.5 font-normal"
>
{field.columnName ? (
<div className="flex flex-col items-start text-left truncate">
<span className="font-medium truncate">{field.columnName}</span>
{(() => {
const col = tableColumns.find(c => c.name === field.columnName);
return col?.label && col.label !== field.columnName ? (
<span className="text-[8px] text-muted-foreground truncate">({col.label})</span>
) : null;
})()}
</div>
) : (
<span className="text-muted-foreground"> ...</span>
)}
<ChevronsUpDown className="ml-1 h-3 w-3 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="p-0 w-[280px]" align="start">
<Command>
<CommandInput placeholder="컬럼 검색..." className="text-xs" />
<CommandList className="max-h-[200px]">
<CommandEmpty className="text-xs py-3 text-center">
.
</CommandEmpty>
<CommandGroup>
{tableColumns.map((col) => (
<CommandItem
key={col.name}
value={`${col.name} ${col.label}`}
onSelect={() => {
updateField(field.id, {
columnName: col.name,
// 라벨이 기본값이면 컬럼 라벨로 자동 설정
...(field.label.startsWith("새 필드") || field.label.startsWith("field_")
? { label: col.label || col.name }
: {})
});
setColumnSearchOpen(prev => ({ ...prev, [field.id]: false }));
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
field.columnName === col.name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col">
<div className="flex items-center gap-1">
<span className="font-medium">{col.name}</span>
{col.label && col.label !== col.name && (
<span className="text-muted-foreground">({col.label})</span>
)}
</div>
{tableName && (
<span className="text-[9px] text-muted-foreground">{tableName}</span>
)}
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
) : (
<Input
value={field.columnName}
onChange={(e) => updateField(field.id, { columnName: e.target.value })}
className="h-6 text-[9px] mt-0.5"
placeholder="저장 테이블을 먼저 설정하세요"
/>
)}
</div> </div>
</div> </div>
@ -821,24 +917,106 @@ export function SectionLayoutModal({
className="h-5 text-[8px]" className="h-5 text-[8px]"
placeholder="라벨" placeholder="라벨"
/> />
<Input {tableColumns.length > 0 ? (
value={field.columnName} <Popover
onChange={(e) => { open={columnSearchOpen[`opt-${field.id}`] || false}
const newGroups = localSection.optionalFieldGroups?.map((g) => onOpenChange={(open) => setColumnSearchOpen(prev => ({ ...prev, [`opt-${field.id}`]: open }))}
g.id === group.id >
? { <PopoverTrigger asChild>
...g, <Button
fields: g.fields.map((f) => variant="outline"
f.id === field.id ? { ...f, columnName: e.target.value } : f role="combobox"
), className="h-6 w-full justify-between text-[8px] font-normal px-1"
} >
: g {field.columnName ? (
); <div className="flex flex-col items-start text-left truncate">
updateSection({ optionalFieldGroups: newGroups }); <span className="font-medium truncate">{field.columnName}</span>
}} {(() => {
className="h-5 text-[8px]" const col = tableColumns.find(c => c.name === field.columnName);
placeholder="컬럼명" return col?.label && col.label !== field.columnName ? (
/> <span className="text-[7px] text-muted-foreground truncate">({col.label})</span>
) : null;
})()}
</div>
) : (
<span className="text-muted-foreground">...</span>
)}
<ChevronsUpDown className="h-2.5 w-2.5 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="p-0 w-[250px]" align="start">
<Command>
<CommandInput placeholder="컬럼 검색..." className="text-xs" />
<CommandList className="max-h-[180px]">
<CommandEmpty className="text-xs py-2 text-center">
.
</CommandEmpty>
<CommandGroup>
{tableColumns.map((col) => (
<CommandItem
key={col.name}
value={`${col.name} ${col.label}`}
onSelect={() => {
const newGroups = localSection.optionalFieldGroups?.map((g) =>
g.id === group.id
? {
...g,
fields: g.fields.map((f) =>
f.id === field.id
? {
...f,
columnName: col.name,
...(f.label.startsWith("필드 ") ? { label: col.label || col.name } : {})
}
: f
),
}
: g
);
updateSection({ optionalFieldGroups: newGroups });
setColumnSearchOpen(prev => ({ ...prev, [`opt-${field.id}`]: false }));
}}
className="text-[9px]"
>
<Check
className={cn(
"mr-1 h-2.5 w-2.5",
field.columnName === col.name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col">
<span className="font-medium">{col.name}</span>
{col.label && col.label !== col.name && (
<span className="text-[8px] text-muted-foreground">({col.label})</span>
)}
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
) : (
<Input
value={field.columnName}
onChange={(e) => {
const newGroups = localSection.optionalFieldGroups?.map((g) =>
g.id === group.id
? {
...g,
fields: g.fields.map((f) =>
f.id === field.id ? { ...f, columnName: e.target.value } : f
),
}
: g
);
updateSection({ optionalFieldGroups: newGroups });
}}
className="h-5 text-[8px]"
placeholder="컬럼명"
/>
)}
<Select <Select
value={field.fieldType} value={field.fieldType}
onValueChange={(value) => { onValueChange={(value) => {

View File

@ -48,6 +48,14 @@ const HelpText = ({ children }: { children: React.ReactNode }) => (
<p className="text-[10px] text-muted-foreground mt-0.5">{children}</p> <p className="text-[10px] text-muted-foreground mt-0.5">{children}</p>
); );
// 부모 화면에서 전달 가능한 필드 타입
interface AvailableParentField {
name: string; // 필드명 (columnName)
label: string; // 표시 라벨
sourceComponent?: string; // 출처 컴포넌트
sourceTable?: string; // 출처 테이블명
}
// 컬럼 설정 아이템 컴포넌트 // 컬럼 설정 아이템 컴포넌트
interface ColumnSettingItemProps { interface ColumnSettingItemProps {
col: TableColumnConfig; col: TableColumnConfig;
@ -62,6 +70,7 @@ interface ColumnSettingItemProps {
sections: { id: string; title: string }[]; // 섹션 목록 sections: { id: string; title: string }[]; // 섹션 목록
formFields: { columnName: string; label: string; sectionId?: string }[]; // 폼 필드 목록 formFields: { columnName: string; label: string; sectionId?: string }[]; // 폼 필드 목록
tableConfig: TableSectionConfig; // 현재 행 필드 목록 표시용 tableConfig: TableSectionConfig; // 현재 행 필드 목록 표시용
availableParentFields?: AvailableParentField[]; // 부모 화면에서 전달 가능한 필드 목록
onLoadTableColumns: (tableName: string) => void; onLoadTableColumns: (tableName: string) => void;
onUpdate: (updates: Partial<TableColumnConfig>) => void; onUpdate: (updates: Partial<TableColumnConfig>) => void;
onMoveUp: () => void; onMoveUp: () => void;
@ -82,6 +91,7 @@ function ColumnSettingItem({
sections, sections,
formFields, formFields,
tableConfig, tableConfig,
availableParentFields = [],
onLoadTableColumns, onLoadTableColumns,
onUpdate, onUpdate,
onMoveUp, onMoveUp,
@ -90,6 +100,7 @@ function ColumnSettingItem({
}: ColumnSettingItemProps) { }: ColumnSettingItemProps) {
const [fieldSearchOpen, setFieldSearchOpen] = useState(false); const [fieldSearchOpen, setFieldSearchOpen] = useState(false);
const [sourceFieldSearchOpen, setSourceFieldSearchOpen] = useState(false); const [sourceFieldSearchOpen, setSourceFieldSearchOpen] = useState(false);
const [parentFieldSearchOpen, setParentFieldSearchOpen] = useState(false);
const [lookupTableOpenMap, setLookupTableOpenMap] = useState<Record<string, boolean>>({}); const [lookupTableOpenMap, setLookupTableOpenMap] = useState<Record<string, boolean>>({});
// 조회 옵션 추가 // 조회 옵션 추가
@ -402,6 +413,14 @@ function ColumnSettingItem({
/> />
<span></span> <span></span>
</label> </label>
<label className="flex items-center gap-2 text-xs cursor-pointer" title="부모 화면에서 전달받은 값을 모든 행에 적용">
<Switch
checked={col.receiveFromParent ?? false}
onCheckedChange={(checked) => onUpdate({ receiveFromParent: checked })}
className="scale-75"
/>
<span className="text-blue-600"></span>
</label>
<label className="flex items-center gap-2 text-xs cursor-pointer"> <label className="flex items-center gap-2 text-xs cursor-pointer">
<Switch <Switch
checked={col.lookup?.enabled ?? false} checked={col.lookup?.enabled ?? false}
@ -432,6 +451,103 @@ function ColumnSettingItem({
)} )}
</div> </div>
{/* 부모에서 값 받기 설정 (부모값 ON일 때만 표시) */}
{col.receiveFromParent && (
<div className="border-t pt-3 mt-3 space-y-2">
<Label className="text-xs font-medium text-blue-600"> </Label>
<p className="text-[10px] text-muted-foreground">
. .
</p>
{availableParentFields.length > 0 ? (
<Popover open={parentFieldSearchOpen} onOpenChange={setParentFieldSearchOpen}>
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={parentFieldSearchOpen}
className="h-8 w-full justify-between text-xs"
>
<span className="truncate">
{col.parentFieldName
? availableParentFields.find(f => f.name === col.parentFieldName)?.label || col.parentFieldName
: `(기본: ${col.field})`}
</span>
<ChevronsUpDown className="ml-1 h-3 w-3 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="p-0 w-[300px]" align="start">
<Command>
<CommandInput placeholder="부모 필드 검색..." className="text-xs" />
<CommandList className="max-h-[250px]">
<CommandEmpty className="text-xs py-4 text-center">
.
</CommandEmpty>
<CommandGroup>
{/* 기본값 (필드명과 동일) */}
<CommandItem
value="__same_as_field__"
onSelect={() => {
onUpdate({ parentFieldName: undefined });
setParentFieldSearchOpen(false);
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
!col.parentFieldName ? "opacity-100" : "opacity-0"
)}
/>
<span className="text-muted-foreground">(: {col.field})</span>
</CommandItem>
{/* 부모 필드 목록 */}
{availableParentFields.map((pf) => (
<CommandItem
key={pf.name}
value={`${pf.name} ${pf.label}`}
onSelect={() => {
onUpdate({ parentFieldName: pf.name });
setParentFieldSearchOpen(false);
}}
className="text-xs"
>
<Check
className={cn(
"mr-2 h-3 w-3",
col.parentFieldName === pf.name ? "opacity-100" : "opacity-0"
)}
/>
<div className="flex flex-col flex-1 min-w-0">
<span className="font-medium truncate">{pf.label || pf.name}</span>
{pf.sourceComponent && (
<span className="text-[10px] text-muted-foreground truncate">
{pf.sourceComponent}{pf.sourceTable && ` (${pf.sourceTable})`}
</span>
)}
</div>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
) : (
<div className="space-y-1">
<Input
value={col.parentFieldName || ""}
onChange={(e) => onUpdate({ parentFieldName: e.target.value })}
placeholder={col.field}
className="h-8 text-xs"
/>
<p className="text-[10px] text-muted-foreground">
"{col.field}" .
</p>
</div>
)}
</div>
)}
{/* 조회 설정 (조회 ON일 때만 표시) */} {/* 조회 설정 (조회 ON일 때만 표시) */}
{col.lookup?.enabled && ( {col.lookup?.enabled && (
<div className="border-t pt-3 mt-3 space-y-3"> <div className="border-t pt-3 mt-3 space-y-3">
@ -1119,6 +1235,8 @@ interface TableSectionSettingsModalProps {
onLoadCategoryList?: () => void; onLoadCategoryList?: () => void;
// 전체 섹션 목록 (다른 섹션 필드 참조용) // 전체 섹션 목록 (다른 섹션 필드 참조용)
allSections?: FormSectionConfig[]; allSections?: FormSectionConfig[];
// 부모 화면에서 전달 가능한 필드 목록
availableParentFields?: AvailableParentField[];
} }
export function TableSectionSettingsModal({ export function TableSectionSettingsModal({
@ -1132,6 +1250,7 @@ export function TableSectionSettingsModal({
categoryList = [], categoryList = [],
onLoadCategoryList, onLoadCategoryList,
allSections = [], allSections = [],
availableParentFields = [],
}: TableSectionSettingsModalProps) { }: TableSectionSettingsModalProps) {
// 로컬 상태 // 로컬 상태
const [title, setTitle] = useState(section.title); const [title, setTitle] = useState(section.title);
@ -1693,6 +1812,7 @@ export function TableSectionSettingsModal({
sections={otherSections} sections={otherSections}
formFields={otherSectionFields} formFields={otherSectionFields}
tableConfig={tableConfig} tableConfig={tableConfig}
availableParentFields={availableParentFields}
onLoadTableColumns={onLoadTableColumns} onLoadTableColumns={onLoadTableColumns}
onUpdate={(updates) => updateColumn(index, updates)} onUpdate={(updates) => updateColumn(index, updates)}
onMoveUp={() => moveColumn(index, "up")} onMoveUp={() => moveColumn(index, "up")}

View File

@ -335,6 +335,10 @@ export interface TableColumnConfig {
// 날짜 일괄 적용 (type이 "date"일 때만 사용) // 날짜 일괄 적용 (type이 "date"일 때만 사용)
// 활성화 시 첫 번째 날짜 입력 시 모든 행에 동일한 날짜가 자동 적용됨 // 활성화 시 첫 번째 날짜 입력 시 모든 행에 동일한 날짜가 자동 적용됨
batchApply?: boolean; batchApply?: boolean;
// 부모에서 값 받기 (모든 행에 동일한 값 적용)
receiveFromParent?: boolean; // 부모에서 값 받기 활성화
parentFieldName?: string; // 부모 필드명 (미지정 시 field와 동일)
} }
// ============================================ // ============================================
@ -705,6 +709,8 @@ export interface UniversalFormModalComponentProps {
export interface UniversalFormModalConfigPanelProps { export interface UniversalFormModalConfigPanelProps {
config: UniversalFormModalConfig; config: UniversalFormModalConfig;
onChange: (config: UniversalFormModalConfig) => void; onChange: (config: UniversalFormModalConfig) => void;
// 화면 설계 시 같은 화면의 다른 컴포넌트들 (부모 데이터 필드 추출용)
allComponents?: any[];
} }
// 필드 타입 옵션 // 필드 타입 옵션

View File

@ -162,7 +162,6 @@ export interface ComponentConfig {
showLabel?: boolean; // 레이블 표시 여부 ("서명:", "(인)") showLabel?: boolean; // 레이블 표시 여부 ("서명:", "(인)")
labelText?: string; // 커스텀 레이블 텍스트 labelText?: string; // 커스텀 레이블 텍스트
labelPosition?: "top" | "left" | "bottom" | "right"; // 레이블 위치 labelPosition?: "top" | "left" | "bottom" | "right"; // 레이블 위치
showUnderline?: boolean; // 서명란 밑줄 표시 여부
personName?: string; // 도장란 이름 (예: "홍길동") personName?: string; // 도장란 이름 (예: "홍길동")
// 테이블 전용 // 테이블 전용
tableColumns?: Array<{ tableColumns?: Array<{
@ -237,6 +236,7 @@ export interface ReportDetail {
report: ReportMaster; report: ReportMaster;
layout: ReportLayout | null; layout: ReportLayout | null;
queries: ReportQuery[]; queries: ReportQuery[];
menuObjids?: number[]; // 연결된 메뉴 ID 목록
} }
// 리포트 목록 응답 // 리포트 목록 응답
@ -288,6 +288,7 @@ export interface SaveLayoutRequest {
parameters: string[]; parameters: string[];
externalConnectionId?: number; externalConnectionId?: number;
}>; }>;
menuObjids?: number[]; // 연결할 메뉴 ID 목록
// 하위 호환성 (deprecated) // 하위 호환성 (deprecated)
canvasWidth?: number; canvasWidth?: number;