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

Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into reportMng

Browse Source
This commit is contained in:
dohyeons
2025-12-29 17:52:39 +09:00
parent c20e393a1a ef991b3b26
commit 89ce2a9cd0
35 changed files with 9258 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/components/admin/ScreenAssignmentTab.tsx
View File

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

8
frontend/components/admin/TableLogViewer.tsx
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>
<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>
<SelectValue placeholder="전체" />
</SelectTrigger>
<SelectContent>
<SelectItem value="">전체</SelectItem>
<SelectItem value="__all__">전체</SelectItem>
<SelectItem value="INSERT">추가</SelectItem>
<SelectItem value="UPDATE">수정</SelectItem>
<SelectItem value="DELETE">삭제</SelectItem>

5
frontend/components/dataflow/external-call/DataMappingSettings.tsx
View File

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

3
frontend/components/flow/FlowStepPanel.tsx
View File

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

8
frontend/components/screen/EditModal.tsx
View File

@@ -996,14 +996,6 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
screenId: modalState.screenId, // 화면 ID 추가
};
// 🔍 디버깅: enrichedFormData 확인
console.log("🔑 [EditModal] enrichedFormData 생성:", {
"screenData.screenInfo": screenData.screenInfo,
"screenData.screenInfo?.tableName": screenData.screenInfo?.tableName,
"enrichedFormData.tableName": enrichedFormData.tableName,
"enrichedFormData.id": enrichedFormData.id,
});
return (
<InteractiveScreenViewerDynamic
key={component.id}