Browse Source

비행승인 팝업 종료시 ref null 처리

master
김장현 2 months ago
parent
commit
d24848828b
  1. 5
      src/containers/flight/ControlApprovalsContainer.js
  2. 2
      src/containers/flight/OperationApprovalsContainer.js
  3. 2
      src/containers/rightMenuContainer.js

5
src/containers/flight/ControlApprovalsContainer.js

@ -145,6 +145,7 @@ export default function ControlApprovalsContainer({ mode }) {
return; return;
case 'closedSync': case 'closedSync':
popupRef.current.close(); popupRef.current.close();
popupRef.current = null;
// localStorage.removeItem('popupState'); // localStorage.removeItem('popupState');
return; return;
default: default:
@ -173,6 +174,7 @@ export default function ControlApprovalsContainer({ mode }) {
if (popupX >= parentX && popupX <= parentX + parentWidth) { if (popupX >= parentX && popupX <= parentX + parentWidth) {
popup.close(); popup.close();
popupRef.current = null;
setIsPopup(false); setIsPopup(false);
clearInterval(timer); clearInterval(timer);
} }
@ -193,6 +195,7 @@ export default function ControlApprovalsContainer({ mode }) {
if (popupRef.current) { if (popupRef.current) {
popupRef.current.close(); popupRef.current.close();
popupRef.current = null;
} }
}; };
@ -281,7 +284,7 @@ export default function ControlApprovalsContainer({ mode }) {
} }
// ); // );
setFilter(search); setFilter(search);
if (popup) { if (isPopup) {
popupRef.current.postMessage({ popupRef.current.postMessage({
type: 'handlerSearchRs', type: 'handlerSearchRs',
payload: { search } payload: { search }

2
src/containers/flight/OperationApprovalsContainer.js

@ -328,7 +328,7 @@ export default function OperationApprovalsContainer({ mode }) {
} }
// ); // );
setFilter(search); setFilter(search);
if (popup) { if (isPopup) {
popupRef.current.postMessage({ popupRef.current.postMessage({
type: 'handlerSearchRs', type: 'handlerSearchRs',
payload: { search } payload: { search }

2
src/containers/rightMenuContainer.js

@ -95,7 +95,7 @@ function RightMenuContainer() {
setEndDate(searchDate.endDate); setEndDate(searchDate.endDate);
setFilter(search); setFilter(search);
if ( if (
search != '' && search !== '' &&
(search === '승인' || search === '미승인' || search === '비대상') (search === '승인' || search === '미승인' || search === '비대상')
) { ) {
dispatch( dispatch(

Loading…
Cancel
Save