Merge branch 'iipbs/wr/dev'

apps/wr/app/(with-layout)/matMng/coMng/coSttn/page.tsx

@@ -63,7 +63,8 @@ export default function CoSttn() {
   });
 
   const [seartchTxt, setSearchTxt] = useState<string>();
-  const [upadateData, setUpdateData] = useState<DemandCompType>();
+  const [updateData, setUpdateData] = useState<DemandCompType>();
+  const [isResetSelection, setIsResetSelection] = useState<boolean>(false);
 
   const getSelCity = useCallback(
     (val: string | number) => {
@@ -135,6 +136,10 @@ export default function CoSttn() {
     }
   }, [coSttn.excelList, code]);
 
+  useEffect(() => {
+    setIsResetSelection(false);
+  }, [updateData]);
+
   const excelClick = useCallback(() => {
     const con =
       objSearch.sgg && objSearch.sgg !== "0" ? objSearch.sgg : objSearch.city;
@@ -160,8 +165,8 @@ export default function CoSttn() {
   };
   const { t } = useTranslation('base');
   const initPassword = () => {
-    if (upadateData) {
-      const dmdInfoId = upadateData.dmdInfoId;
+    if (updateData) {
+      const dmdInfoId = updateData.dmdInfoId;
       const dmdInfoSliceId = `${dmdInfoId.slice(0, 3)}-${dmdInfoId.slice(3, 5)}-${dmdInfoId.slice(5, 10)}-${dmdInfoId.slice(10)}`
       const handleConfirm = () => {
         coSttnPwInit(dmdInfoId);
@@ -219,6 +224,7 @@ export default function CoSttn() {
                     size={"sm"}
                     className={btnClass}
                     onClick={() => {
+                      setIsResetSelection(true);
                       setUpdateData(undefined);
                       setIsDmdModal({ ...isDmdModal, isMoal: true });
                     }}
@@ -231,7 +237,7 @@ export default function CoSttn() {
                     className={btnClass}
                     onClick={() => {
                       /* 저장 로직 */
-                      if (!upadateData) {
+                      if (!updateData) {
                         toast.error("수요처 변경을 원하는 행을 선택해주세요");
                       } else {
                         setIsDmdModal({
@@ -283,13 +289,14 @@ export default function CoSttn() {
                   setPageNation(page);
                   coSttnSearch(String(page), "13", String(con));
                 }}
+                resetSelection={isResetSelection}
               ></UiTable>
             </ListDiv>
           </div>
         </div>
         <UiModal
           bodyClass={
-            "w-[40vw] max-w-none h-[83vh] " // +upadateData?.dmdInfoId?'h-[60vh]':'h-[90vh]'
+            "w-[40vw] max-w-none h-[83vh] " // +updateData?.dmdInfoId?'h-[60vh]':'h-[90vh]'
           }
           open={isDmdModal.isMoal}
           onOpenChange={() => {
@@ -308,7 +315,7 @@ export default function CoSttn() {
                   objSearch.sgg && objSearch.sgg !== "0"
                     ? objSearch.sgg
                     : objSearch.city;
-                if (upadateData?.dmdInfoId) {
+                if (updateData?.dmdInfoId) {
                   await updateDemandCompany(data as DemandCompType);
                   coSttnInit("1", "13", String(con));
                   setIsDmdModal({
@@ -335,7 +342,7 @@ export default function CoSttn() {
                 }
               }}
               bodyClassNm={"w-full mx-auto bg-white rounded-lg shadow-md p-6"}
-              updateList={upadateData}
+              updateList={updateData}
               openNetwork={false}
             ></SdmInsertForm>
           }

apps/wr/app/(with-layout)/ruseFcltMng/prfmncReg/chkgdnReg/page.tsx

@@ -67,12 +67,8 @@ export default function Page() {
   });
   const { regAuthrtYn, mdfcnAuthrtYn, delAuthrtYn,laeSeCd } = auth;
   const [isRegExcel, setIsRegExcel] = useState(false);
-  const [updateRainDetail, setUpdateRainDetail] = useState<rainChkZodType[]>(
-    []
-  );
-  const [updateRswtDetail, setUpdateRSwtDetail] = useState<
-    rswtrChkDetailsZodType[]
-  >([]);
+  const [updateRainDetail, setUpdateRainDetail] = useState<rainChkZodType[]>([]);
+  const [updateRswtDetail, setUpdateRSwtDetail] = useState<rswtrChkDetailsZodType[]>([]);
   const [deleteIdx, setDeleteIdx] = useState<number[]>([]);
   const [rainPageNation, setRainPageNation] = useState(1);
   const [rswtPageNation, setRswtPageNation] = useState(1);

apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/index.tsx

@@ -264,7 +264,7 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
         const res = await putFectch("/reuseChk/rainy/list", chData);
         if (res) {
           toast.success(
-            "지도점검 대체수 및 밋물이용량 수정이 완료되었습니다. "
+            "지도점검 대체수 및 빗물이용량 수정이 완료되었습니다. "
           );
           const rainChkRes = await initFetch(
             1,
@@ -281,11 +281,11 @@ export const rainChkgdnActionsExport: (set: any) => rainChkgdnActions = (
             },
           }));
         } else {
-          toast.error("지도점검 대체수 및 밋물이용량 수정 오류입니다.");
+          toast.error("지도점검 대체수 및 빗물이용량 수정 오류입니다.");
         }
       } catch (error) {
         console.log(error);
-        toast.error("지도점검 대체수 및 밋물이용량 수정 오류입니다.");
+        toast.error("지도점검 대체수 및 빗물이용량 수정 오류입니다.");
       }
     },
     rainChkGuidUpdate: async (rainChk: rainChkZodType) => {

apps/wr/components/ui/table/chkgdTable/rainChkgd/rainChkgdTable.tsx

@@ -155,7 +155,7 @@ export default function RainChkgdTable({
 
 
       setUpRaintDetail(updateTableData as rainChkZodType[]);
-    }
+    } else setUpRaintDetail(selectedData);
   }, [makeTableData, selectedIds]);
 
   useEffect(() => {