diff --git a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx index 299b5181c..5e5060fd9 100644 --- a/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx +++ b/apps/sn/app/(map-layout)/map/searchModal/searchModal.tsx @@ -2,7 +2,6 @@ import React, { useEffect, useState, useMemo } from 'react'; import axios from 'axios'; import { UiModal, UiTable, DatePickerRange, SelectBox, UITab } from '@common/business_components/ui'; import { Button, Input, Label } from '@common/components'; -import { SelectBox2 } from '@common/business_components/ui/select/index-2'; import { YearRangeSelectBox } from '@/components/ui/YearRangeSelectBox'; import { SidoSigunguSelectBox } from '@/components/ui/SidoSigunguSelectBox'; import { MsSwagePplCol2, SwtrmtFcltCol2, SwtrmtPrcsZoneCol2, MsSwageMhlCol2, ExclnSewagePumpCol2, stofcbrCol2 } from '../components/common/table'; @@ -746,7 +745,7 @@ const SearchModal: React.FC = ({ {/* 구분 */}
- = ({ setBasicType(String(value)) } value={basicType} + selectContentClass="z-[101]" />
@@ -777,7 +777,7 @@ const SearchModal: React.FC = ({ endLabel="" /> {/* 용도 */} - = ({ onSelectValue={(val) => { set변수1(String(val)); }} + selectContentClass="z-[101]" /> {/* 재질 */} - = ({ onSelectValue={(val) => { set변수2(String(val)); }} + selectContentClass="z-[101]" /> {/* 관경 */} - + = ({ }} /> {/* 연장 */} - + = ({ }} onSigunguChange={set시군구} /> - + = ({ set변수1(e.target.value); }} /> - + = ({ endLabel="" /> {/* 용도 */} - = ({ onSelectValue={(val) => { set변수1(String(val)); }} + selectContentClass="z-[101]" /> {/* 하수맨홀 구경 */} - + = ({ endLabel="" /> {/* 일일처리용량 - 오수맨홀 */} - + = ({ {activeTab === 'operation' && (
- = ({ }))} onSelectValue={(val) => setWorkType(String(val))} value={workType} + selectContentClass="z-[101]" />
@@ -1151,9 +1143,7 @@ const SearchModal: React.FC = ({ className="w-[100px] !text-xl placeholder:text-center mr-4" placeholder="입력" value={변수1} - onChange={(e) => { - set변수1(e.target.value); - }} + onChange={(e) => { set변수1(e.target.value); }} /> = ({ startLabel="수행기간" endLabel="" /> - = ({ onSelectValue={(val) => { set변수2(String(val)); }} + selectContentClass="z-[101]" /> {/* 조회 버튼 */}
@@ -1182,23 +1173,24 @@ const SearchModal: React.FC = ({ {/* 하수도정비기본계획보고서 탭 */} {activeTab === 'report' && (
- {/* 시도, 시군구, 하수처리구역 한 줄 */}
- - setSigungu(String(val))} + selectContentClass="z-[101]" />
@@ -1208,7 +1200,6 @@ const SearchModal: React.FC = ({ placeholder="입력" value={gubun} onChange={(e) => { - // 숫자만 입력 허용 const val = e.target.value; setGubun(val); }} @@ -1282,10 +1273,11 @@ const SearchModal: React.FC = ({
{ - const label = WORK_TYPES.find((type) => type.val === workType)?.text - return (<>{label} 결과표 ({detailTableCount})건); - })() + headName={ + (() => { + const label = WORK_TYPES.find((type) => type.val === workType)?.text + return (<>{label} 결과표 ({detailTableCount})건); + })() } tableData={detailTableData} headlist={dynamicHeadlist2} @@ -1309,9 +1301,9 @@ const SearchModal: React.FC = ({ bodyClass={` h-[100vh] w-[60vw] - max-w-none - max-h-none - overflow-visible + max-w-[60vw] + max-h-[100vh] + overflow-hidden z-[101] `} body={renderBody()} diff --git a/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx b/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx index a1a0e701e..d2d7d2672 100644 --- a/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx +++ b/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx @@ -4,7 +4,6 @@ import ContentLayout from '@/components/ui/contentLayout' import { GovSidoSigunguSearchForm } from '@/components/ui/govSidoSigunguSearchForm' import { DatePicker, DateMonthPicker, Form, SearchFormRight, SelectBox } from '@common/business_components/ui' import ListDiv from '@common/business_components/ui/list_div' -import { SelectBox2 } from '@common/business_components/ui/select/index-2' import { Button, Label } from '@common/components/ui' import { useEffect, useState, type ReactNode } from 'react' import LoadingOverlay from '@/components/ui/LoadingBar' @@ -259,8 +258,8 @@ const BaseLayout = ({ setRtnEnvPartSidoValue={(val) => setCtpvCd?.(val)} setRtnEnvPartSigunValue={setSigungu} // 선택된 시군구 값을 받을 콜백 함수 전달 > - onSwageTreatmentPlantChange?.(val)} /> - {/* onSwageProcessingZoneChange?.(val)} /> */} + onSwageTreatmentPlantChange?.(val)} selectContentClass="z-[101]" /> + {/* onSwageProcessingZoneChange?.(val)} selectContentClass="z-[101]" /> */} {selectBox?.searchChk ? : null}
diff --git a/apps/sn/app/components/ui/SidoSigunguSelectBox.tsx b/apps/sn/app/components/ui/SidoSigunguSelectBox.tsx index 0ea8bb510..7414185a6 100644 --- a/apps/sn/app/components/ui/SidoSigunguSelectBox.tsx +++ b/apps/sn/app/components/ui/SidoSigunguSelectBox.tsx @@ -1,5 +1,5 @@ import React, { useMemo } from "react"; -import { SelectBox2 } from "@common/business_components/ui/select/index-2"; +import { SelectBox } from '@common/business_components/ui' interface Option { id: number; @@ -138,21 +138,23 @@ export function SidoSigunguSelectBox({ return (
- ({ val: opt.id, text: opt.name }))} value={sido} onSelectValue={val => onSidoChange(Number(val))} + selectContentClass="z-[101]" /> - ({ val: opt.id, text: opt.name }))} value={sigungu} onSelectValue={val => onSigunguChange(Number(val))} + selectContentClass="z-[101]" />
); diff --git a/apps/sn/app/components/ui/YearRangeSelectBox.tsx b/apps/sn/app/components/ui/YearRangeSelectBox.tsx index 768bfd54c..3e0318dac 100644 --- a/apps/sn/app/components/ui/YearRangeSelectBox.tsx +++ b/apps/sn/app/components/ui/YearRangeSelectBox.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { SelectBox2 } from "@common/business_components/ui/select/index-2"; +import { SelectBox } from '@common/business_components/ui' interface YearRangeSelectBoxProps { start: string; @@ -89,22 +89,24 @@ export function YearRangeSelectBox({ return (
- onChange({ start: String(val), end })} value={start} + selectContentClass="z-[101]" /> ~ - onChange({ start, end: String(val) })} value={end} + selectContentClass="z-[101]" />
);