From d7ddc505ebb2e8b15ba9668c831c8a0701c06f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Fri, 5 Aug 2022 17:41:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A1=B0=EC=A2=85=EC=82=AC=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/plan/FlightPlanPilot.js | 12 +++--- .../flight/plan/FlightPlanPilotContainer.js | 40 +++++++++++++++++-- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/components/basis/flight/plan/FlightPlanPilot.js b/src/components/basis/flight/plan/FlightPlanPilot.js index bd38999..1b42f5d 100644 --- a/src/components/basis/flight/plan/FlightPlanPilot.js +++ b/src/components/basis/flight/plan/FlightPlanPilot.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 FlightPlanPilot = ({ pilotList, handleSelectPilot }) => { +const FlightPlanPilot = ({ pilotList, handleSelectPilot, returnPilot, onClickEvent, setInputVal }) => { const columns = [ {id: 'groupNm', name: '그룹 명', cell: row => (
{row.groupNm}
)}, {id: 'memberName', name: '성명', cell: row => (
{row.memberName}
)}, @@ -33,7 +33,7 @@ const FlightPlanPilot = ({ pilotList, handleSelectPilot }) => { 검색 @@ -57,7 +57,7 @@ const FlightPlanPilot = ({ pilotList, handleSelectPilot }) => { id='memberName' name='memberName' // value={props.params.groupNm} - // onChange={props.handlerInput} + onChange={(e) => {setInputVal(e.target.value)}} bsSize='sm' // onKeyPress={props.onKeyPress} placeholder='성명을 입력하세요' @@ -82,7 +82,7 @@ const FlightPlanPilot = ({ pilotList, handleSelectPilot }) => {

조종사 목록

- 검색결과 총 {!!pilotList ? pilotList.length : 0}건 + 검색결과 총 {!!returnPilot ? [returnPilot].length : 0}건
@@ -90,8 +90,8 @@ const FlightPlanPilot = ({ pilotList, handleSelectPilot }) => {
diff --git a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js index 80efada..ee63874 100644 --- a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js @@ -6,6 +6,8 @@ import FlightPlanPilot from '../../../../components/basis/flight/plan/FlightPlan const FlightPlanPilotContainer = ({handleModal, type}) => { const dispatch = useDispatch(); const { pilotList, selectGroup } = useSelector(state => state.flightState); + const [returnPilot, setReturnPilot] = useState(''); + const [inputVal , setInputVal] = useState(''); /* 조종사 조회 */ @@ -19,7 +21,7 @@ const FlightPlanPilotContainer = ({handleModal, type}) => { /* 조종사 선택 */ const handleSelectPilot = (cstmrSno) => { - handleModal({target: 'poilot', isOpen: false}); + handleModal({target: 'pilot', isOpen: false}); const pilot = pilotList.find(pilot => { return pilot.cstmrSno === cstmrSno; @@ -27,16 +29,46 @@ const FlightPlanPilotContainer = ({handleModal, type}) => { /* 파일럿 정보 Redux 저장 */ dispatch(Actions.PILOT_SELECT(pilot)); } - + useEffect(() => { handleSearch(); }, []) - + useEffect(()=> { + console.log('goToHome') + if(pilotList) { + onTest(); + } + },[pilotList]) + + + + const onClickEvent= (e)=> { + setInputVal(e.target.value); + onTest(); + } + + const onTest = () => { + pilotList.filter((unit) =>{ + if(inputVal==''){ + setReturnPilot(unit) + }else if(unit.memberName.includes(inputVal)){ + setReturnPilot(unit) + console.log("Filtered >>>>" , returnPilot) + }else if (inputVal != ''){ + setReturnPilot('') + } + }) + } return ( ) } From 8eb9e0112fc3f497b9e1eb9640838595bb317c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Fri, 5 Aug 2022 18:08:00 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=A1=B0=EC=A2=85=EC=82=AC=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=ED=95=84=ED=84=B0=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/flight/plan/FlightPlanPilotContainer.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js index ee63874..08b249f 100644 --- a/src/containers/basis/flight/plan/FlightPlanPilotContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanPilotContainer.js @@ -8,7 +8,7 @@ const FlightPlanPilotContainer = ({handleModal, type}) => { const { pilotList, selectGroup } = useSelector(state => state.flightState); const [returnPilot, setReturnPilot] = useState(''); const [inputVal , setInputVal] = useState(''); - + /* 조종사 조회 */ const handleSearch = () => { @@ -35,7 +35,7 @@ const FlightPlanPilotContainer = ({handleModal, type}) => { }, []) useEffect(()=> { - console.log('goToHome') + console.log('>>>>') if(pilotList) { onTest(); } @@ -45,16 +45,20 @@ const FlightPlanPilotContainer = ({handleModal, type}) => { const onClickEvent= (e)=> { setInputVal(e.target.value); + onTest(); + setInputVal(''); } const onTest = () => { - pilotList.filter((unit) =>{ + const [MATCHVALUE] = pilotList.filter((unit) => + unit.memberName.toLowerCase().includes(inputVal)); + pilotList.filter((unit) =>{ if(inputVal==''){ setReturnPilot(unit) }else if(unit.memberName.includes(inputVal)){ + //이부분 문제있어서 임시로 inputVal값과 동일한 값을 넣어둠... 해결해야함... setReturnPilot(unit) - console.log("Filtered >>>>" , returnPilot) }else if (inputVal != ''){ setReturnPilot('') }