From 4756afcd69ec409b94d271e46e8b737e0e48dfba Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Thu, 2 Jun 2022 18:27:34 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20alert=20->=20sweetalert2=20=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  2 +
 src/assets/scss/style.scss                    | 32 ++++++++
 src/commons/XitCmm.js                         | 77 ++++++++++++++++++
 .../biz/admin/judge/JudgeDataDetailForm.jsx   | 18 +++--
 .../biz/admin/judge/JudgeDataModifyForm.jsx   | 17 +++-
 .../biz/admin/judge/JudgeDataNewForm.jsx      | 23 ++++--
 src/views/biz/admin/judge/JudgeDataReview.jsx | 81 ++++++++++---------
 src/views/biz/admin/judge/JudgeModal.jsx      |  1 +
 .../biz/admin/judge/JudgeRegistReview.jsx     | 20 ++---
 src/views/biz/admin/judge/JudgeReview.jsx     | 30 +++++--
 .../biz/admin/parking/ParkingRegister.jsx     | 24 ++++--
 src/views/biz/board/Board.jsx                 | 24 +++---
 src/views/biz/pboard/PublicBoard.jsx          | 31 +++----
 src/views/biz/user/UserManager.jsx            | 58 ++++++-------
 src/views/biz/user/UserManagerForm.jsx        | 13 ++-
 src/views/cmm/file-ctl/ImageFileViewForm.jsx  |  2 +-
 src/views/cmm/mui-grid/MuiDataGrid.jsx        |  1 +
 17 files changed, 321 insertions(+), 133 deletions(-)

diff --git a/public/index.html b/public/index.html
index ba41fd0..11503a9 100755
--- a/public/index.html
+++ b/public/index.html
@@ -55,6 +55,8 @@
       rel="stylesheet"
       crossorigin="anonymous"
     />
+    <link rel="stylesheet" href="@sweetalert2/themes/dark/dark.css">
+    <script src="sweetalert2/dist/sweetalert2.min.js"></script>
     <style>
       .alert-swal{
         z-index: 100000;
diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
index 23e298c..ea9d82f 100755
--- a/src/assets/scss/style.scss
+++ b/src/assets/scss/style.scss
@@ -310,4 +310,36 @@
 .marginNone>*{
   margin-right:0px !important;
   border:0px solid red;
+}
+
+.colored-toast {
+  z-index: 9999999999;
+}
+
+.colored-toast.swal2-icon-error {
+  background-color: #f27474 !important;
+}
+
+.colored-toast.swal2-icon-warning {
+  background-color: #f8bb86 !important;
+}
+
+.colored-toast.swal2-icon-info {
+  background-color: #3fc3ee !important;
+}
+
+.colored-toast.swal2-icon-question {
+  background-color: #87adbd !important;
+}
+
+.colored-toast .swal2-title {
+  color: white;
+}
+
+.colored-toast .swal2-close {
+  color: white;
+}
+
+.colored-toast .swal2-html-container {
+  color: white;
 }
\ No newline at end of file
diff --git a/src/commons/XitCmm.js b/src/commons/XitCmm.js
index 5910ce2..a0c8688 100644
--- a/src/commons/XitCmm.js
+++ b/src/commons/XitCmm.js
@@ -1,6 +1,10 @@
 import Swal from 'sweetalert2';
+import withReactContent from 'sweetalert2-react-content';
+
 import format from 'date-fns/format';
 
+const swal = withReactContent(Swal);
+
 const XitCmm = {
   /**
    * validation check error message
@@ -136,4 +140,77 @@ const XitCmm = {
     else document.cookie = `${name}=${encodeURIComponent(value)}${{ expires: 'Sun, 01-May-2019 14:00:00 UTC' }}`;
   }
 };
+
+export const confirmAlert = (text, confirmProcess, dismissProcess) => {
+  swal
+    .fire({
+      backdrop: true,
+      icon: 'warning',
+      text,
+      showCancelButton: true,
+      confirmButtonColor: '#3085d6',
+      cancelButtonColor: '#d33',
+      cancelButtonText: '취소',
+      confirmButtonText: '승인'
+    })
+    .then((result) => {
+      /* Read more about isConfirmed, isDenied below */
+      if (result.isConfirmed) {
+        confirmProcess();
+        // swal.close();
+      } else if (result.dismiss === Swal.DismissReason.cancel) {
+        if (dismissProcess) dismissProcess();
+        // swal.close();
+      }
+    });
+};
+
+export const saveAlert = (confirmProcess, dismissProcess) => {
+  confirmAlert('저장 하시겠습니까?', confirmProcess, dismissProcess);
+};
+
+export const removeAlert = (confirmProcess, dismissProcess) => {
+  confirmAlert('삭제 하시겠습니까?', confirmProcess, dismissProcess);
+};
+
+export const Toast = swal.mixin({
+  toast: true,
+  backdrop: true,
+  position: 'center-center', // 'bottom', 'center-center',
+  showConfirmButton: true,
+  iconColor: 'white',
+  customClass: {
+    popup: 'colored-toast'
+  },
+  timer: 2000,
+  timerProgressBar: true
+  // didOpen: (toast) => {
+  //   toast.addEventListener('mouseenter', Swal.stopTimer);
+  //   toast.addEventListener('mouseleave', Swal.resumeTimer);
+  // }
+
+  // toast: true,
+  // backdrop: true,
+  // position: 'bottom',
+  // iconColor: 'white',
+  // customClass: {
+  //   popup: 'colored-toast'
+  // },
+  // showConfirmButton: true,
+  // timer: 1500,
+  // timerProgressBar: true
+});
+
+export const ErrorToast = swal.mixin({
+  toast: true,
+  icon: 'error',
+  backdrop: true,
+  position: 'center-center', // 'bottom', 'center-center',
+  showConfirmButton: true,
+  iconColor: 'white',
+  customClass: {
+    popup: 'colored-toast'
+  }
+});
+
 export default XitCmm;
diff --git a/src/views/biz/admin/judge/JudgeDataDetailForm.jsx b/src/views/biz/admin/judge/JudgeDataDetailForm.jsx
index e268014..a34b54b 100644
--- a/src/views/biz/admin/judge/JudgeDataDetailForm.jsx
+++ b/src/views/biz/admin/judge/JudgeDataDetailForm.jsx
@@ -12,8 +12,9 @@ import { Delete, List } from '@mui/icons-material';
 import { judgeFileDownload, judgeImgDownload } from 'apis/judge';
 import ImageFileViewForm from '../../../cmm/file-ctl/ImageFileViewForm';
 import CmmImgViewModal from '../../../cmm/CmmImgViewModal';
+import { removeAlert } from '../../../../commons/XitCmm';
 
-const ModifyJudgeDataForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSave, onModify }) => {
+const ModifyJudgeDataForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSave, onModify, setDetail }) => {
   const showAlert = useAlert();
 
   const [selectedContDoc, setSelectedContDoc] = useState(rowData?.scContDoc);
@@ -24,15 +25,20 @@ const ModifyJudgeDataForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSav
   const [imgName, setImgName] = useState();
 
   const onList = () => {
+    setDetail(false);
     setOpen(false);
   };
 
   const onRemove = () => {
-    if (window.confirm('삭제 하시겠습니까?')) {
-      handleModalSave('DELETE', { scCode: rowData.scCode });
-    } else {
-      window.close();
-    }
+    setOpen(false);
+    setDetail(false);
+    removeAlert(
+      () => handleModalSave('DELETE', { scCode: rowData.scCode }),
+      () => {
+        setOpen(true);
+        setDetail(true);
+      }
+    );
   };
 
   const viewImg = async (methodName, labelName, fileName) => {
diff --git a/src/views/biz/admin/judge/JudgeDataModifyForm.jsx b/src/views/biz/admin/judge/JudgeDataModifyForm.jsx
index 0696559..406bf75 100644
--- a/src/views/biz/admin/judge/JudgeDataModifyForm.jsx
+++ b/src/views/biz/admin/judge/JudgeDataModifyForm.jsx
@@ -11,8 +11,9 @@ import { IconSearch } from '@tabler/icons';
 
 import ImageFileInputForms from 'views/cmm/file-ctl/ImageFileInputForms';
 import DaumPost from '../../../cmm/DaumPost';
+import { removeAlert, saveAlert } from '../../../../commons/XitCmm';
 
-const JudgeDataModifyForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSave }) => {
+const JudgeDataModifyForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSave, setModify }) => {
   const alert = useAlert();
   const [isPostOpen, setIsPostOpen] = useState(false);
 
@@ -128,7 +129,19 @@ const JudgeDataModifyForm = ({ rowData, contDocs, ingbs, setOpen, handleModalSav
       return;
     }
 
-    handleModalSave('SAVE', formData);
+    setOpen(false);
+    setModify(false);
+    saveAlert(
+      () => {
+        handleModalSave('SAVE', formData);
+      },
+      () => {
+        setOpen(true);
+        setModify(true);
+      }
+    );
+
+    // handleModalSave('SAVE', formData);
   };
 
   const handleChangeFile = (e) => {
diff --git a/src/views/biz/admin/judge/JudgeDataNewForm.jsx b/src/views/biz/admin/judge/JudgeDataNewForm.jsx
index 253f081..263c6b3 100644
--- a/src/views/biz/admin/judge/JudgeDataNewForm.jsx
+++ b/src/views/biz/admin/judge/JudgeDataNewForm.jsx
@@ -12,10 +12,11 @@ import { IconSearch } from '@tabler/icons';
 
 import ImageFileInputForms from 'views/cmm/file-ctl/ImageFileInputForms';
 import DaumPost from '../../../cmm/DaumPost';
+import { saveAlert, Toast } from '../../../../commons/XitCmm';
 
 const toDate = new Date();
 
-const JudgeDataNewForm = ({ scDatagb, contDocs, ingbs, handleModalSave }) => {
+const JudgeDataNewForm = ({ scDatagb, contDocs, ingbs, handleModalSave, setOpen, setCreate }) => {
   const alert = useAlert();
   const [isPostOpen, setIsPostOpen] = useState(false);
 
@@ -66,10 +67,12 @@ const JudgeDataNewForm = ({ scDatagb, contDocs, ingbs, handleModalSave }) => {
       formData.append('contadFiles', v);
     });
 
-    // console.log(Object.values(picads)[0]);
-
     // 필수항목 빈값 체크
     if (scCarnum.length < 1) {
+      // Toast.fire({
+      //   icon: 'warning',
+      //   title: '차량번호는 필수입니다.'
+      // });
       alert.show('차량번호는 필수입니다.');
       return;
     }
@@ -106,7 +109,15 @@ const JudgeDataNewForm = ({ scDatagb, contDocs, ingbs, handleModalSave }) => {
       return;
     }
 
-    handleModalSave('SAVE', formData);
+    setOpen(false);
+    setCreate(false);
+    saveAlert(
+      () => handleModalSave('SAVE', formData),
+      () => {
+        setOpen(true);
+        setCreate(true);
+      }
+    );
   };
 
   const handleChangeFile = (e) => {
@@ -352,6 +363,8 @@ JudgeDataNewForm.propTypes = {
   scDatagb: PropTypes.string.isRequired,
   contDocs: PropTypes.array.isRequired,
   ingbs: PropTypes.array.isRequired,
-  handleModalSave: PropTypes.func.isRequired
+  handleModalSave: PropTypes.func.isRequired,
+  setOpen: PropTypes.func,
+  setCreate: PropTypes.func
 };
 export default JudgeDataNewForm;
diff --git a/src/views/biz/admin/judge/JudgeDataReview.jsx b/src/views/biz/admin/judge/JudgeDataReview.jsx
index 00e928d..1775bb3 100644
--- a/src/views/biz/admin/judge/JudgeDataReview.jsx
+++ b/src/views/biz/admin/judge/JudgeDataReview.jsx
@@ -22,7 +22,9 @@ const JudgeDataReview = ({ scDatagb, menuName }) => {
   const [scContDocs, setScContDocs] = useState([]);
   const [scIngbs, setScIngbs] = useState([]);
 
-  const [open, setOpen] = useState(false);
+  const [newOpen, setNewOpen] = useState(false);
+  const [dtlOpen, setDtlOpen] = useState(false);
+  const [modOpen, setModOpen] = useState(false);
   const [create, setCreate] = useState(false);
   const [detail, setDetail] = useState(false);
   const [modify, setModify] = useState(false);
@@ -103,13 +105,11 @@ const JudgeDataReview = ({ scDatagb, menuName }) => {
   }, []);
 
   const handleCreate = () => {
-    // setIsPostOpen(true);
-
     setModify(false);
     setDetail(false);
     setCreate(true);
     setTitle(`${menuName} 의견진술 자료 신규 등록`);
-    setOpen(true);
+    setNewOpen(true);
   };
 
   const handleOnCellClick = (e) => {
@@ -120,37 +120,30 @@ const JudgeDataReview = ({ scDatagb, menuName }) => {
         setDetail(true);
         setRowData(res.data);
         setTitle(`${menuName} 의견진술 자료 상세`);
-        setOpen(true);
+        setDtlOpen(true);
       });
     }
   };
 
-  const handleSaveResident = (type, payload) => {
+  const handleJudgeData = (type, payload) => {
     switch (type) {
       case 'SAVE':
-        if (window.confirm('저장 하시겠습니까?')) {
-          saveJudgeData(payload).then((res) => {
-            if (res?.success) {
-              setCreate(false);
-              setModify(false);
-              setDetail(false);
-              setOpen(false);
-              search();
-            } else {
-              showAlert.show(`${res?.data.message}`);
-            }
-          });
-        } else {
-          window.close();
-        }
+        saveJudgeData(payload).then((res) => {
+          if (res?.success) {
+            setCreate(false);
+            setDetail(false);
+            search();
+          } else {
+            showAlert.show(`${res?.data.message}`);
+          }
+        });
+
         break;
       case 'DELETE':
         removeJudgeData(payload).then((res) => {
           if (res?.success) {
             setCreate(false);
             setModify(false);
-            setDetail(false);
-            setOpen(false);
             search();
           } else {
             showAlert.show(`${res?.data.message}`);
@@ -162,13 +155,13 @@ const JudgeDataReview = ({ scDatagb, menuName }) => {
   };
 
   const openModify = () => {
-    setOpen(false);
+    setDtlOpen(false);
     setCreate(false);
     setDetail(false);
 
     setModify(true);
     setTitle(`${menuName} 의견진술 자료 변경`);
-    setOpen(true);
+    setModOpen(true);
   };
 
   return (
@@ -192,30 +185,44 @@ const JudgeDataReview = ({ scDatagb, menuName }) => {
         setRowsState={setRowsState}
         handleCellClick={handleOnCellClick}
       />
-      <CmmModal isBackdrop title={title} open={open} setOpen={setOpen}>
-        {create && <JudgeDataNewForm handleModalSave={handleSaveResident} scDatagb={scDatagb} contDocs={scContDocs} ingbs={scIngbs} />}
-        {/* {!create && <JudgeDataModifyForm handleModalSave={handleSaveResident} rowData={rowData} />} */}
-        {detail && (
+      {create && (
+        <CmmModal isBackdrop title={title} open={newOpen} setOpen={setNewOpen}>
+          <JudgeDataNewForm
+            handleModalSave={handleJudgeData}
+            scDatagb={scDatagb}
+            contDocs={scContDocs}
+            ingbs={scIngbs}
+            setOpen={setNewOpen}
+            setCreate={setCreate}
+          />
+        </CmmModal>
+      )}
+      {detail && (
+        <CmmModal isBackdrop title={title} open={dtlOpen} setOpen={setDtlOpen}>
           <JudgeDataDetailForm
             rowData={rowData}
             contDocs={scContDocs}
             ingbs={scIngbs}
-            setOpen={setOpen}
-            handleModalSave={handleSaveResident}
+            setDetail={setDetail}
+            handleModalSave={handleJudgeData}
             onModify={openModify}
+            setOpen={setDtlOpen}
           />
-        )}
-        {modify && (
+        </CmmModal>
+      )}
+      {modify && (
+        <CmmModal isBackdrop title={title} open={modOpen} setOpen={setModOpen}>
           <JudgeDataModifyForm
             rowData={rowData}
             contDocs={scContDocs}
             ingbs={scIngbs}
-            setOpen={setOpen}
-            handleModalSave={handleSaveResident}
+            setModify={setModify}
+            handleModalSave={handleJudgeData}
             onModify={openModify}
+            setOpen={setModOpen}
           />
-        )}
-      </CmmModal>
+        </CmmModal>
+      )}
     </MainCard>
   );
 };
diff --git a/src/views/biz/admin/judge/JudgeModal.jsx b/src/views/biz/admin/judge/JudgeModal.jsx
index 219aedf..ee29056 100644
--- a/src/views/biz/admin/judge/JudgeModal.jsx
+++ b/src/views/biz/admin/judge/JudgeModal.jsx
@@ -9,6 +9,7 @@ import Button from '@mui/material/Button';
 import combo from 'commons/combo_data';
 import { useState } from 'react';
 import { saveJudgeStds, saveJudgeTargets } from '../../../../apis/judge';
+import { confirmAlert, saveAlert } from '../../../../commons/XitCmm';
 
 const style = {
   position: 'relative',
diff --git a/src/views/biz/admin/judge/JudgeRegistReview.jsx b/src/views/biz/admin/judge/JudgeRegistReview.jsx
index e012785..029542b 100644
--- a/src/views/biz/admin/judge/JudgeRegistReview.jsx
+++ b/src/views/biz/admin/judge/JudgeRegistReview.jsx
@@ -13,7 +13,7 @@ import MainCard from 'ui-component/cards/MainCard';
 // project imports
 import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid';
 
-import xitCmm from 'commons/XitCmm';
+import xitCmm, { ErrorToast, saveAlert, Toast } from 'commons/XitCmm';
 import CmmModal from 'views/cmm/CmmModal';
 import JudgeTargetSaveForm from 'views/biz/admin/judge/JudgeTargetSaveForm';
 import NumberFormat from 'react-number-format';
@@ -84,8 +84,10 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
     }
   };
 
-  const submitResidentTargets = (params) => {
-    if (window.confirm('저장 하시겠습니까?')) {
+  const submitJudgeTargets = (params) => {
+    setOpen(false);
+
+    saveAlert(() => {
       const param = {
         ...params,
         scDatagb, // 거주자
@@ -94,18 +96,18 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
         scSeq2,
         scCodes: selectionModel.map((d) => rowsState.rows[d - 1].scCode)
       };
-      setOpen(false);
-      console.log(param);
-
       saveJudgeTargets(param).then((res) => {
         if (res?.success) {
           setSelectionModel([]);
           search();
         } else {
-          showAlert.show(`${res?.data.message}`);
+          ErrorToast.fire({
+            title: `${res?.data.message}`
+          });
+          // showAlert.show(`${res?.data.message}`);
         }
       });
-    }
+    });
   };
 
   const handleSearch = () => {
@@ -221,7 +223,7 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
         selectionModel={selectionModel}
       />
       <CmmModal isBackdrop title={title} open={open} setOpen={setOpen}>
-        <JudgeTargetSaveForm isDisabled={selectionModel.length === 0} handleModalSave={submitResidentTargets} />
+        <JudgeTargetSaveForm isDisabled={selectionModel.length === 0} handleModalSave={submitJudgeTargets} />
       </CmmModal>
     </MainCard>
   );
diff --git a/src/views/biz/admin/judge/JudgeReview.jsx b/src/views/biz/admin/judge/JudgeReview.jsx
index 5f2fc0b..03d95b8 100644
--- a/src/views/biz/admin/judge/JudgeReview.jsx
+++ b/src/views/biz/admin/judge/JudgeReview.jsx
@@ -21,6 +21,7 @@ import CmmModal from 'views/cmm/CmmModal';
 import ModalJudgeResult from './ModalJudgeResult';
 import { findParkings, removeParkingJudge } from '../../../../apis/parking';
 import { useAlert } from 'react-alert';
+import { removeAlert } from '../../../../commons/XitCmm';
 
 const year = getYear(new Date());
 const years = _.range(year, year - 14, -1);
@@ -74,9 +75,10 @@ const JudgeReview = ({ msDatagb, menuName }) => {
   }, [msDatagb, rowsState.page, rowsState.pageSize, selectedYear]);
 
   const removeJudge = useCallback(
-    (row) => async () => {
+    (row) => () => {
       let res = {};
-      if (window.confirm('삭제 하시겠습니까?')) {
+
+      removeAlert(async () => {
         if (msDatagb) {
           res = await removeJudge(row);
         } else {
@@ -92,9 +94,27 @@ const JudgeReview = ({ msDatagb, menuName }) => {
         } else {
           showAlert.show(res.message);
         }
-      } else {
-        window.close();
-      }
+      });
+
+      // if (window.confirm('삭제 하시겠습니까?')) {
+      //   if (msDatagb) {
+      //     res = await removeJudge(row);
+      //   } else {
+      //     res = await removeParkingJudge(row);
+      //   }
+      //   console.log(res);
+      //   if (res && res.success) {
+      //     setRowsState({
+      //       ...rowsState,
+      //       page: 0
+      //     });
+      //     search();
+      //   } else {
+      //     showAlert.show(res.message);
+      //   }
+      // } else {
+      //   window.close();
+      // }
     },
     []
   );
diff --git a/src/views/biz/admin/parking/ParkingRegister.jsx b/src/views/biz/admin/parking/ParkingRegister.jsx
index 9498ebd..29685de 100644
--- a/src/views/biz/admin/parking/ParkingRegister.jsx
+++ b/src/views/biz/admin/parking/ParkingRegister.jsx
@@ -13,12 +13,13 @@ import MainCard from 'ui-component/cards/MainCard';
 // project imports
 import MuiDataGrid from 'views/cmm/mui-grid/MuiDataGrid';
 
-import xitCmm from 'commons/XitCmm';
+import xitCmm, { ErrorToast, saveAlert } from 'commons/XitCmm';
 import CmmModal from 'views/cmm/CmmModal';
 import SaveParkingTargetForm from './SaveParkingTargetForm';
 import NumberFormat from 'react-number-format';
 import ExcelDownload from 'views/cmm/file-ctl/ExcelDownload';
 import { findParkingJudgeTargets, saveParkingJudgeTargets } from 'apis/parking';
+import { useAlert } from 'react-alert';
 
 const ParkingRegister = () => {
   const [rcIrTransfer, setRcIrTransfer] = useState('1');
@@ -32,6 +33,7 @@ const ParkingRegister = () => {
     rows: []
   });
   const [open, setOpen] = useState(false);
+  const showAlert = useAlert();
 
   const columns = [
     { headerName: 'No', headerAlign: 'center', field: 'rowId', align: 'center', width: 80 },
@@ -80,7 +82,9 @@ const ParkingRegister = () => {
   };
 
   const submitParkingTargets = (params) => {
-    if (window.confirm('저장 하시겠습니까?')) {
+    setOpen(false);
+
+    saveAlert(() => {
       const param = {
         ...params,
         rcIrTransfer,
@@ -89,13 +93,19 @@ const ParkingRegister = () => {
         rcCodes: selectionModel.map((d) => rowsState.rows[d - 1].rcCode)
       };
       setOpen(false);
-      // return false;
 
-      saveParkingJudgeTargets(param).then(() => {
-        setSelectionModel([]);
-        search();
+      saveParkingJudgeTargets(param).then((res) => {
+        if (res?.success) {
+          setSelectionModel([]);
+          search();
+        } else {
+          ErrorToast.fire({
+            title: `${res?.data.message}`
+          });
+          // showAlert.show(`${res?.data.message}`);
+        }
       });
-    }
+    });
   };
 
   const handleSearch = () => {
diff --git a/src/views/biz/board/Board.jsx b/src/views/biz/board/Board.jsx
index 8952cd5..0986a40 100644
--- a/src/views/biz/board/Board.jsx
+++ b/src/views/biz/board/Board.jsx
@@ -18,6 +18,7 @@ import ModifyBoardForm from './ModifyBoardForm';
 import useAuth from 'hooks/useAuth';
 import { Save } from '@mui/icons-material';
 import NewBoardForm from './NewBoardForm';
+import { removeAlert, saveAlert } from '../../../commons/XitCmm';
 
 const Board = () => {
   const { user } = useAuth();
@@ -119,32 +120,33 @@ const Board = () => {
   const submitBoard = (type, payload) => {
     switch (type) {
       case 'SAVE':
-        if (window.confirm('저장 하시겠습니까?')) {
+        setOpen(false);
+
+        saveAlert(() =>
           saveBoard(payload).then((res) => {
             if (res?.success) {
               search();
-              setOpen(false);
             } else {
               alert.show(`${res?.data.message}`);
+              setOpen(false);
             }
-          }); // .then((res) => {
-        } else {
-          window.close();
-        }
+          })
+        );
         break;
       case 'DELETE':
-        if (window.confirm('삭제 하시겠습니까?')) {
+        setOpen(false);
+
+        removeAlert(() =>
           removeBoard(payload).then((res) => {
             if (res?.success) {
               search();
               setOpen(false);
             } else {
               alert.show(`${res?.data.message}`);
+              setOpen(false);
             }
-          }); // .then((res) => {
-        } else {
-          window.close();
-        }
+          })
+        );
         break;
       default:
     }
diff --git a/src/views/biz/pboard/PublicBoard.jsx b/src/views/biz/pboard/PublicBoard.jsx
index 0b96825..0eed3f4 100644
--- a/src/views/biz/pboard/PublicBoard.jsx
+++ b/src/views/biz/pboard/PublicBoard.jsx
@@ -18,6 +18,7 @@ import { useAlert } from 'react-alert';
 
 import useAuth from 'hooks/useAuth';
 import ModifyPublicBoardForm from './ModifyPublicBoardForm';
+import { removeAlert, saveAlert } from '../../../commons/XitCmm';
 
 const PublicBoard = () => {
   const { user } = useAuth();
@@ -103,28 +104,30 @@ const PublicBoard = () => {
   const submitPublicBoard = (type, payload) => {
     switch (type) {
       case 'SAVE':
-        if (window.confirm('저장 하시겠습니까?')) {
+        setOpen(false);
+
+        saveAlert(() =>
           savePublicBoard(payload).then((res) => {
             if (res?.success) {
               search();
-              setOpen(false);
             } else {
               alert.show(`${res?.data.message}`);
             }
-          }); // .then((res) => {
-        } else {
-          window.close();
-        }
+          })
+        );
         break;
       case 'DELETE':
-        if (window.confirm('삭제 하시겠습니까?')) {
-          removePublicBoard(payload).then(() => {
-            search();
-            setOpen(false);
-          }); // .then((res) => {
-        } else {
-          window.close();
-        }
+        setOpen(false);
+
+        removeAlert(() =>
+          removePublicBoard(payload).then((res) => {
+            if (res?.success) {
+              search();
+            } else {
+              alert.show(`${res?.data.message}`);
+            }
+          })
+        );
         break;
       default:
     }
diff --git a/src/views/biz/user/UserManager.jsx b/src/views/biz/user/UserManager.jsx
index 4598713..d9345ef 100644
--- a/src/views/biz/user/UserManager.jsx
+++ b/src/views/biz/user/UserManager.jsx
@@ -16,6 +16,7 @@ import UserManagerForm from './UserManagerForm';
 import { findUsers, removeUser, saveUser } from 'apis/user';
 import { getComboCodeList } from 'apis/common';
 import { useAlert } from 'react-alert';
+import { Toast } from '../../../commons/XitCmm';
 
 const UserManager = () => {
   const [accesstypes, setAccesstypes] = useState();
@@ -36,7 +37,6 @@ const UserManager = () => {
   const [selectedRow, setSelectedRow] = useState({});
   const [create, setCreate] = useState(false);
   const [title, setTitle] = useState();
-  const alert = useAlert();
 
   const columns = [
     { headerName: 'No.', headerAlign: 'center', field: 'rowId', align: 'center', width: 70 },
@@ -129,7 +129,7 @@ const UserManager = () => {
         setRowsState((prevState) => ({ ...prevState, rows: response.data }));
       }
     });
-  }, [rowsState.page, rowsState.pageSize, searchTxt]);
+  }, [rowsState.page, rowsState.pageSize, category, searchTxt]);
 
   const handleSearch = async (event) => {
     if (event.type === 'keydown' && event.key === 'Enter') {
@@ -184,40 +184,30 @@ const UserManager = () => {
   const handleModalSave = (type, payload) => {
     switch (type) {
       case 'SAVE':
-        if (window.confirm('저장 하시겠습니까?')) {
-          saveUser(payload).then((res) => {
-            if (res?.success) {
-              setRowsState((prevState) => ({
-                ...prevState,
-                page: 0
-              }));
-              search();
-              setOpen(false);
-            } else {
-              alert.show(`${res?.data.message}`);
-            }
-          }); // .then((res) => {
-        } else {
-          window.close();
-        }
+        saveUser(payload).then((res) => {
+          if (res?.success) {
+            setRowsState((prevState) => ({
+              ...prevState,
+              page: 0
+            }));
+            search();
+          } else {
+            Toast.fire({ icon: 'error', title: `${res?.data.message}` });
+          }
+        });
         break;
       case 'DELETE':
-        if (window.confirm('삭제 하시겠습니까?')) {
-          removeUser(payload).then((res) => {
-            if (res?.success) {
-              setRowsState({
-                ...rowsState,
-                page: 0
-              });
-              search();
-              setOpen(false);
-            } else {
-              alert.show(`${res?.data.message}`);
-            }
-          }); // .then((res) => {
-        } else {
-          window.close();
-        }
+        removeUser(payload).then((res) => {
+          if (res?.success) {
+            setRowsState({
+              ...rowsState,
+              page: 0
+            });
+            search();
+          } else {
+            Toast.fire({ icon: 'error', title: `${res?.data.message}` });
+          }
+        });
         break;
       default:
     }
diff --git a/src/views/biz/user/UserManagerForm.jsx b/src/views/biz/user/UserManagerForm.jsx
index c118063..9e36b8f 100644
--- a/src/views/biz/user/UserManagerForm.jsx
+++ b/src/views/biz/user/UserManagerForm.jsx
@@ -9,6 +9,7 @@ import 'react-quill/dist/quill.snow.css';
 // project imports
 import { Delete, List, Save } from '@mui/icons-material';
 import PropTypes from 'prop-types';
+import { removeAlert, saveAlert } from '../../../commons/XitCmm';
 
 const UserManagementForm = (props) => {
   // eslint-disable-next-line react/prop-types
@@ -45,7 +46,11 @@ const UserManagementForm = (props) => {
       alert('비밀번호는 필수입니다.');
       return;
     }
-    handleModalSave('SAVE', saveParam);
+    setOpen(false);
+    saveAlert(
+      () => handleModalSave('SAVE', saveParam),
+      () => setOpen(true)
+    );
   };
 
   const onRemove = () => {
@@ -59,7 +64,11 @@ const UserManagementForm = (props) => {
       team,
       isenable
     };
-    handleModalSave('DELETE', saveParam);
+    setOpen(false);
+    removeAlert(
+      () => handleModalSave('DELETE', saveParam),
+      () => setOpen(true)
+    );
   };
 
   return (
diff --git a/src/views/cmm/file-ctl/ImageFileViewForm.jsx b/src/views/cmm/file-ctl/ImageFileViewForm.jsx
index 4e71e2e..bdb0bbc 100644
--- a/src/views/cmm/file-ctl/ImageFileViewForm.jsx
+++ b/src/views/cmm/file-ctl/ImageFileViewForm.jsx
@@ -1,5 +1,5 @@
 import { InputAdornment, TextField } from '@mui/material';
-import { FileDownload, Info } from '@mui/icons-material';
+import { Info } from '@mui/icons-material';
 import PropTypes from 'prop-types';
 
 const ImageFileViewForm = ({ labelName = '', fileName, methodName = '', handleViewImg = () => {} }) => (
diff --git a/src/views/cmm/mui-grid/MuiDataGrid.jsx b/src/views/cmm/mui-grid/MuiDataGrid.jsx
index f4e6267..fa0200a 100644
--- a/src/views/cmm/mui-grid/MuiDataGrid.jsx
+++ b/src/views/cmm/mui-grid/MuiDataGrid.jsx
@@ -238,6 +238,7 @@ const MuiDataGrid = ({
 
 MuiDataGrid.propTypes = {
   // apiRef: PropTypes.func,
+  gridHeight: PropTypes.number,
   isToolbar: PropTypes.bool,
   children: PropTypes.node,
   isCheckbox: PropTypes.bool,