From 2413cdeb6c25bf5440e7adb136037ab483c6f3ef Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 9 Jul 2025 10:05:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=B9=97=EB=AC=BC/=EC=A4=91=EC=88=98?= =?UTF-8?q?=EB=8F=84/=EC=98=A8=EB=B0=B0=EC=88=98=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 2 +- apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx | 5 ++++- apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx index 5e0786f8b..e114d842b 100644 --- a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx @@ -154,7 +154,7 @@ export default function HtdflRegForm({ )} - + {isModal && htdflForm != undefined ? ( ) : ( diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx index 974d9269c..a0d0f5405 100644 --- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx @@ -81,6 +81,9 @@ export default function RainRegForm({ })), }; }; + useEffect(()=>{ + console.log("이즈모달", isModal) + }, []) useEffect(() => { if (grntchBdstCertYn === "N") { @@ -161,7 +164,7 @@ export default function RainRegForm({ )} - + {isModal && rainForm != undefined ? : <>} {isModal ? (

diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx index f70f4548c..e124ecc6f 100644 --- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx @@ -151,7 +151,7 @@ export default function RswtrRegForm({ )} - + {isModal && rswtForm != undefined ? : <>} {isModal ? (

From 1846873602aa904a28ee0b1c424ad5b6479dc419 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 9 Jul 2025 10:57:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B9=97=EB=AC=BC/=EC=A4=91=EC=88=98?= =?UTF-8?q?=EB=8F=84/=EC=98=A8=EB=B0=B0=EC=88=98=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=9E=AC=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 14 ++++++++++++-- .../ui/form/fcltReg/rainReg/rainRegForm.tsx | 13 ++++++++++++- .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 15 ++++++++++++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx index e114d842b..34163d65f 100644 --- a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx @@ -16,7 +16,7 @@ import { hdtflZod, type customHtdflBdst, } from "@/app/store/ruseFcltMng/fcltReg/htdflReg"; -import { useEffect } from "react"; +import { useEffect, useState } from "react"; import BdstReg from "../bdstReg/bdstReg"; import { formatCommaNumber, @@ -89,6 +89,16 @@ export default function HtdflRegForm({ })), }; }; + const [divStyle, setDivStyle] = useState("h-[53vh]"); + useEffect(()=>{ + if(isModal===true){ + setDivStyle("h-[53vh] max-h-[37vh]") + }else if(readonly===true){ + setDivStyle("h-[62vh]") + }else{ + setDivStyle("h-[53vh]") + } + },[isModal,readonly]); useEffect(() => { console.log("form errors:", form.formState.errors); @@ -154,7 +164,7 @@ export default function HtdflRegForm({ )} - + {isModal && htdflForm != undefined ? ( ) : ( diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx index a0d0f5405..099d9efb1 100644 --- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx @@ -49,6 +49,17 @@ export default function RainRegForm({ "reuseBuilding.0.rainyObj.filtrTrtmfctYn", ]); + const [divStyle, setDivStyle] = useState("h-[53vh]"); + useEffect(()=>{ + if(isModal===true){ + setDivStyle("h-[53vh] max-h-[37vh]") + }else if(readonly===true){ + setDivStyle("h-[62vh]") + }else{ + setDivStyle("h-[53vh]") + } + },[isModal,readonly]); + const cleanRainData = (raw: any): z.infer => { const buildings = raw?.reuseBuilding && raw.reuseBuilding.length > 0 @@ -164,7 +175,7 @@ export default function RainRegForm({ )} - + {isModal && rainForm != undefined ? : <>} {isModal ? (

diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx index e124ecc6f..3a10bf839 100644 --- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx @@ -21,7 +21,7 @@ import { } from "@common/business_components/ui"; import { Button, Input, ScrollArea } from "@common/components/ui"; import { zodResolver } from "@hookform/resolvers/zod"; -import { useEffect } from "react"; +import { useEffect, useState } from "react"; import { useForm, type UseFormReturn } from "react-hook-form"; import { z } from "zod"; import BdstReg from "../bdstReg/bdstReg"; @@ -40,7 +40,16 @@ export default function RswtrRegForm({ const { rswt, code, rswtBdstUpdate, rswtBdstReg } = useWrStore( (state) => state ); - + const [divStyle, setDivStyle] = useState("h-[53vh]"); + useEffect(()=>{ + if(isModal===true){ + setDivStyle("h-[53vh] max-h-[37vh]") + }else if(readonly===true){ + setDivStyle("h-[62vh]") + }else{ + setDivStyle("h-[53vh]") + } + },[isModal,readonly]); // const defaultValues: z.infer = rswtZod.parse({}); const form = useForm>({ @@ -151,7 +160,7 @@ export default function RswtrRegForm({ )} - + {isModal && rswtForm != undefined ? : <>} {isModal ? (

From 38461d8a40b9bcdb2dc96d823baf7746bf54bba7 Mon Sep 17 00:00:00 2001 From: jyha00 Date: Wed, 9 Jul 2025 13:55:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=B9=97=EB=AC=BC/=EC=A4=91=EC=88=98?= =?UTF-8?q?=EB=8F=84/=EC=98=A8=EB=B0=B0=EC=88=98=EC=8B=9C=EC=84=A4=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruseFcltMng/fcltSttn/htdflSttn/page.tsx | 21 +++++++-------- .../ruseFcltMng/fcltSttn/rainSttn/page.tsx | 21 +++++++-------- .../ruseFcltMng/fcltSttn/rswtSttn/page.tsx | 26 ++++++++++--------- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx index 344234af5..e7685ebbd 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx @@ -45,6 +45,7 @@ export default function HtdflSttn() { const [pageNation, setPageNation] = useState(1); const [isChHead, setIsChHead] = useState(false); + const [resetPage, isResetPage] = useState(false); const [bdstTable, setBdstTable] = useState(); const [selectSgg, setSelectSgg] = useState() const [objSearch, setObjSearch] = useState({ sgg: "", city: "" }); @@ -61,11 +62,12 @@ export default function HtdflSttn() { const excelClick = useCallback(() => { // 최신 검색 조건 반영 const con = getConValue(); - htdflSttnSearch(true, pageNation, String(htdflSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd); - }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd, pageNation, fcltNm, htdflSttnResCount]); + htdflSttnSearch(true, 1, String(htdflSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd); + }, [htdflSttnSearch, objSearch, code.cityCd, code.sggCd, fcltNm, htdflSttnResCount]); useEffect(() => { htdflSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); + isResetPage(false) }, [pageNation]); const getSelCity = (val: string | number) => { @@ -152,10 +154,7 @@ export default function HtdflSttn() { label="시도" selectClass={""} selectArray={code.cityCd} - onSelectValue={(val) => { - getSelCity(val) - setPageNation(1) - }} + onSelectValue={getSelCity} /> { - getSgg(val) - setPageNation(1) - }} + onSelectValue={getSgg} />
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx index 27d7dfa94..c7798e118 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx @@ -46,6 +46,7 @@ export default function RainSttn() { const [isChHead, setIsChHead] = useState(false); const [bdstTable, setBdstTable] = useState(); const [selectSgg, setSelectSgg] = useState() + const [resetPage, isResetPage] = useState(false); const [objSearch, setObjSearch] = useState({ sgg: "", city: "" }); const [detailModal, setDetailModal] = useState<{ isOpen: boolean, data: customRainBdst | undefined }>({ data: undefined, isOpen: false }) const [bdstChgProps, setBdstChgProps] = useState<{ @@ -133,6 +134,7 @@ export default function RainSttn() { useEffect(() => { rainSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); + isResetPage(false) }, [pageNation]); useEffect(() => { @@ -150,8 +152,8 @@ export default function RainSttn() { const excelClick = useCallback(() => { // 최신 검색 조건 반영 const con = getConValue(); - rainSttnSearch(true, pageNation, String(rainSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd); - }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd, pageNation, fcltNm, rainSttnResCount]); + rainSttnSearch(true, 1, String(rainSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd); + }, [rainSttnSearch, objSearch, code.cityCd, code.sggCd, fcltNm, rainSttnResCount]); return ( <> @@ -167,10 +169,7 @@ export default function RainSttn() { label="시도" selectClass={""} selectArray={code.cityCd} - onSelectValue={(val) => { - getSelCity(val) - setPageNation(1) - }} + onSelectValue={getSelCity} /> { - getSgg(val) - setPageNation(1) - }} + onSelectValue={getSgg} />
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx index f35efa121..edf1f6ac0 100644 --- a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx +++ b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx @@ -40,6 +40,7 @@ export default function RswtSttn() { const { rswtSttnRes, rswtSttnResCount } = rswtSttn; const [isChHead, setIsChHead] = useState(false); + const [resetPage, isResetPage] = useState(false); const ref = useRef({} as ReturnType); const [bdstTable, setBdstTable] = useState(); const [selectSgg, setSelectSgg] = useState() @@ -137,11 +138,13 @@ export default function RswtSttn() { const excelClick = useCallback(() => { // 최신 검색 조건 반영 const con = getConValue(); - rswtSttnSearch(true, pageNation, String(rswtSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd); - }, [rswtSttnSearch, objSearch, code.cityCd, code.sggCd, pageNation, fcltNm, rswtSttnResCount]); + + rswtSttnSearch(true, 1, String(rswtSttnResCount), String(con), fcltNm, code.cityCd, code.sggCd); + }, [rswtSttnSearch, objSearch, code.cityCd, code.sggCd, fcltNm, rswtSttnResCount]); useEffect(() => { rswtSttnSearch(false, pageNation, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd); + isResetPage(false) }, [pageNation]); return ( @@ -158,10 +161,9 @@ export default function RswtSttn() { label="시도" selectClass={""} selectArray={code.cityCd} - onSelectValue={(val) => { - getSelCity(val) - setPageNation(1) - }} + onSelectValue={ + getSelCity + } /> { - getSgg(val) - setPageNation(1) - }} + onSelectValue={ + getSgg + } />