diff --git a/src/components/basis/flight/plan/FlightPlanArcrft.js b/src/components/basis/flight/plan/FlightPlanArcrft.js index 5ed285f..7cf45df 100644 --- a/src/components/basis/flight/plan/FlightPlanArcrft.js +++ b/src/components/basis/flight/plan/FlightPlanArcrft.js @@ -3,7 +3,7 @@ import {Button, Card, CardBody, Col, CustomInput, Row, FormGroup, Input, Label} import {Search} from 'react-feather'; import {GridDatabase} from '../../../crud/grid/GridDatatable'; -const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft, onClickEvent, inputVal, returnArcrft,onChange }) => { +const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft, onClickEvent, name, returnArcrft,onChange }) => { const columns = [ {id: 'groupNm', name: '그룹 명', cell: row => (
{row.groupNm}
)}, {id: 'arcrftModelNm', name: '모델 명', cell: row => (
{row.arcrftModelNm}
)}, @@ -57,7 +57,7 @@ const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft, onClickEvent, inputV type='text' id='ownerNm' name='ownerNm' - value={inputVal} + value={name} onChange={onChange} bsSize='sm' // onKeyPress={props.onKeyPress} @@ -85,15 +85,15 @@ const FlightPlanArcrft = ({ arcrftList, handleSelectArcrft, onClickEvent, inputV

기체 목록

- 검색결과 총 {!!returnArcrft ? [returnArcrft].length : 0}건 + 검색결과 총 {!!returnArcrft ? returnArcrft.length : 0}건
diff --git a/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js b/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js index d709604..49ffde7 100644 --- a/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanArcrftContainer.js @@ -8,7 +8,7 @@ const FlightPlanArcrftContainer = ({handleModal, type}) => { const dispatch = useDispatch(); const { arcrftList } = useSelector(state => state.flightState); const [returnArcrft, setReturnArcrft] = useState(''); - const [inputVal , setInputVal] = useState(''); + const [name , setName] = useState(''); /* 기체 조회 */ const handleSearch = () => { @@ -34,44 +34,35 @@ const FlightPlanArcrftContainer = ({handleModal, type}) => { handleSearch(); }, []) - const onClickEvent= (e)=> { - setInputVal(e.target.value); - - onTest(); - setInputVal(''); + + useEffect(() => { + setReturnArcrft(arcrftList) + }, [arcrftList]) + + const onChange =(e) =>{ + setName(e.target.value); } - const onChange = (e) => { - setInputVal(e.target.value); - }; - useEffect(()=> { - console.log('>>>>') - if(arcrftList) { - onTest(); + + const onClickEvent = () => { + + const filterArcrft = arcrftList.filter(arcrft => arcrft.ownerNm.toLowerCase().includes(name.toLowerCase())); + + if (name === '') { + const resetArcrfts = arcrftList; + setReturnArcrft(resetArcrfts) + } else { + setReturnArcrft(filterArcrft) } - },[arcrftList]) - const onTest = () => { - console.log(arcrftList) - const [MATCHVALUE] = arcrftList.filter((unit) => - unit.ownerNm.includes(inputVal)); - arcrftList.filter((unit) =>{ - if(inputVal==''){ - setReturnArcrft(unit) - }else if(unit.ownerNm.includes(inputVal)){ - setReturnArcrft(MATCHVALUE) - }else if (inputVal != ''){ - setReturnArcrft('') - } - }) - } + + }; return ( ) diff --git a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js index f58efd7..572d4b3 100644 --- a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js @@ -46,7 +46,7 @@ const FlightPlanPilotContainer = ({ handleModal, type }) => { const onClickEvent = () => { - const filterPilot = pilotList.filter(pilot => pilot.memberName.includes(name)); + const filterPilot = pilotList.filter(pilot => pilot.memberName.toLowerCase().includes(name.toLowerCase())); if (name === '') { const resetPilots = pilotList;