Compare commits

..

No commits in common. "7bbe88d7ae8ebdec80fc797e4537b4c85a9a6387" and "ff4646d81639ba4bc03b2b681a3bccae53f1a87f" have entirely different histories.

4 changed files with 186 additions and 217 deletions

View File

@ -52,8 +52,9 @@ export default function ScreenViewPage() {
modalDescription?: string; modalDescription?: string;
}>({}); }>({});
const containerRef = React.useRef<HTMLDivElement>(null); // 자동 스케일 조정 (사용자 화면 크기에 맞춤)
const [scale, setScale] = useState(1); const [scale, setScale] = useState(1);
const containerRef = React.useRef<HTMLDivElement>(null);
useEffect(() => { useEffect(() => {
const initComponents = async () => { const initComponents = async () => {
@ -139,37 +140,32 @@ export default function ScreenViewPage() {
} }
}, [screenId]); }, [screenId]);
// 캔버스 비율 조정 (사용자 화면에 맞게 자동 스케일) // 자동 스케일 조정 useEffect (항상 화면에 꽉 차게)
useEffect(() => { useEffect(() => {
const updateScale = () => { const updateScale = () => {
if (containerRef.current && layout) { if (containerRef.current && layout) {
const designWidth = layout?.screenResolution?.width || 1200; const screenWidth = layout?.screenResolution?.width || 1200;
const designHeight = layout?.screenResolution?.height || 800;
const containerWidth = containerRef.current.offsetWidth; const containerWidth = containerRef.current.offsetWidth;
const containerHeight = containerRef.current.offsetHeight; const availableWidth = containerWidth - 32; // 좌우 패딩 16px * 2
// 가로/세로 비율 중 작은 것을 선택 (화면에 맞게) // 항상 화면에 맞춰서 스케일 조정 (늘리거나 줄임)
const scaleX = containerWidth / designWidth; const newScale = availableWidth / screenWidth;
const scaleY = containerHeight / designHeight;
const newScale = Math.min(scaleX, scaleY);
console.log("📏 캔버스 스케일 계산:", { console.log("📏 스케일 계산 (화면 꽉 차게):", {
designWidth, screenWidth,
designHeight,
containerWidth, containerWidth,
containerHeight, availableWidth,
scaleX, scale: newScale,
scaleY,
finalScale: newScale,
}); });
setScale(newScale); setScale(newScale);
} }
}; };
// 초기 측정 // 초기 측정 (DOM이 완전히 렌더링된 후)
const timer = setTimeout(updateScale, 100); const timer = setTimeout(() => {
updateScale();
}, 100);
window.addEventListener("resize", updateScale); window.addEventListener("resize", updateScale);
return () => { return () => {
@ -211,16 +207,17 @@ export default function ScreenViewPage() {
const screenHeight = layout?.screenResolution?.height || 800; const screenHeight = layout?.screenResolution?.height || 800;
return ( return (
<div ref={containerRef} className="bg-background flex h-full w-full items-start justify-start overflow-hidden"> <div ref={containerRef} className="bg-background flex h-full w-full flex-col overflow-hidden">
{/* 절대 위치 기반 렌더링 */} {/* 절대 위치 기반 렌더링 */}
{layout && layout.components.length > 0 ? ( {layout && layout.components.length > 0 ? (
<div <div
className="bg-background relative origin-top-left" className="bg-background relative flex-1"
style={{ style={{
width: layout?.screenResolution?.width || 1200, width: screenWidth,
height: layout?.screenResolution?.height || 800, height: "100%",
transform: `scale(${scale})`, transform: `scale(${scale})`,
transformOrigin: "top left", transformOrigin: "top left",
overflow: "hidden",
display: "flex", display: "flex",
flexDirection: "column", flexDirection: "column",
}} }}

View File

@ -334,7 +334,7 @@ export const InteractiveScreenViewer: React.FC<InteractiveScreenViewerProps> = (
console.log("🔍 InteractiveScreenViewer 최종 flowComponent:", flowComponent); console.log("🔍 InteractiveScreenViewer 최종 flowComponent:", flowComponent);
return ( return (
<div className="w-full"> <div className="h-full w-full">
<FlowWidget component={flowComponent as any} /> <FlowWidget component={flowComponent as any} />
</div> </div>
); );

View File

@ -34,7 +34,7 @@ interface RealtimePreviewProps {
onZoneComponentDrop?: (e: React.DragEvent, zoneId: string, layoutId: string) => void; // 존별 드롭 핸들러 onZoneComponentDrop?: (e: React.DragEvent, zoneId: string, layoutId: string) => void; // 존별 드롭 핸들러
onZoneClick?: (zoneId: string) => void; // 존 클릭 핸들러 onZoneClick?: (zoneId: string) => void; // 존 클릭 핸들러
onConfigChange?: (config: any) => void; // 설정 변경 핸들러 onConfigChange?: (config: any) => void; // 설정 변경 핸들러
// 버튼 액션을 위한 props // 버튼 액션을 위한 props
screenId?: number; screenId?: number;
tableName?: string; tableName?: string;
@ -47,7 +47,7 @@ interface RealtimePreviewProps {
onRefresh?: () => void; onRefresh?: () => void;
flowRefreshKey?: number; flowRefreshKey?: number;
onFlowRefresh?: () => void; onFlowRefresh?: () => void;
// 폼 데이터 관련 props // 폼 데이터 관련 props
formData?: Record<string, any>; formData?: Record<string, any>;
onFormDataChange?: (fieldName: string, value: any) => void; onFormDataChange?: (fieldName: string, value: any) => void;
@ -115,24 +115,24 @@ export const RealtimePreviewDynamic: React.FC<RealtimePreviewProps> = ({
// 플로우 위젯의 실제 높이 측정 // 플로우 위젯의 실제 높이 측정
React.useEffect(() => { React.useEffect(() => {
const isFlowWidget = component.type === "component" && (component as any).componentType === "flow-widget"; const isFlowWidget = component.type === "component" && (component as any).componentType === "flow-widget";
if (isFlowWidget && contentRef.current) { if (isFlowWidget && contentRef.current) {
const measureHeight = () => { const measureHeight = () => {
if (contentRef.current) { if (contentRef.current) {
// getBoundingClientRect()로 실제 렌더링된 높이 측정 // getBoundingClientRect()로 실제 렌더링된 높이 측정
const rect = contentRef.current.getBoundingClientRect(); const rect = contentRef.current.getBoundingClientRect();
const measured = rect.height; const measured = rect.height;
// scrollHeight도 함께 확인하여 더 큰 값 사용 // scrollHeight도 함께 확인하여 더 큰 값 사용
const scrollHeight = contentRef.current.scrollHeight; const scrollHeight = contentRef.current.scrollHeight;
const rawHeight = Math.max(measured, scrollHeight); const rawHeight = Math.max(measured, scrollHeight);
// 40px 단위로 올림 // 40px 단위로 올림
const finalHeight = Math.ceil(rawHeight / 40) * 40; const finalHeight = Math.ceil(rawHeight / 40) * 40;
if (finalHeight > 0 && Math.abs(finalHeight - (actualHeight || 0)) > 10) { if (finalHeight > 0 && Math.abs(finalHeight - (actualHeight || 0)) > 10) {
setActualHeight(finalHeight); setActualHeight(finalHeight);
// 컴포넌트의 실제 size.height도 업데이트 (중복 업데이트 방지) // 컴포넌트의 실제 size.height도 업데이트 (중복 업데이트 방지)
if (onConfigChange && finalHeight !== lastUpdatedHeight.current && finalHeight !== component.size?.height) { if (onConfigChange && finalHeight !== lastUpdatedHeight.current && finalHeight !== component.size?.height) {
lastUpdatedHeight.current = finalHeight; lastUpdatedHeight.current = finalHeight;
@ -142,11 +142,11 @@ export const RealtimePreviewDynamic: React.FC<RealtimePreviewProps> = ({
newHeight: finalHeight, newHeight: finalHeight,
}); });
// size는 별도 속성이므로 직접 업데이트 // size는 별도 속성이므로 직접 업데이트
const event = new CustomEvent("updateComponentSize", { const event = new CustomEvent('updateComponentSize', {
detail: { detail: {
componentId: component.id, componentId: component.id,
height: finalHeight, height: finalHeight
}, }
}); });
window.dispatchEvent(event); window.dispatchEvent(event);
} }
@ -276,10 +276,10 @@ export const RealtimePreviewDynamic: React.FC<RealtimePreviewProps> = ({
> >
{/* 동적 컴포넌트 렌더링 */} {/* 동적 컴포넌트 렌더링 */}
<div <div
ref={ ref={component.type === "component" && (component as any).componentType === "flow-widget" ? contentRef : undefined}
component.type === "component" && (component as any).componentType === "flow-widget" ? contentRef : undefined className={`${component.type === "component" && (component as any).componentType === "flow-widget" ? "h-auto" : "h-full"} w-full max-w-full ${
} component.componentConfig?.type === "table-list" ? "overflow-hidden" : "overflow-visible"
className={`${component.type === "component" && (component as any).componentType === "flow-widget" ? "h-auto" : "h-full"} w-full max-w-full overflow-visible`} }`}
> >
<DynamicComponentRenderer <DynamicComponentRenderer
component={component} component={component}

View File

@ -9,7 +9,6 @@ import { getFlowById, getAllStepCounts, getStepDataList, getFlowAuditLogs } from
import type { FlowDefinition, FlowStep, FlowAuditLog } from "@/types/flow"; import type { FlowDefinition, FlowStep, FlowAuditLog } from "@/types/flow";
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
import { Checkbox } from "@/components/ui/checkbox"; import { Checkbox } from "@/components/ui/checkbox";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { toast } from "sonner"; import { toast } from "sonner";
import { import {
Dialog, Dialog,
@ -64,7 +63,7 @@ export function FlowWidget({
// 🆕 스텝 데이터 페이지네이션 상태 // 🆕 스텝 데이터 페이지네이션 상태
const [stepDataPage, setStepDataPage] = useState(1); const [stepDataPage, setStepDataPage] = useState(1);
const [stepDataPageSize, setStepDataPageSize] = useState(10); const [stepDataPageSize] = useState(20);
// 오딧 로그 상태 // 오딧 로그 상태
const [auditLogs, setAuditLogs] = useState<FlowAuditLog[]>([]); const [auditLogs, setAuditLogs] = useState<FlowAuditLog[]>([]);
@ -386,7 +385,7 @@ export function FlowWidget({
: "flex flex-col items-center gap-4"; : "flex flex-col items-center gap-4";
return ( return (
<div className="@container flex w-full flex-col p-2 sm:p-4 lg:p-6"> <div className="@container flex h-full w-full flex-col p-2 sm:p-4 lg:p-6">
{/* 플로우 제목 */} {/* 플로우 제목 */}
<div className="mb-3 flex-shrink-0 sm:mb-4"> <div className="mb-3 flex-shrink-0 sm:mb-4">
<div className="flex items-center justify-center gap-2"> <div className="flex items-center justify-center gap-2">
@ -648,8 +647,8 @@ export function FlowWidget({
{/* 선택된 스텝의 데이터 리스트 */} {/* 선택된 스텝의 데이터 리스트 */}
{selectedStepId !== null && ( {selectedStepId !== null && (
<div className="bg-muted/30 mt-4 flex w-full flex-col rounded-lg border sm:mt-6 lg:mt-8"> <div className="bg-muted/30 mt-4 flex min-h-0 w-full flex-1 flex-col rounded-lg border sm:mt-6 lg:mt-8">
{/* 헤더 - 자동 높이 */} {/* 헤더 */}
<div className="bg-background flex-shrink-0 border-b px-4 py-3 sm:px-6 sm:py-4"> <div className="bg-background flex-shrink-0 border-b px-4 py-3 sm:px-6 sm:py-4">
<h4 className="text-foreground text-base font-semibold sm:text-lg"> <h4 className="text-foreground text-base font-semibold sm:text-lg">
{steps.find((s) => s.id === selectedStepId)?.stepName} {steps.find((s) => s.id === selectedStepId)?.stepName}
@ -662,34 +661,34 @@ export function FlowWidget({
</p> </p>
</div> </div>
{/* 데이터 영역 - 고정 높이 + 스크롤 */} {/* 데이터 영역 - 스크롤 가능 */}
{stepDataLoading ? ( <div className="min-h-0 flex-1 overflow-auto">
<div className="flex h-64 items-center justify-center"> {stepDataLoading ? (
<Loader2 className="text-primary h-6 w-6 animate-spin sm:h-8 sm:w-8" /> <div className="flex h-full items-center justify-center py-12">
<span className="text-muted-foreground ml-2 text-sm"> ...</span> <Loader2 className="text-primary h-6 w-6 animate-spin sm:h-8 sm:w-8" />
</div> <span className="text-muted-foreground ml-2 text-sm"> ...</span>
) : stepData.length === 0 ? ( </div>
<div className="flex h-64 flex-col items-center justify-center"> ) : stepData.length === 0 ? (
<svg <div className="flex h-full flex-col items-center justify-center py-12">
className="text-muted-foreground/50 mb-3 h-12 w-12" <svg
fill="none" className="text-muted-foreground/50 mb-3 h-12 w-12"
viewBox="0 0 24 24" fill="none"
stroke="currentColor" viewBox="0 0 24 24"
> stroke="currentColor"
<path >
strokeLinecap="round" <path
strokeLinejoin="round" strokeLinecap="round"
strokeWidth={1.5} strokeLinejoin="round"
d="M20 13V6a2 2 0 00-2-2H6a2 2 0 00-2 2v7m16 0v5a2 2 0 01-2 2H6a2 2 0 01-2-2v-5m16 0h-2.586a1 1 0 00-.707.293l-2.414 2.414a1 1 0 01-.707.293h-3.172a1 1 0 01-.707-.293l-2.414-2.414A1 1 0 006.586 13H4" strokeWidth={1.5}
/> d="M20 13V6a2 2 0 00-2-2H6a2 2 0 00-2 2v7m16 0v5a2 2 0 01-2 2H6a2 2 0 01-2-2v-5m16 0h-2.586a1 1 0 00-.707.293l-2.414 2.414a1 1 0 01-.707.293h-3.172a1 1 0 01-.707-.293l-2.414-2.414A1 1 0 006.586 13H4"
</svg> />
<span className="text-muted-foreground text-sm"> </span> </svg>
</div> <span className="text-muted-foreground text-sm"> </span>
) : ( </div>
<> ) : (
{/* 모바일: 카드 뷰 - 고정 높이 + 스크롤 */} <>
<div className="overflow-y-auto @sm:hidden" style={{ height: "450px" }}> {/* 모바일: 카드 뷰 */}
<div className="space-y-2 p-3"> <div className="space-y-2 p-3 @sm:hidden">
{paginatedStepData.map((row, pageIndex) => { {paginatedStepData.map((row, pageIndex) => {
const actualIndex = (stepDataPage - 1) * stepDataPageSize + pageIndex; const actualIndex = (stepDataPage - 1) * stepDataPageSize + pageIndex;
return ( return (
@ -726,159 +725,132 @@ export function FlowWidget({
); );
})} })}
</div> </div>
</div>
{/* 데스크톱: 테이블 뷰 - 고정 높이 + 스크롤 */} {/* 데스크톱: 테이블 뷰 */}
<div className="hidden overflow-auto @sm:block" style={{ height: "450px" }}> <div className="hidden @sm:block">
<Table> <Table>
<TableHeader> <TableHeader>
<TableRow className="bg-muted/50 hover:bg-muted/50"> <TableRow className="bg-muted/50 hover:bg-muted/50">
{allowDataMove && ( {allowDataMove && (
<TableHead className="bg-muted/50 sticky top-0 left-0 z-20 w-12 border-b px-3 py-2 text-center shadow-sm"> <TableHead className="bg-muted/50 sticky top-0 left-0 z-20 w-12 border-b px-3 py-2 text-center shadow-sm">
<Checkbox <Checkbox
checked={selectedRows.size === stepData.length && stepData.length > 0} checked={selectedRows.size === stepData.length && stepData.length > 0}
onCheckedChange={toggleAllRows} onCheckedChange={toggleAllRows}
/> />
</TableHead> </TableHead>
)} )}
{stepDataColumns.map((col) => ( {stepDataColumns.map((col) => (
<TableHead <TableHead
key={col} key={col}
className="bg-muted/50 sticky top-0 z-10 border-b px-3 py-2 text-xs font-semibold whitespace-nowrap sm:text-sm" className="bg-muted/50 sticky top-0 z-10 border-b px-3 py-2 text-xs font-semibold whitespace-nowrap sm:text-sm"
> >
{col} {col}
</TableHead> </TableHead>
))} ))}
</TableRow> </TableRow>
</TableHeader> </TableHeader>
<TableBody> <TableBody>
{paginatedStepData.map((row, pageIndex) => { {paginatedStepData.map((row, pageIndex) => {
const actualIndex = (stepDataPage - 1) * stepDataPageSize + pageIndex; const actualIndex = (stepDataPage - 1) * stepDataPageSize + pageIndex;
return ( return (
<TableRow <TableRow
key={actualIndex} key={actualIndex}
className={`hover:bg-muted/50 ${selectedRows.has(actualIndex) ? "bg-primary/5" : ""}`} className={`hover:bg-muted/50 ${selectedRows.has(actualIndex) ? "bg-primary/5" : ""}`}
> >
{allowDataMove && ( {allowDataMove && (
<TableCell className="bg-background sticky left-0 z-10 border-b px-3 py-2 text-center"> <TableCell className="bg-background sticky left-0 z-10 border-b px-3 py-2 text-center">
<Checkbox <Checkbox
checked={selectedRows.has(actualIndex)} checked={selectedRows.has(actualIndex)}
onCheckedChange={() => toggleRowSelection(actualIndex)} onCheckedChange={() => toggleRowSelection(actualIndex)}
/> />
</TableCell> </TableCell>
)} )}
{stepDataColumns.map((col) => ( {stepDataColumns.map((col) => (
<TableCell key={col} className="border-b px-3 py-2 text-xs whitespace-nowrap sm:text-sm"> <TableCell key={col} className="border-b px-3 py-2 text-xs whitespace-nowrap sm:text-sm">
{row[col] !== null && row[col] !== undefined ? ( {row[col] !== null && row[col] !== undefined ? (
String(row[col]) String(row[col])
) : ( ) : (
<span className="text-muted-foreground">-</span> <span className="text-muted-foreground">-</span>
)} )}
</TableCell> </TableCell>
))} ))}
</TableRow> </TableRow>
); );
})} })}
</TableBody> </TableBody>
</Table> </Table>
</div> </div>
</> </>
)} )}
</div>
{/* 페이지네이션 - 항상 하단에 고정 */} {/* 페이지네이션 푸터 */}
{!stepDataLoading && stepData.length > 0 && ( {!stepDataLoading && stepData.length > 0 && totalStepDataPages > 1 && (
<div className="bg-background flex-shrink-0 border-t px-4 py-3 sm:px-6"> <div className="bg-background flex-shrink-0 border-t px-4 py-3 sm:px-6">
<div className="flex flex-col items-center justify-between gap-3 sm:flex-row"> <div className="flex flex-col items-center justify-between gap-3 sm:flex-row">
{/* 왼쪽: 페이지 정보 + 페이지 크기 선택 */} <div className="text-muted-foreground text-xs sm:text-sm">
<div className="flex flex-col items-center gap-2 sm:flex-row sm:gap-4"> {stepDataPage} / {totalStepDataPages} ( {stepData.length})
<div className="text-muted-foreground text-xs sm:text-sm">
{stepDataPage} / {totalStepDataPages} ( {stepData.length})
</div>
<div className="flex items-center gap-2">
<span className="text-muted-foreground text-xs"> :</span>
<Select
value={stepDataPageSize.toString()}
onValueChange={(value) => {
setStepDataPageSize(Number(value));
setStepDataPage(1); // 페이지 크기 변경 시 첫 페이지로
}}
>
<SelectTrigger className="h-8 w-20 text-xs">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="10">10</SelectItem>
<SelectItem value="20">20</SelectItem>
<SelectItem value="50">50</SelectItem>
<SelectItem value="100">100</SelectItem>
</SelectContent>
</Select>
</div>
</div> </div>
<Pagination>
{/* 오른쪽: 페이지네이션 */} <PaginationContent>
{totalStepDataPages > 1 && ( <PaginationItem>
<Pagination> <PaginationPrevious
<PaginationContent> onClick={() => setStepDataPage((p) => Math.max(1, p - 1))}
<PaginationItem> className={stepDataPage === 1 ? "pointer-events-none opacity-50" : "cursor-pointer"}
<PaginationPrevious />
onClick={() => setStepDataPage((p) => Math.max(1, p - 1))} </PaginationItem>
className={stepDataPage === 1 ? "pointer-events-none opacity-50" : "cursor-pointer"} {totalStepDataPages <= 7 ? (
/> Array.from({ length: totalStepDataPages }, (_, i) => i + 1).map((page) => (
</PaginationItem> <PaginationItem key={page}>
{totalStepDataPages <= 7 ? ( <PaginationLink
Array.from({ length: totalStepDataPages }, (_, i) => i + 1).map((page) => ( onClick={() => setStepDataPage(page)}
<PaginationItem key={page}> isActive={stepDataPage === page}
<PaginationLink className="cursor-pointer"
onClick={() => setStepDataPage(page)} >
isActive={stepDataPage === page} {page}
className="cursor-pointer" </PaginationLink>
> </PaginationItem>
{page} ))
</PaginationLink> ) : (
</PaginationItem> <>
)) {Array.from({ length: totalStepDataPages }, (_, i) => i + 1)
) : ( .filter((page) => {
<> return (
{Array.from({ length: totalStepDataPages }, (_, i) => i + 1) page === 1 ||
.filter((page) => { page === totalStepDataPages ||
return ( (page >= stepDataPage - 2 && page <= stepDataPage + 2)
page === 1 || );
page === totalStepDataPages || })
(page >= stepDataPage - 2 && page <= stepDataPage + 2) .map((page, idx, arr) => (
); <React.Fragment key={page}>
}) {idx > 0 && arr[idx - 1] !== page - 1 && (
.map((page, idx, arr) => (
<React.Fragment key={page}>
{idx > 0 && arr[idx - 1] !== page - 1 && (
<PaginationItem>
<span className="text-muted-foreground px-2">...</span>
</PaginationItem>
)}
<PaginationItem> <PaginationItem>
<PaginationLink <span className="text-muted-foreground px-2">...</span>
onClick={() => setStepDataPage(page)}
isActive={stepDataPage === page}
className="cursor-pointer"
>
{page}
</PaginationLink>
</PaginationItem> </PaginationItem>
</React.Fragment> )}
))} <PaginationItem>
</> <PaginationLink
)} onClick={() => setStepDataPage(page)}
<PaginationItem> isActive={stepDataPage === page}
<PaginationNext className="cursor-pointer"
onClick={() => setStepDataPage((p) => Math.min(totalStepDataPages, p + 1))} >
className={ {page}
stepDataPage === totalStepDataPages ? "pointer-events-none opacity-50" : "cursor-pointer" </PaginationLink>
} </PaginationItem>
/> </React.Fragment>
</PaginationItem> ))}
</PaginationContent> </>
</Pagination> )}
)} <PaginationItem>
<PaginationNext
onClick={() => setStepDataPage((p) => Math.min(totalStepDataPages, p + 1))}
className={
stepDataPage === totalStepDataPages ? "pointer-events-none opacity-50" : "cursor-pointer"
}
/>
</PaginationItem>
</PaginationContent>
</Pagination>
</div> </div>
</div> </div>
)} )}