From fc424a2f46a59d170174362adce300f40cb8944a Mon Sep 17 00:00:00 2001 From: jyha00 Date: Fri, 11 Jul 2025 18:03:48 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=97=EB=AC=BC/=EC=A4=91=EC=88=98=EB=8F=84?= =?UTF-8?q?=EC=8B=9C=EC=84=A4=20=EB=93=B1=EB=A1=9D,=20=EC=9E=A0=EC=9E=AC?= =?UTF-8?q?=EC=88=98=EC=9A=94=EC=B2=98=20=EC=83=81=EC=84=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=BB=A8=ED=8E=8C?= =?UTF-8?q?=EC=B0=BD=20=EB=9D=84=EC=9A=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wr/app/matMng/coMng/ldrmntCoSttn/page.tsx | 22 +- apps/wr/components/lib/func/commom.tsx | 64 +- .../ui/form/fcltReg/rainReg/rainRegForm.tsx | 801 +++++++++--------- .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 30 +- 4 files changed, 488 insertions(+), 429 deletions(-) diff --git a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx index d5861e173..e14b25b55 100644 --- a/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx +++ b/apps/wr/app/matMng/coMng/ldrmntCoSttn/page.tsx @@ -5,6 +5,7 @@ import { btnClass } from "@/app/store/common/code"; import { type customLdrmnt } from "@/app/store/matDmd/ldrmntCoSttn"; import { ldrmntHeadListExport } from "@/app/store/matDmd/ldrmntCoSttn/headList"; import { + confirmToast, excelDownload, getCity, tableData @@ -29,9 +30,10 @@ import ListDiv from "@common/business_components/ui/list_div"; import { Button } from "@common/components/ui"; import { useCallback, useEffect, useState } from "react"; import { Toaster } from "react-hot-toast"; +import { useTranslation } from "react-i18next"; export default function LdrmntCoSttn() { - const { code, ldrmnt, ldrmntInit, ldrmntSearch, ldrmntUpdate} = useWrStore( + const { code, ldrmnt, ldrmntInit, ldrmntSearch, ldrmntUpdate } = useWrStore( (state) => state ); const { ldrmntRes, excelList, ldrmntResCount } = ldrmnt; @@ -43,6 +45,7 @@ export default function LdrmntCoSttn() { const [searchTxt, setSearchTxt] = useState(); const [excelData, setExcelData] = useState(); const [resetPage, isResetPage] = useState(false); + const { t } = useTranslation('base'); // const [isExcelDownload, setIsExcelDownload] = useState(false); const excelClick = useCallback(() => { @@ -141,7 +144,7 @@ export default function LdrmntCoSttn() { setBdstTable(tbData); }, [ldrmntRes, code]); - + useEffect(() => { const transData = Array.isArray(excelList) ? excelList : [excelList]; const exData = tableData(transData, { code }); @@ -261,10 +264,17 @@ export default function LdrmntCoSttn() { setDetailModal({ ...detailModal, isOpen: !detailModal.isOpen }) }} bodyClass={"w-[40vw] max-w-none max-h-[calc(100%-70px)]"} - body={{ - await ldrmntUpdate(value) - setDetailModal({ ...detailModal, isOpen: false }) - ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); + body={ { + // confirmToast(t('isUpdateMsg'), await ldrmntUpdate(value)) + // // await ldrmntUpdate(value) + // setDetailModal({ ...detailModal, isOpen: false }) + // ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); + const handleConfirm = async () => { + await ldrmntUpdate(value); + setDetailModal({ ...detailModal, isOpen: false }); + ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || ""); + }; + confirmToast(t('isUpdateMsg'), handleConfirm); }} />} /> diff --git a/apps/wr/components/lib/func/commom.tsx b/apps/wr/components/lib/func/commom.tsx index 7d8c2ffcc..6d96b3540 100644 --- a/apps/wr/components/lib/func/commom.tsx +++ b/apps/wr/components/lib/func/commom.tsx @@ -6,24 +6,26 @@ import { filePickedBlobArray, type SheetParameter, } from "@common/business_components/ui"; +import { Button } from "@common/components/ui"; import type { RefObject } from "react"; +import toast from "react-hot-toast"; export const getCity = (val: string, sggCd: SelectDataType[]) => { - let data:any - if(val !=='0'){ + let data: any + if (val !== '0') { data = sggCd - .filter((item) => String(item.val).substring(0, 2) === val) - .map((item) => ({ - val: item.val, - text: item.text, // 한국어 텍스트 - })); - }else{ + .filter((item) => String(item.val).substring(0, 2) === val) + .map((item) => ({ + val: item.val, + text: item.text, // 한국어 텍스트 + })); + } else { data = sggCd - .map((item) => ({ - val: item.val, - text: item.text, // 한국어 텍스트 - })); + .map((item) => ({ + val: item.val, + text: item.text, // 한국어 텍스트 + })); } data.unshift({ val: "0", text: "전체" }); return data; @@ -92,7 +94,7 @@ export const excelDownload = ( export const excelArrayDownload = ( fileNm: string, sampleFile: string, - sheetArray:SheetParameter [] + sheetArray: SheetParameter[] ) => { if (!sheetArray) return; fetch(`/${sampleFile}`, {}).then(async (response) => { @@ -113,7 +115,7 @@ export const handleCommaNumberChange = ( ) => { const raw = e.target.value.replace(/,/g, ""); if (!/^\d*$/.test(raw)) return; - onChange(raw === "" ? "" : Number(raw)); + onChange(raw === "" ? "" : Number(raw)); }; @@ -124,7 +126,7 @@ export const handleMinusNumberChange = ( ) => { const raw = e.target.value.replace(/,/g, ""); if (!/^\d*$/.test(raw)) return; - onChange(raw === "" ? -1 : Number(raw)); + onChange(raw === "" ? -1 : Number(raw)); }; // 숫자입력시 , 삽입 @@ -175,14 +177,14 @@ export const getdmdMatFlag = (flag: string | undefined | null) => { case "Matched": return "매칭완료"; case "Checked": - return '검토완료'; + return '검토완료'; default: return "신청"; } }; -export const formatPhoneNumber=(tel:string) => { +export const formatPhoneNumber = (tel: string) => { const onlyNums = tel.replace(/[^0-9]/g, ''); if (onlyNums.length === 10) { return onlyNums.replace(/(\d{2})(\d{4})(\d{4})/, '$1-$2-$3'); @@ -191,4 +193,32 @@ export const formatPhoneNumber=(tel:string) => { } else { return tel; // 유효하지 않으면 빈 문자열 } +} + +export const confirmToast = (content: string, saveFunc: () => void) => { + toast((t) => ( + +
+ {content} +
+
+ + +
+ + ), + { + id: "global-confirm-toast", // 중복 토스트 방지 + duration: Infinity, // 자동 사라짐 방지 + }); } \ No newline at end of file diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx index bb62fee61..21a0923ea 100644 --- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx @@ -8,6 +8,7 @@ import { } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import { formH1Class, formH2Class } from "@/components/lib/class/comClass"; import { + confirmToast, formatCommaNumber, handleMinusNumberChange, } from "@/components/lib/func/commom"; @@ -21,6 +22,7 @@ import { z } from "zod"; import BdstReg from "../bdstReg/bdstReg"; import toast from "react-hot-toast"; import BdstAdd from "../bdstReg/bdstAdd"; +import { useTranslation } from "react-i18next"; export default function RainRegForm({ rainForm, @@ -40,9 +42,10 @@ export default function RainRegForm({ const defaultValues: z.infer = rainZod.parse({}); const form = useForm>({ resolver: zodResolver(rainZod), - // defaultValues: defaultValues, + // defaultValues: defaultValues, }); const instlCst = form.watch(`reuseBuilding.0.instlCst`); + const { t } = useTranslation('base'); const [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctYn] = form.watch([ "reuseBuilding.0.grntchBdstCertYn", @@ -51,15 +54,15 @@ export default function RainRegForm({ ]); const [divStyle, setDivStyle] = useState("h-[53vh]"); - useEffect(()=>{ - if(isModal===true){ + useEffect(() => { + if (isModal === true) { setDivStyle("h-[53vh] max-h-[37vh]") - }else if(readonly===true){ + } else if (readonly === true) { setDivStyle("h-[62vh]") - }else{ + } else { setDivStyle("h-[53vh]") } - },[isModal,readonly]); + }, [isModal, readonly]); const cleanRainData = (raw: any): z.infer => { const buildings = @@ -122,7 +125,7 @@ export default function RainRegForm({ // form 값이 변경될 때마다 로그 출력 useEffect(() => { - const subscription = form.watch((value) => {}); + const subscription = form.watch((value) => { }); return () => subscription.unsubscribe(); }, [form]); @@ -139,10 +142,16 @@ export default function RainRegForm({ return; } - rainBdstReg(values, data); - if (setIsModal) setIsModal(false); + const handleConfirm = async () => { + rainBdstReg(values, data); + if (setIsModal) setIsModal(false); + }; + confirmToast(t('isUpdateMsg'), handleConfirm); } else { - rainBdstUpdate(values, "41"); + const handleConfirm = async () => { + rainBdstUpdate(values, "41"); + }; + confirmToast(t('isUpdateMsg'), handleConfirm); } }; @@ -174,150 +183,97 @@ export default function RainRegForm({ - {isModal && rainForm != undefined ? : <>} - {isModal ? ( -

- 빗물이용시설 정보{" "} -

- ) : ( - <> - )} -

기본정보

-
-
- ( - - - field.onChange(date), - }} - selectClass={"w-full"} - readOnly={readonly} - /> - - )} - /> -
+ {isModal && rainForm != undefined ? : <>} + {isModal ? ( +

+ 빗물이용시설 정보{" "} +

+ ) : ( + <> + )} +

기본정보

+
+
+ ( + + + field.onChange(date), + }} + selectClass={"w-full"} + readOnly={readonly} + /> + + )} + /> +
-
- { - const value = field.value; - const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 - return ( - - { - // 입력 시 자동으로 확인불가 해제 - if (isUnknown && !readonly) { - field.onChange(""); // 초기화 +
+ { + const value = field.value; + const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 + return ( + + { - if (readonly) return; - handleMinusNumberChange(e, field.onChange); - }} - /> - - ); - }} - /> + onFocus={() => { + // 입력 시 자동으로 확인불가 해제 + if (isUnknown && !readonly) { + field.onChange(""); // 초기화 + } + }} + onChange={(e) => { + if (readonly) return; + handleMinusNumberChange(e, field.onChange); + }} + /> + + ); + }} + /> +
-
-
-

빗물이용시설 정보

-
-
-

집수면 및 저류조

-
-
-
- { - const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1 - return ( - - { - // 입력 시 자동으로 확인불가 해제 - if (isUnknown && !readonly) { - field.onChange(""); // 초기화 - } - }} - onChange={(e) => { - if (readonly) return; - handleMinusNumberChange(e, field.onChange); - }} - readOnly={readonly} - /> - - ); - }} - /> +
+

빗물이용시설 정보

-
- ( - - {} : field.onChange} - value={field.value ?? rainFcltCd[0]?.val} - readOnly={readonly} - /> - - )} - /> +
+

집수면 및 저류조

-
- { - const value = field.value; - const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 - return ( -
- +
+
+ { + const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1 + return ( + { // 입력 시 자동으로 확인불가 해제 @@ -332,274 +288,327 @@ export default function RainRegForm({ readOnly={readonly} /> -
- ); - }} - /> -
-
- -
-

여과 등 처리시설

-
-
-
- ( - - {} : field.onChange} - value={field.value ?? code.yn[0]?.val} - readOnly={readonly} - /> - - )} - /> -
-
- { - const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1 - return ( - - { - // 입력 시 자동으로 확인불가 해제 - if (isUnknown && !readonly) { - field.onChange(""); // 초기화 - } - }} - onChange={(e) => { - if (readonly) return; - handleMinusNumberChange(e, field.onChange); - }} + ); + }} + /> +
+
+ ( + + { } : field.onChange} + value={field.value ?? rainFcltCd[0]?.val} readOnly={readonly} - disabled={filtrTrtmfctYn !== "Y"} /> - ); - }} - /> + )} + /> +
+
+ { + const value = field.value; + const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 + return ( +
+ + { + // 입력 시 자동으로 확인불가 해제 + if (isUnknown && !readonly) { + field.onChange(""); // 초기화 + } + }} + onChange={(e) => { + if (readonly) return; + handleMinusNumberChange(e, field.onChange); + }} + readOnly={readonly} + /> + +
+ ); + }} + /> +
-
- { - const value = field.value; - const isUnknown = value === null || value === "-"; // 또는 Number(value) === -1 - return ( -
- +
+

여과 등 처리시설

+
+
+
+ ( + + { } : field.onChange} + value={field.value ?? code.yn[0]?.val} + readOnly={readonly} + /> + + )} + /> +
+
+ { + const isUnknown = field.value === null || field.value === -1; // 또는 Number(value) === -1 + return ( + { + // 입력 시 자동으로 확인불가 해제 + if (isUnknown && !readonly) { + field.onChange(""); // 초기화 + } + }} + onChange={(e) => { + if (readonly) return; + handleMinusNumberChange(e, field.onChange); + }} readOnly={readonly} disabled={filtrTrtmfctYn !== "Y"} /> -
- ); - }} - /> -
-
-
-

인센티브 정보

-
-
-

설치비 지원

-
-
-
- ( - - {} : field.onChange} - value={field.value ?? code.yn[0]?.val} - readOnly={readonly} - /> - - )} - /> -
-
- { - const value = field.value; - const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 - return ( - - { - // 입력 시 자동으로 확인불가 해제 - if (isUnknown && !readonly) { - field.onChange(""); // 초기화 - } - }} - onChange={(e) => { - if (readonly) return; - handleMinusNumberChange(e, field.onChange); - }} - disabled={instlCstSprtYn !== "Y"} - /> - - ); - }} - /> -
-
-
-

녹색건축물 인증

-
-
-
- ( - - {} : field.onChange} - value={field.value ?? code.yn[0]?.val} - /> - - )} - /> -
-
- { - const isUnknown = - field.value === null || field.value === "0000"; // 또는 Number(value) === -1 - return ( - - { - // 입력 시 자동으로 확인불가 해제 - if (isUnknown && !readonly) { - field.onChange(""); // 초기화 - } - }} - value={isUnknown ? "확인불가" : (field.value ?? "")} - onChange={(e) => { - if (readonly) return; - if (e.target.value === "확인불가") { - field.onChange("0000"); - } else { - field.onChange(e.target.value); - } - }} - disabled={grntchBdstCertYn !== "Y"} - max={4} - /> - - ); - }} - /> -
-
- { - const isUnknown = - field.value === null || field.value === "0000"; // 또는 Number(value) === -1 - return ( - - { - // 입력 시 자동으로 확인불가 해제 - if (isUnknown && !readonly) { - field.onChange(""); // 초기화 - } - }} - value={isUnknown ? "확인불가" : (field.value ?? "")} - onChange={(e) => { - if (readonly) return; + ); + }} + /> +
+
+ { + const value = field.value; + const isUnknown = value === null || value === "-"; // 또는 Number(value) === -1 - if (e.target.value === "확인불가") { - field.onChange(""); - } else { - field.onChange(e.target.value); - } - }} - disabled={grntchBdstCertYn !== "Y"} + return ( +
+ + + +
+ ); + }} + /> +
+
+
+

인센티브 정보

+
+
+

설치비 지원

+
+
+
+ ( + + { } : field.onChange} + value={field.value ?? code.yn[0]?.val} + readOnly={readonly} /> - ); - }} - /> + )} + /> +
+
+ { + const value = field.value; + const isUnknown = value === null || value === -1; // 또는 Number(value) === -1 + return ( + + { + // 입력 시 자동으로 확인불가 해제 + if (isUnknown && !readonly) { + field.onChange(""); // 초기화 + } + }} + onChange={(e) => { + if (readonly) return; + handleMinusNumberChange(e, field.onChange); + }} + disabled={instlCstSprtYn !== "Y"} + /> + + ); + }} + /> +
-
- ( - - {} : field.onChange} - value={field.value ?? code.bdstGrntchClass[0]?.val} - readOnly={readonly} - /> - - )} - /> +
+

녹색건축물 인증

-
- +
+
+ ( + + { } : field.onChange} + value={field.value ?? code.yn[0]?.val} + /> + + )} + /> +
+
+ { + const isUnknown = + field.value === null || field.value === "0000"; // 또는 Number(value) === -1 + return ( + + { + // 입력 시 자동으로 확인불가 해제 + if (isUnknown && !readonly) { + field.onChange(""); // 초기화 + } + }} + value={isUnknown ? "확인불가" : (field.value ?? "")} + onChange={(e) => { + if (readonly) return; + if (e.target.value === "확인불가") { + field.onChange("0000"); + } else { + field.onChange(e.target.value); + } + }} + disabled={grntchBdstCertYn !== "Y"} + max={4} + /> + + ); + }} + /> +
+
+ { + const isUnknown = + field.value === null || field.value === "0000"; // 또는 Number(value) === -1 + return ( + + { + // 입력 시 자동으로 확인불가 해제 + if (isUnknown && !readonly) { + field.onChange(""); // 초기화 + } + }} + value={isUnknown ? "확인불가" : (field.value ?? "")} + onChange={(e) => { + if (readonly) return; + + if (e.target.value === "확인불가") { + field.onChange(""); + } else { + field.onChange(e.target.value); + } + }} + disabled={grntchBdstCertYn !== "Y"} + /> + + ); + }} + /> +
+
+ ( + + { } : field.onChange} + value={field.value ?? code.bdstGrntchClass[0]?.val} + readOnly={readonly} + /> + + )} + /> +
+
+ diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx index a3d849b29..cb661fee3 100644 --- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx @@ -8,6 +8,7 @@ import { } from "@/app/store/ruseFcltMng/fcltReg/rswtReg"; import { formH1Class, formH2Class } from "@/components/lib/class/comClass"; import { + confirmToast, formatCommaNumber, handleMinusNumberChange } from "@/components/lib/func/commom"; @@ -25,6 +26,7 @@ import { useForm } from "react-hook-form"; import { z } from "zod"; import BdstAdd from "../bdstReg/bdstAdd"; import BdstReg from "../bdstReg/bdstReg"; +import { useTranslation } from "react-i18next"; export default function RswtrRegForm({ rswtForm, @@ -41,20 +43,20 @@ export default function RswtrRegForm({ (state) => state ); const [divStyle, setDivStyle] = useState("h-[53vh]"); - useEffect(()=>{ - if(isModal===true){ + useEffect(() => { + if (isModal === true) { setDivStyle("h-[53vh] max-h-[37vh]") - }else if(readonly===true){ + } else if (readonly === true) { setDivStyle("h-[62vh]") - }else{ + } else { setDivStyle("h-[53vh]") } - },[isModal,readonly]); - // const defaultValues: z.infer = rswtZod.parse({}); + }, [isModal, readonly]); + // const defaultValues: z.infer = rswtZod.parse({}); const form = useForm>({ resolver: zodResolver(rswtZod), - // defaultValues: defaultValues, + // defaultValues: defaultValues, }); const [grntchBdstCertYn, instlCstSprtYn, filtrTrtmfctProcs] = form.watch([ @@ -63,12 +65,20 @@ export default function RswtrRegForm({ "reuseBuilding.0.rswtrObj.filtrTrtmfctProcs", ]); + const { t } = useTranslation('base'); const onSubmit = (values: z.infer) => { if (isModal) { - rswtBdstReg(values, "41"); - if (setIsModal) setIsModal(false); + const handleConfirm = async () => { + rswtBdstReg(values, "41"); + if (setIsModal) setIsModal(false); + }; + confirmToast(t('isUpdateMsg'), handleConfirm); + } else { - rswtBdstUpdate(values, "41"); + const handleConfirm = async () => { + rswtBdstUpdate(values, "41"); + }; + confirmToast(t('isUpdateMsg'), handleConfirm); } };