chpark/vexplor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

격자 저장문제 수정

Browse Source
This commit is contained in:
kjs
2025-11-06 17:01:13 +09:00
parent 786576bb76
commit f2500865a6
16 changed files with 3300 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/components/admin/ExternalDbConnectionModal.tsx
View File

@@ -607,7 +607,7 @@ export const ExternalDbConnectionModal: React.FC<ExternalDbConnectionModalProps>
</div>
</div>
<DialogFooter className="gap-2 sm:gap-0">
<ResizableDialogFooter className="gap-2 sm:gap-0">
<Button
variant="outline"
onClick={onClose}

19
frontend/components/admin/MenuTable.tsx
View File

@@ -241,18 +241,13 @@ export const MenuTable: React.FC<MenuTableProps> = ({
</TableCell>
<TableCell className="h-16 text-sm">{seq}</TableCell>
<TableCell className="h-16 text-sm text-muted-foreground">
<div className="flex flex-col">
<span
className={`font-medium ${companyName && companyName !== getText(MENU_MANAGEMENT_KEYS.STATUS_UNSPECIFIED) ? "text-success" : "text-muted-foreground"}`}
>
{companyCode === "*"
? getText(MENU_MANAGEMENT_KEYS.FILTER_COMPANY_COMMON)
: companyName || getText(MENU_MANAGEMENT_KEYS.STATUS_UNSPECIFIED)}
</span>
{companyCode && companyCode !== "" && (
<span className="font-mono text-xs text-muted-foreground/70">{companyCode}</span>
)}
</div>
<span
className={`font-medium ${companyName && companyName !== getText(MENU_MANAGEMENT_KEYS.STATUS_UNSPECIFIED) ? "text-success" : "text-muted-foreground"}`}
>
{companyCode === "*"
? getText(MENU_MANAGEMENT_KEYS.FILTER_COMPANY_COMMON)
: companyName || getText(MENU_MANAGEMENT_KEYS.STATUS_UNSPECIFIED)}
</span>
</TableCell>
<TableCell className="h-16 text-left text-sm text-muted-foreground">
<div className="max-w-[200px]">

20
frontend/components/screen/ScreenDesigner.tsx
View File

@@ -903,14 +903,13 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
const layoutWithDefaultGrid = {
...layoutToUse,
gridSettings: {
...layoutToUse.gridSettings, // 기존 설정 먼저 적용
columns: 12,
gap: 16,
columns: layoutToUse.gridSettings?.columns || 12, // DB 값 우선, 없으면 기본값 12
gap: layoutToUse.gridSettings?.gap ?? 16, // DB 값 우선, 없으면 기본값 16
padding: 0, // padding은 항상 0으로 강제
snapToGrid: true,
showGrid: false, // 기본값 false로 변경
gridColor: "#d1d5db",
gridOpacity: 0.5,
snapToGrid: layoutToUse.gridSettings?.snapToGrid ?? true, // DB 값 우선
showGrid: layoutToUse.gridSettings?.showGrid ?? false, // DB 값 우선
gridColor: layoutToUse.gridSettings?.gridColor || "#d1d5db",
gridOpacity: layoutToUse.gridSettings?.gridOpacity ?? 0.5,
},
};
@@ -4284,12 +4283,7 @@ export default function ScreenDesigner({ selectedScreen, onBackToList }: ScreenD
tables={tables}
gridSettings={layout.gridSettings}
onUpdateProperty={updateComponentProperty}
onGridSettingsChange={(newSettings) => {
setLayout((prev) => ({
...prev,
gridSettings: newSettings,
}));
}}
onGridSettingsChange={updateGridSettings}
onDeleteComponent={deleteComponent}
onCopyComponent={copyComponent}
currentTable={tables.length > 0 ? tables[0] : undefined}

14
frontend/components/screen/ScreenList.tsx
View File

@@ -441,7 +441,6 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
<TableHeader>
<TableRow>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">화면명</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">화면 코드</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">테이블명</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">상태</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">생성일</TableHead>
@@ -465,11 +464,6 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
)}
</div>
</TableCell>
<TableCell className="h-16 px-6 py-3">
<Badge variant="outline" className="font-mono">
{screen.screenCode}
</Badge>
</TableCell>
<TableCell className="h-16 px-6 py-3">
<span className="text-muted-foreground font-mono text-sm">
{screen.tableLabel || screen.tableName}
@@ -570,7 +564,6 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
<div className="mb-4 flex items-start justify-between">
<div className="flex-1">
<h3 className="text-base font-semibold">{screen.screenName}</h3>
<p className="text-muted-foreground mt-1 font-mono text-sm">{screen.screenCode}</p>
</div>
<Badge variant={screen.isActive === "Y" ? "default" : "secondary"}>
{screen.isActive === "Y" ? "활성" : "비활성"}
@@ -687,7 +680,6 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
/>
</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">화면명</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">화면 코드</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">테이블명</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">삭제일</TableHead>
<TableHead className="h-12 px-6 py-3 text-sm font-semibold">삭제자</TableHead>
@@ -713,11 +705,6 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
)}
</div>
</TableCell>
<TableCell className="h-16 px-6 py-3">
<Badge variant="outline" className="font-mono">
{screen.screenCode}
</Badge>
</TableCell>
<TableCell className="h-16 px-6 py-3">
<span className="text-muted-foreground font-mono text-sm">
{screen.tableLabel || screen.tableName}
@@ -807,7 +794,6 @@ export default function ScreenList({ onScreenSelect, selectedScreen, onDesignScr
/>
<div className="flex-1">
<h3 className="text-base font-semibold">{screen.screenName}</h3>
<p className="text-muted-foreground mt-1 font-mono text-sm">{screen.screenCode}</p>
</div>
</div>