diff --git a/src/components/dialog/ListHeaderManageDialog.tsx b/src/components/dialog/ListHeaderManageDialog.tsx index 7af75f9..54e1efc 100644 --- a/src/components/dialog/ListHeaderManageDialog.tsx +++ b/src/components/dialog/ListHeaderManageDialog.tsx @@ -311,6 +311,10 @@ const ListHeaderManageDialog = ({ const handleConfirm = async () => { if (saveDisabled || submitting) return const names = localRows.map((row) => row.listHderNm.trim()) + if (names.some((name) => name.length === 0)) { + alert('헤더명을 입력해 주세요.') + return + } const duplicateNames = [...new Set(names.filter((name, index) => names.indexOf(name) !== index))] if (duplicateNames.length > 0) { alert(`중복된 헤더명이 있습니다: ${duplicateNames.join(', ')}`) @@ -344,8 +348,10 @@ const ListHeaderManageDialog = ({ let defaultOrder = 0 let commonOrder = COMMON_GRADE_ORDER_START - 1 const orderedRows = localRows.map((row) => { - const listHderOrder = isCommonGrade(row.listHderGrad) ? (commonOrder += 1) : (defaultOrder += 1) - return { ...row, prjctIdx: row.prjctIdx ?? prjctIdx, listHderOrder } + const isCommon = isCommonGrade(row.listHderGrad) + const listHderOrder = isCommon ? (commonOrder += 1) : (defaultOrder += 1) + const listHderNm = isCommon ? row.listHderNm.trim() : row.listHderNm + return { ...row, prjctIdx: row.prjctIdx ?? prjctIdx, listHderOrder, listHderNm } }) await onConfirm(orderedRows) handleOpenChange(false) diff --git a/src/components/dialog/ListUploadDialog.tsx b/src/components/dialog/ListUploadDialog.tsx index 701ff48..26ba0be 100644 --- a/src/components/dialog/ListUploadDialog.tsx +++ b/src/components/dialog/ListUploadDialog.tsx @@ -203,7 +203,7 @@ const ListUploadDialog = ({ const serverHeader = compareRows[index] // compareRows가 이미 listHderOrder 기준 정렬이라 위치로 순서를 보장한다. listHderOrder 값 자체는 // COMMON 헤더가 101부터 채번되어 index+1과 리터럴하게 같지 않을 수 있으므로(정상), 이름만 비교한다. - const isMatched = !!serverHeader && serverHeader.listHderNm === header + const isMatched = !!serverHeader && serverHeader.listHderNm.trim() === header const isSettingRequired = !hasCommonHeader && index >= baseHeaderRows.length return { header,