From 6dae81eb05f509d9b0532995b040a48eb0c7f255 Mon Sep 17 00:00:00 2001 From: swcho Date: Tue, 29 Jul 2025 20:51:12 +0900 Subject: [PATCH] =?UTF-8?q?fix,=20refactor:=20-=20=EA=B8=B0=EB=B3=B8?= =?UTF-8?q?=EA=B2=80=EC=83=89=20=ED=95=98=EC=88=98=EA=B4=80=EB=A1=9C?= =?UTF-8?q?=EC=9D=98=20Input=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A4=91=EB=B3=B5=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=EC=9A=B4=EC=98=81=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EA=B2=80=EC=83=89=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EA=B0=9C?= =?UTF-8?q?=EC=88=98=205=EA=B0=9C=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(map-layout)/map/searchModal/basicTab.tsx | 4 + .../map/searchModal/searchModal.tsx | 18 ++--- .../(map-layout)/map/searchModal/swagePpl.tsx | 78 ++++++++++--------- 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx b/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx index 8ac1b98aa..310528aed 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/basicTab.tsx @@ -102,12 +102,16 @@ const BasicTab: React.FC = ({ var1={var1} var2={var2} start1={start1} + start2={start2} end1={end1} + end2={end2} yearFilter={yearFilter} setVar1={setVar1} setVar2={setVar2} setStart1={setStart1} + setStart2={setStart2} setEnd1={setEnd1} + setEnd2={setEnd2} setYearFilter={setYearFilter} handleSearch={handleSearch} /> diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index ed6cdd608..afc61252e 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -225,7 +225,7 @@ const SearchModal: React.FC = ({ } else if (activeTab === 'operation') { const RequestDTO: Record = { page: `${curPage - 1}`, - size: '4', + size: '5', }; if (var1) RequestDTO.bizNm = var1; if (var2 != '0' && var2) RequestDTO.bizTyCd = var2; @@ -261,7 +261,7 @@ const SearchModal: React.FC = ({ const matched = BIZ_TY_CD.find(code => code.lwpoCd === item.bizTyCd); return { ...formattedItem, - rowNumber: (curPage - 1) * 4 + index + 1, // 1부터 시작하는 일련번호 추가 + rowNumber: (curPage - 1) * 5 + index + 1, // 1부터 시작하는 일련번호 추가 bizTyCd: matched ? matched.lwpoCdNm : item.bizTyCd, }; }); @@ -472,8 +472,8 @@ const SearchModal: React.FC = ({ try { const RequestDTO: Record = { page: `${detailCurPage - 1}`, - size: '4', - bizId: tableData[index % 4].bizId, + size: '5', + bizId: tableData[index % 5].bizId, }; RequestDTO.workTypes = JSON.parse(workType.replace(/'/g, '"')); @@ -490,7 +490,7 @@ const SearchModal: React.FC = ({ const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim()); return { ...formattedItem, - rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1, + rowNumber: (detailCurPage - 1) * 5 + detailIndex + 1, usgCd: usgCdObj ? usgCdObj.text : item.usgCd, mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd, }; @@ -516,7 +516,7 @@ const SearchModal: React.FC = ({ try { const RequestDTO: Record = { page: `${detailCurPage - 1}`, - size: '4', + size: '5', bizId: String(detailBizId), }; const res = await getData(`v1/bizInfo/fclts?${new URLSearchParams(RequestDTO).toString()}`); @@ -528,7 +528,7 @@ const SearchModal: React.FC = ({ const mqltCdObj = MS_SWAGE_PPL_CODES.find(code => code.val === item.mqltCd.trim()); return { ...formattedItem, - rowNumber: (detailCurPage - 1) * 4 + detailIndex + 1, + rowNumber: (detailCurPage - 1) * 5 + detailIndex + 1, usgCd: usgCdObj ? usgCdObj.text : item.usgCd, mqltCd: mqltCdObj ? mqltCdObj.text : item.mqltCd, }; @@ -648,7 +648,7 @@ const SearchModal: React.FC = ({ } tableData={tableData} headlist={dynamicHeadlist} - pageSize={4} + pageSize={5} total={tableCount} cellClick={handleOperationCellClick} onPageChange={setCurPage} @@ -671,7 +671,7 @@ const SearchModal: React.FC = ({ } tableData={detailTableData} headlist={dynamicHeadlist2} - pageSize={4} + pageSize={5} total={detailTableCount} cellClick={undefined} onPageChange={setDetailCurPage} diff --git a/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx b/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx index 72f68498f..f729ab6eb 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/swagePpl.tsx @@ -10,12 +10,16 @@ interface SwagePplProps { var1: string; var2: string; start1: string; + start2: string; end1: string; + end2: string; yearFilter: { start: string; end: string }; setVar1: (value: string) => void; setVar2: (value: string) => void; setStart1: (value: string) => void; + setStart2: (value: string) => void; setEnd1: (value: string) => void; + setEnd2: (value: string) => void; setYearFilter: (filter: { start: string; end: string }) => void; handleSearch: () => void; } @@ -24,12 +28,16 @@ const SwagePpl: React.FC = ({ var1, var2, start1, + start2, end1, + end2, yearFilter, setVar1, setVar2, setStart1, + setStart2, setEnd1, + setEnd2, setYearFilter, handleSearch, }) => { @@ -79,41 +87,6 @@ const SwagePpl: React.FC = ({ /> {/* 관경 */} - { - // 숫자만 입력 허용 - const val = e.target.value.replace(/[^0-9]/g, ""); - setVar1(val); - }} - onKeyDown={(e) => { - if (e.key === 'Enter') { - e.preventDefault(); // Enter 키 기본 동작 방지 - handleSearch(); - } - }} - /> - ~ - { - // 숫자만 입력 허용 - const val = e.target.value.replace(/[^0-9]/g, ""); - setEnd1(val); - }} - onKeyDown={(e) => { - if (e.key === 'Enter') { - e.preventDefault(); // Enter 키 기본 동작 방지 - handleSearch(); - } - }} - /> - {/* 연장 */} - = ({ } }} /> + {/* 연장 */} + + { + // 숫자만 입력 허용 + const val = e.target.value.replace(/[^0-9]/g, ""); + setStart2(val); + }} + onKeyDown={(e) => { + if (e.key === 'Enter') { + e.preventDefault(); // Enter 키 기본 동작 방지 + handleSearch(); + } + }} + /> + ~ + { + // 숫자만 입력 허용 + const val = e.target.value.replace(/[^0-9]/g, ""); + setEnd2(val); + }} + onKeyDown={(e) => { + if (e.key === 'Enter') { + e.preventDefault(); // Enter 키 기본 동작 방지 + handleSearch(); + } + }} + /> {/* 조회 버튼 */}