Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/basis/flight/plan/FlightPlanAreaMap.js

@@ -8,8 +8,11 @@ import {
 } from '../../../../modules/control/map/actions/controlMapActions';
 import { FlightPlanDraw } from '../../../map/naver/draw/FlightPlanDraw';
 import { initFlightBas } from '../../../../modules/basis/flight/models/basisFlightModel';
-import { AREA_COORDINATE_LIST_SAVE } from '../../../../modules/basis/flight/actions/basisFlightAction';
+import {
-import {flightPlanAPI} from '../../../../modules/basis/flight/apis/basisFlightApi'
+  AREA_COORDINATE_LIST_SAVE,
+  AREA_DETAIL_INIT
+} from '../../../../modules/basis/flight/actions/basisFlightAction';
+import { flightPlanAPI } from '../../../../modules/basis/flight/apis/basisFlightApi';
 
 const FlightPlanAreaMap = props => {
   const dispatch = useDispatch();
@@ -29,6 +32,9 @@ const FlightPlanAreaMap = props => {
 
   useEffect(() => {
     NaverMapInit();
+    return () => {
+      dispatch(AREA_DETAIL_INIT());
+    };
   }, []);
 
   useEffect(() => {
@@ -56,7 +62,7 @@ const FlightPlanAreaMap = props => {
         }
       }
     }
-  }, [areaCoordList]);
+  }, [areaCoordList, map]);
 
   const ModeInit = () => {
     setMode(mapControl.drawType);
@@ -136,10 +142,9 @@ const FlightPlanAreaMap = props => {
     setMapAreaCoordList(areaList);
   };
 
-  const handleSearch = async() => {
+  const handleSearch = async () => {
-    const res = await flightPlanAPI.searchArea({query: query});
+    const res = await flightPlanAPI.searchArea({ query: query });
-    console.log(res.data.items, '<<<')
+  };
-  }
 
   const handleChange = e => {
     const { name, value } = e.target;
@@ -246,12 +251,12 @@ const FlightPlanAreaMap = props => {
             // {...props.test? (
             //   {}
             //   ):(
-              //   {disabled:false}
+            //   {disabled:false}
-              // )}
+            // )}
-              disabled={props.test}
+            disabled={props.test}
-            >
+          >
             초기화
-        </Button.Ripple>
+          </Button.Ripple>
         </div>
       </CardBody>
     </Card>

src/containers/basis/group/BasisGroupUsersContainer.js

@@ -127,11 +127,11 @@ export const BasisGroupUsersContainer = props => {
         cstmrSno: user?.cstmrSno
       });
 
-      dispatch(
+      // dispatch(
-        Actions.USER_LIST.request({
+      //   Actions.USER_LIST.request({
-          searchParams: { cstmrSno: user?.cstmrSno }
+      //     searchParams: { cstmrSno: user?.cstmrSno }
-        })
+      //   })
-      );
+      // );
     }
   }, [user]);
 
@@ -144,7 +144,7 @@ export const BasisGroupUsersContainer = props => {
   }, []);
 
   const handlerSearch = () => {
-    dispatch(Actions.USER_LIST.request({ searchParams: params }));
+    dispatch(Actions.USER_LIST.request({ searchParams: params , cstmrSno: user?.cstmrSno}));
   };
 
   const handlerAdminConfirm = cstmrGroupSno => {