From 8e811ef84302f3a0e3e7369bc0ca2d65364ba235 Mon Sep 17 00:00:00 2001 From: sanguu Date: Wed, 3 Aug 2022 17:34:01 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EA=B3=84=ED=9A=8D=EC=84=9C?= =?UTF-8?q?=20=EB=B0=98=EA=B2=BD,=EC=A0=81=EC=9A=A9(=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94,=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20=EC=9E=91?= =?UTF-8?q?=EC=97=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/plan/FlightPlanAreaDetailForm.js | 22 +++++++++++++++---- .../basis/flight/plan/FlightPlanAreaMap.js | 1 + .../plan/FlightPlanAreaDetailContainer.js | 3 +++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js b/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js index 64d466e..02a2cfa 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js +++ b/src/components/basis/flight/plan/FlightPlanAreaDetailForm.js @@ -10,11 +10,17 @@ import { Button } from 'reactstrap'; -const FlightPlanAreaDetailForm = ({ handleSave, handleClose, handleChange, handleBufferList, data }) => { +const FlightPlanAreaDetailForm = ({ handleSave, handleClose, handleChange, handleBufferList, data, mapControl }) => { const coordList = data ? data[0].coordList : null; + useEffect(() => { + console.log("상현",mapControl.drawType); + }, [coordList]) + // console.log("성횬"+props.data[0]); + return ( + @@ -67,6 +73,7 @@ const FlightPlanAreaDetailForm = ({ handleSave, handleClose, handleChange, handl placeholdeer='' readOnly /> + } @@ -85,22 +92,27 @@ const FlightPlanAreaDetailForm = ({ handleSave, handleClose, handleChange, handl
- + { + const {name, value} = e.target; + + handleChange({ name, value }) }} - /> + />
handleBufferList()} + disabled={coordList[0].lat && (mapControl.drawType===("LINE") || mapControl.drawType===("CIRCLE")) ? false : true } + > 적용 diff --git a/src/components/basis/flight/plan/FlightPlanAreaMap.js b/src/components/basis/flight/plan/FlightPlanAreaMap.js index 30c14d5..554f52b 100644 --- a/src/components/basis/flight/plan/FlightPlanAreaMap.js +++ b/src/components/basis/flight/plan/FlightPlanAreaMap.js @@ -50,6 +50,7 @@ const FlightPlanAreaMap = (props) => { const ModeInit = () => { setMode(mapControl.drawType) + } const NaverMapInit = () => { diff --git a/src/containers/basis/flight/plan/FlightPlanAreaDetailContainer.js b/src/containers/basis/flight/plan/FlightPlanAreaDetailContainer.js index c6e5443..b1126df 100644 --- a/src/containers/basis/flight/plan/FlightPlanAreaDetailContainer.js +++ b/src/containers/basis/flight/plan/FlightPlanAreaDetailContainer.js @@ -9,6 +9,8 @@ import {initFlightBas} from '../../../../modules/basis/flight/models/basisFlight const FlightPlanAreaDetailContainer = ({ handleModal }) => { const dispatch = useDispatch(); + const mapControl = useSelector(state => state.controlMapReducer); + const { areaCoordList, detail } = useSelector(state => state.flightState); const [areaDetail, setAreaDetail] = useState(initFlightBas.initDetail.areaList); @@ -76,6 +78,7 @@ const FlightPlanAreaDetailContainer = ({ handleModal }) => { handleBufferList={handleBufferList} areaCoordList={areaCoordList} data={areaDetail} + mapControl={mapControl} />