jskim/vexplor_dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gbpark-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node

Browse Source
This commit is contained in:
kjs
2026-03-11 12:23:52 +09:00
parent 8827cf3af1 00573a05dc
commit 5a8c6df550
588 changed files with 25062 additions and 13798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/components/common/ExcelUploadModal.tsx
View File

@@ -1329,7 +1329,7 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
<FileSpreadsheet className="h-5 w-5" />
엑셀 데이터 업로드
{isMasterDetail && (
<span className="ml-2 rounded bg-blue-100 px-2 py-0.5 text-xs font-normal text-blue-700">
<span className="ml-2 rounded bg-primary/10 px-2 py-0.5 text-xs font-normal text-primary">
마스터-디테일
</span>
)}
@@ -1520,15 +1520,15 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
isDragOver
? "border-primary bg-primary/5"
: file
? "border-green-500 bg-green-50"
? "border-emerald-500 bg-emerald-50"
: "border-muted-foreground/25 hover:border-primary hover:bg-muted/50"
)}
>
{file ? (
<div className="flex items-center gap-3">
<FileSpreadsheet className="h-8 w-8 text-green-600" />
<FileSpreadsheet className="h-8 w-8 text-emerald-600" />
<div>
<p className="text-sm font-medium text-green-700">{file.name}</p>
<p className="text-sm font-medium text-emerald-700">{file.name}</p>
<p className="text-xs text-muted-foreground">
클릭하여 다른 파일 선택
</p>
@@ -1759,11 +1759,11 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
{/* 중복 체크 안내 */}
{duplicateCheckCount > 0 ? (
<div className="rounded-md border border-blue-200 bg-blue-50 p-3">
<div className="rounded-md border border-primary/20 bg-primary/10 p-3">
<div className="flex items-start justify-between gap-4">
<div className="flex items-start gap-2">
<Copy className="mt-0.5 h-4 w-4 text-blue-600" />
<div className="text-[10px] text-blue-700 sm:text-xs">
<Copy className="mt-0.5 h-4 w-4 text-primary" />
<div className="text-[10px] text-primary sm:text-xs">
<p className="font-medium">
중복 키: {columnMappings
.filter((m) => m.checkDuplicate && m.systemColumn)
@@ -1779,12 +1779,12 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
</div>
</div>
<div className="flex items-center gap-2 shrink-0">
<span className="text-[10px] text-blue-700 sm:text-xs">중복 시:</span>
<span className="text-[10px] text-primary sm:text-xs">중복 시:</span>
<Select
value={duplicateAction}
onValueChange={(value) => setDuplicateAction(value as "overwrite" | "skip")}
>
<SelectTrigger className="h-7 w-[100px] text-[10px] sm:text-xs border-blue-300 bg-white">
<SelectTrigger className="h-7 w-[100px] text-[10px] sm:text-xs border-primary/40 bg-white">
<SelectValue />
</SelectTrigger>
<SelectContent>
@@ -1884,7 +1884,7 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
<span className="font-medium">{mapping.excelColumn}</span> →{" "}
{col?.label || mapping.systemColumn}
{mapping.checkDuplicate && (
<span className="ml-2 text-blue-600">
<span className="ml-2 text-primary">
(중복 체크: {mapping.duplicateAction === "overwrite" ? "덮어쓰기" : "건너뛰기"})
</span>
)}
@@ -1899,9 +1899,9 @@ export const ExcelUploadModal: React.FC<ExcelUploadModalProps> = ({
{/* 중복 체크 요약 */}
{duplicateCheckCount > 0 && (
<div className="rounded-md border border-blue-200 bg-blue-50 p-4">
<h3 className="text-sm font-medium text-blue-800 sm:text-base">중복 체크 설정</h3>
<div className="mt-2 space-y-1 text-[10px] text-blue-700 sm:text-xs">
<div className="rounded-md border border-primary/20 bg-primary/10 p-4">
<h3 className="text-sm font-medium text-primary sm:text-base">중복 체크 설정</h3>
<div className="mt-2 space-y-1 text-[10px] text-primary sm:text-xs">
<p>
<span className="font-medium">중복 키:</span>{" "}
{columnMappings