From 2b866bbc34cc49f5f43b37bc352cc95a6e989786 Mon Sep 17 00:00:00 2001
From: JANGHYUNn <kimjh2369@gmail.com>
Date: Wed, 31 Jul 2024 13:30:39 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=8A=B9=EC=9D=B8=20?=
 =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EA=B2=80=ED=86=A0=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=ED=98=84=ED=99=A9=20=ED=8C=9D=EC=97=85=20=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EB=8F=99=EA=B8=B0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/NewFlightApprovalsReport.js        | 22 +++++++++-------
 .../flight/ControlApprovalsContainer.js       | 18 -------------
 .../flight/OperationApprovalsContainer.js     | 17 ------------
 .../popup/OperationApprovalsPopupContainer.js | 26 +++++++++----------
 4 files changed, 26 insertions(+), 57 deletions(-)

diff --git a/src/components/flight/NewFlightApprovalsReport.js b/src/components/flight/NewFlightApprovalsReport.js
index 7bd1fa10..bb3ee5cd 100644
--- a/src/components/flight/NewFlightApprovalsReport.js
+++ b/src/components/flight/NewFlightApprovalsReport.js
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import Flatpickr from 'react-flatpickr';
 import { Button, Input, CustomInput, Col, Row } from '@component/ui';
 import { Search, Calendar } from 'react-feather';
@@ -12,7 +12,8 @@ export default function NewFlightApprovalsReport(props) {
     startDate: dayjs().format('YYYY-MM-DD'),
     endDate: dayjs().format('YYYY-MM-DD')
   });
-  const location = useLocation();
+
+  const flatPickerRef = useRef(null);
 
   useEffect(() => {
     const popupSyncSearchData = JSON.parse(localStorage.getItem('popupState'));
@@ -24,10 +25,11 @@ export default function NewFlightApprovalsReport(props) {
         address: popupSyncSearchData.address
       });
       props.setFilterId(popupSyncSearchData.filter);
-      setSearchDate({
-        startDate: popupSyncSearchData.startDate,
-        endDate: popupSyncSearchData.endDate
-      });
+
+      flatPickerRef.current.flatpickr.setDate(
+        [popupSyncSearchData.startDate, popupSyncSearchData.endDate],
+        true
+      );
       localStorage.removeItem('popupState');
     }
   }, []);
@@ -51,6 +53,7 @@ export default function NewFlightApprovalsReport(props) {
           <div className='list-input'>
             <div className='calendar-flat'>
               <Flatpickr
+                ref={flatPickerRef}
                 placeholder='날짜를 선택해주세요'
                 id='searchDate'
                 options={{
@@ -146,13 +149,14 @@ export default function NewFlightApprovalsReport(props) {
           <div className='list-input list-input-btn'>
             <Button
               color='primary'
-              onClick={() =>
+              onClick={() => {
+                console.log(searchDate);
                 props.handlerSearch(
                   props.filterId,
                   searchDate,
                   props.filterArea
-                )
-              }
+                );
+              }}
               size='sm'
             >
               검색
diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js
index 39dbf579..1a38c59f 100644
--- a/src/containers/flight/ControlApprovalsContainer.js
+++ b/src/containers/flight/ControlApprovalsContainer.js
@@ -122,18 +122,6 @@ export default function ControlApprovalsContainer({ mode }) {
         const { payload } = e.data;
         console.log(payload);
         switch (type) {
-          case 'initalState':
-            popupRef.current.postMessage({
-              type: 'initalState',
-              payload: {
-                filter,
-                selected,
-                startDate,
-                endDate
-              }
-            });
-
-            return;
           case 'search':
             const { search, searchDate, filterArea } = payload;
 
@@ -293,12 +281,6 @@ export default function ControlApprovalsContainer({ mode }) {
     }
     // );
     setFilter(search);
-    if (isPopup) {
-      popupRef.current.postMessage({
-        type: 'handlerSearchRs',
-        payload: { search }
-      });
-    }
   };
 
   const handlerDetail = area => {
diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js
index 702d929f..c66d47ae 100644
--- a/src/containers/flight/OperationApprovalsContainer.js
+++ b/src/containers/flight/OperationApprovalsContainer.js
@@ -166,17 +166,6 @@ export default function OperationApprovalsContainer({ mode }) {
         const { payload } = e.data;
         // console.log(payload);
         switch (type) {
-          case 'initalState':
-            popupRef.current.postMessage({
-              type: 'initalState',
-              payload: {
-                filter,
-                selected,
-                startDate,
-                endDate
-              }
-            });
-            return;
           case 'search':
             const { search, searchDate, filterArea } = payload;
 
@@ -337,12 +326,6 @@ export default function OperationApprovalsContainer({ mode }) {
     }
     // );
     setFilter(search);
-    if (isPopup) {
-      popupRef.current.postMessage({
-        type: 'handlerSearchRs',
-        payload: { search }
-      });
-    }
   };
 
   //현재 선택한 sno 및 areacoordList 저장
diff --git a/src/containers/flight/popup/OperationApprovalsPopupContainer.js b/src/containers/flight/popup/OperationApprovalsPopupContainer.js
index f878a60d..fab2c6c5 100644
--- a/src/containers/flight/popup/OperationApprovalsPopupContainer.js
+++ b/src/containers/flight/popup/OperationApprovalsPopupContainer.js
@@ -24,7 +24,7 @@ function OperationApprovalsPopupContainer() {
   const dispatch = useDispatch();
 
   useEffect(() => {
-    handlerOpnerPostMessage('initalState', null);
+    // handlerOpnerPostMessage('initalState', null);
     window.addEventListener('message', opnerMessage);
 
     return () => {
@@ -32,19 +32,22 @@ function OperationApprovalsPopupContainer() {
     };
   }, []);
 
+  // 부모창에서 보내는 메세지
   const opnerMessage = e => {
     const { type } = e.data;
     const { payload } = e.data;
 
     switch (type) {
-      case 'initalState':
-        setFilter(payload.filter);
-        setSelected([payload.selected]);
-        setSelectedPlanSno(payload.selectedPlanSno);
-        setStartDate(payload.startDate);
-        setEndDate(payload.endDate);
-
-        return;
+      // case 'initalState':
+      //   setFilterId(payload.filterId);
+      //   // setFilterArea(payload.filterArea);
+      //   setFilter(payload.filter);
+      //   setSelected([payload.selected]);
+      //   setSelectedPlanSno(payload.selectedPlanSno);
+      //   setStartDate(payload.startDate);
+      //   setEndDate(payload.endDate);
+
+      //   return;
       case 'matchingRow':
         handlerMatchingRow(payload.selected, payload.targetValue);
 
@@ -72,6 +75,7 @@ function OperationApprovalsPopupContainer() {
     }
   };
 
+  // 부모에게 보내는 메세지
   const handlerOpnerPostMessage = (type, payload) => {
     switch (type) {
       case 'initalState':
@@ -175,10 +179,6 @@ function OperationApprovalsPopupContainer() {
     handlerOpnerPostMessage('detail', { area });
   };
 
-  const handleBeforeUnload = () => {
-    handlerOpnerPostMessage('closedSync', '');
-  };
-
   return (
     <div className='right-menu active'>
       <div