diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 459b81e6..2047d340 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -145,6 +145,7 @@ export default function ControlApprovalsContainer({ mode }) { return; case 'closedSync': popupRef.current.close(); + popupRef.current = null; // localStorage.removeItem('popupState'); return; default: @@ -173,6 +174,7 @@ export default function ControlApprovalsContainer({ mode }) { if (popupX >= parentX && popupX <= parentX + parentWidth) { popup.close(); + popupRef.current = null; setIsPopup(false); clearInterval(timer); } @@ -193,6 +195,7 @@ export default function ControlApprovalsContainer({ mode }) { if (popupRef.current) { popupRef.current.close(); + popupRef.current = null; } }; @@ -281,7 +284,7 @@ export default function ControlApprovalsContainer({ mode }) { } // ); setFilter(search); - if (popup) { + if (isPopup) { popupRef.current.postMessage({ type: 'handlerSearchRs', payload: { search } diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js index 0574427d..fa92f138 100644 --- a/src/containers/flight/OperationApprovalsContainer.js +++ b/src/containers/flight/OperationApprovalsContainer.js @@ -328,7 +328,7 @@ export default function OperationApprovalsContainer({ mode }) { } // ); setFilter(search); - if (popup) { + if (isPopup) { popupRef.current.postMessage({ type: 'handlerSearchRs', payload: { search } diff --git a/src/containers/rightMenuContainer.js b/src/containers/rightMenuContainer.js index d802469b..a42db109 100644 --- a/src/containers/rightMenuContainer.js +++ b/src/containers/rightMenuContainer.js @@ -95,7 +95,7 @@ function RightMenuContainer() { setEndDate(searchDate.endDate); setFilter(search); if ( - search != '' && + search !== '' && (search === '승인' || search === '미승인' || search === '비대상') ) { dispatch(