ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '38461d8a40b9bcdb2dc96d823baf7746bf54bba7' into iipbs/wr/dev
iipbs_wr / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
leedj312
2025-07-09 13:58:18 +09:00
parent 6d18785c9c 38461d8a40
commit 591ff390c6
6 changed files with 71 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/wr/app/ruseFcltMng/fcltSttn/htdflSttn/page.tsx
+9 -12
View File
@@ -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<customRainBdst[]>();
const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
const [objSearch, setObjSearch] = useState<objSearchType>({ 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}
/>
<SelectBox
className="col-span-2 w-1/6 h-full text-2xl ml-4"
@@ -163,10 +162,7 @@ export default function HtdflSttn() {
selectClass={""}
selectArray={selectSgg || []}
value={objSearch.sgg} // value props 추가
onSelectValue={(val) => {
getSgg(val)
setPageNation(1)
}}
onSelectValue={getSgg}
/>
<div className="col-span-2 flex flex-row space-x-2">
<Label className="w-28 mt-2 text-xl text-gray-600">
@@ -187,8 +183,8 @@ export default function HtdflSttn() {
<Button
size={"sm"}
onClick={() => {
const con = getConValue();
htdflSttnSearch(false, pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
htdflSttnSearch(false, 1, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
isResetPage(true)
}}
>
조회
@@ -230,6 +226,7 @@ export default function HtdflSttn() {
cellClick(index ?? undefined, headId);
}}
onPageChange={setPageNation}
resetPageNo={resetPage}
></UiTable>
</ListDiv>
</div>
apps/wr/app/ruseFcltMng/fcltSttn/rainSttn/page.tsx
+9 -12
View File
@@ -46,6 +46,7 @@ export default function RainSttn() {
const [isChHead, setIsChHead] = useState(false);
const [bdstTable, setBdstTable] = useState<customRainBdst[]>();
const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
const [resetPage, isResetPage] = useState(false);
const [objSearch, setObjSearch] = useState<objSearchType>({ 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}
/>
<SelectBox
className="col-span-2 w-1/6 h-full text-2xl ml-4"
@@ -178,10 +177,7 @@ export default function RainSttn() {
selectClass={""}
selectArray={selectSgg || []}
value={objSearch.sgg} // value props 추가
onSelectValue={(val) => {
getSgg(val)
setPageNation(1)
}}
onSelectValue={getSgg}
/>
<div className="col-span-2 flex flex-row space-x-2">
<Label className="w-28 mt-2 text-xl text-gray-600">
@@ -202,8 +198,8 @@ export default function RainSttn() {
<Button
size={"sm"}
onClick={() => {
const con = getConValue();
rainSttnSearch(false, pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
rainSttnSearch(false, 1, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
isResetPage(true)
}}
>
조회
@@ -243,6 +239,7 @@ export default function RainSttn() {
total={rainSttnResCount || 0}
cellClick={(index: number | undefined, headId: string) => { cellClick(index ?? undefined, headId) }}
onPageChange={setPageNation}
resetPageNo={resetPage}
></UiTable>
</ListDiv>
</div>
apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
+14 -12
View File
@@ -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<ReturnType>({} as ReturnType);
const [bdstTable, setBdstTable] = useState<customRswtBdst[]>();
const [selectSgg, setSelectSgg] = useState<SelectDataType[] | []>()
@@ -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
}
/>
<SelectBox
className="col-span-2 w-1/6 h-full text-2xl ml-4"
@@ -169,10 +171,9 @@ export default function RswtSttn() {
selectClass={""}
selectArray={selectSgg || []}
value={objSearch.sgg} // value props 추가
onSelectValue={(val) => {
getSgg(val)
setPageNation(1)
}}
onSelectValue={
getSgg
}
/>
<div className="col-span-2 flex flex-row space-x-2">
<Label className="w-28 mt-2 text-xl text-gray-600">
@@ -193,8 +194,8 @@ export default function RswtSttn() {
<Button
size={"sm"}
onClick={() => {
const con = getConValue();
rswtSttnSearch(false, pageNation, "20", String(con), fcltNm, code.cityCd, code.sggCd);
rswtSttnSearch(false, 1, "20", String(getConValue()), fcltNm, code.cityCd, code.sggCd);
isResetPage(true)
}}
>
조회
@@ -234,6 +235,7 @@ export default function RswtSttn() {
total={rswtSttnResCount || 0}
cellClick={(index: number | undefined, headId: string) => { cellClick(index ?? undefined, headId) }}
onPageChange={setPageNation}
resetPageNo={resetPage}
></UiTable>
</ListDiv>
</div>
apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx
+12 -2
View File
@@ -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({
)}
</div>
</div>
<ScrollArea className="h-[37vh]">
<ScrollArea className={divStyle}>
{isModal && htdflForm != undefined ? (
<BdstReg form={form} type="HTB" />
) : (
apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx
+15 -1
View File
@@ -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<typeof rainZod> => {
const buildings =
raw?.reuseBuilding && raw.reuseBuilding.length > 0
@@ -81,6 +92,9 @@ export default function RainRegForm({
})),
};
};
useEffect(()=>{
console.log("이즈모달", isModal)
}, [])
useEffect(() => {
if (grntchBdstCertYn === "N") {
@@ -161,7 +175,7 @@ export default function RainRegForm({
)}
</div>
</div>
<ScrollArea className="h-[37vh]">
<ScrollArea className={divStyle}>
{isModal && rainForm != undefined ? <BdstReg form={form} /> : <></>}
{isModal ? (
<h1 className="pl-3 text-xl col-span-10 mt-4">
apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
+12 -3
View File
@@ -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<typeof rswtZod> = rswtZod.parse({});
const form = useForm<z.infer<typeof rswtZod>>({
@@ -151,7 +160,7 @@ export default function RswtrRegForm({
)}
</div>
</div>
<ScrollArea className="h-[37vh]">
<ScrollArea className={divStyle}>
{isModal && rswtForm != undefined ? <BdstReg form={form} /> : <></>}
{isModal ? (
<h1 className="pl-3 text-xl col-span-10 mt-4 ">