건축물 데이터 검증 소스 수정
This commit is contained in:
@@ -272,4 +272,28 @@ export const formatYyyymmdd = (val: string | undefined) => {
|
||||
}
|
||||
const m = moment(val);
|
||||
return m.isValid() ? m.format("YYYY-MM-DD") : val;
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* 문자열 숫자(콤마 포함 가능)를 반올림 처리해 반환.
|
||||
* 숫자가 아닌 경우(예: "확인불가")는 원래 값을 그대로 반환.
|
||||
*
|
||||
* @param value 입력 문자열
|
||||
* @param digits 소수점 자릿수 (기본 0 = 정수 반올림)
|
||||
*/
|
||||
export const formatArchArea =(value: string, digits: number=0 ) => {
|
||||
|
||||
// "확인불가" 등 숫자 아님 → 그대로 반환
|
||||
const cleaned = value.replace(/,/g, "");
|
||||
const num = parseFloat(cleaned);
|
||||
|
||||
if (isNaN(num)) {
|
||||
return value;
|
||||
}
|
||||
|
||||
// 반올림 (digits 자릿수까지)
|
||||
const rounded = num.toFixed(digits);
|
||||
|
||||
// 다시 천 단위 콤마 찍어서 반환
|
||||
return Number(rounded).toLocaleString();
|
||||
}
|
||||
@@ -14,9 +14,9 @@ import {
|
||||
} from "@/components/lib/func/commom";
|
||||
import { DatePicker, FormUi } from "@common/business_components";
|
||||
import { Form, FormField, SelectBox } from "@common/business_components/ui";
|
||||
import { Button, Input, ScrollArea } from "@common/components/ui";
|
||||
import { Button, Input } from "@common/components/ui";
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect } from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { z } from "zod";
|
||||
import BdstReg from "../bdstReg/bdstReg";
|
||||
@@ -54,18 +54,12 @@ export default function RainRegForm({
|
||||
"reuseBuilding.0.rainyObj.filtrTrtmfctYn",
|
||||
]);
|
||||
|
||||
const [divStyle, setDivStyle] = useState("h-[53vh]");
|
||||
// const [divStyle, setDivStyle] = useState("h-[53vh]");
|
||||
useEffect(() => {
|
||||
if(isMap=== true){
|
||||
setDivStyle("h-[100vh]")
|
||||
}else if (isModal === true) {
|
||||
setDivStyle("h-[53vh] max-h-[37vh]")
|
||||
} else if (readonly === true) {
|
||||
setDivStyle("h-[62vh]")
|
||||
} else {
|
||||
setDivStyle("h-[57vh]")
|
||||
|
||||
}
|
||||
}, [isModal, readonly ,isMap]);
|
||||
}, [isMap]);
|
||||
|
||||
const cleanRainData = (raw: any): z.infer<typeof rainZod> => {
|
||||
const buildings =
|
||||
@@ -94,6 +88,8 @@ export default function RainRegForm({
|
||||
grntchBdstCertYn: item?.grntchBdstCertYn ?? "Y",
|
||||
rainyObj: {
|
||||
...item?.rainyObj,
|
||||
pntfColKnd:item.rainyObj?.pntfColKnd??'확인불가',
|
||||
filtrTrtmfctPrs:item.rainyObj?.filtrTrtmfctPrs??'',
|
||||
filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
|
||||
},
|
||||
})),
|
||||
@@ -180,7 +176,7 @@ export default function RainRegForm({
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<ScrollArea className={divStyle}>
|
||||
{/* <ScrollArea className={divStyle}> */}
|
||||
{isModal && rainForm != undefined ? <BdstReg form={form} /> : <></>}
|
||||
{isModal ? (
|
||||
<h1 className="pl-3 text-xl col-span-10 mt-4">
|
||||
@@ -614,7 +610,7 @@ export default function RainRegForm({
|
||||
</div>
|
||||
</div>
|
||||
<BdstAdd form={form} readonly={readonly}></BdstAdd>
|
||||
</ScrollArea>
|
||||
{/* </ScrollArea> */}
|
||||
</form>
|
||||
</Form>
|
||||
</div>
|
||||
|
||||
@@ -19,9 +19,9 @@ import {
|
||||
FormUi,
|
||||
SelectBox,
|
||||
} from "@common/business_components/ui";
|
||||
import { Button, Input, ScrollArea } from "@common/components/ui";
|
||||
import { Button, Input } from "@common/components/ui";
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect } from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { z } from "zod";
|
||||
import BdstAdd from "../bdstReg/bdstAdd";
|
||||
@@ -46,18 +46,11 @@ export default function RswtrRegForm({
|
||||
const { code, rswtBdstUpdate, rswtBdstReg } = useWrStore(
|
||||
(state) => state
|
||||
);
|
||||
const [divStyle, setDivStyle] = useState("h-[53vh]");
|
||||
// const [divStyle, setDivStyle] = useState("h-[53vh]");
|
||||
useEffect(() => {
|
||||
if(isMap){
|
||||
setDivStyle("h-[100vh]")
|
||||
}else if (isModal === true) {
|
||||
setDivStyle("h-[53vh] max-h-[37vh]")
|
||||
} else if (readonly === true) {
|
||||
setDivStyle("h-[62vh]")
|
||||
} else {
|
||||
setDivStyle("h-[57vh]")
|
||||
}
|
||||
}, [isModal, readonly ,isMap]);
|
||||
}, [isMap]);
|
||||
// const defaultValues: z.infer<typeof rswtZod> = rswtZod.parse({});
|
||||
|
||||
const form = useForm<z.infer<typeof rswtZod>>({
|
||||
@@ -176,7 +169,7 @@ export default function RswtrRegForm({
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<ScrollArea className={divStyle}>
|
||||
{/* <ScrollArea className={divStyle}> */}
|
||||
{isModal && rswtForm != undefined ? <BdstReg form={form} /> : <></>}
|
||||
{isModal ? (
|
||||
<h1 className="pl-3 text-xl col-span-10 mt-4 ">
|
||||
@@ -506,7 +499,7 @@ export default function RswtrRegForm({
|
||||
</div>
|
||||
</div>
|
||||
<BdstAdd form={form} readonly={readonly}></BdstAdd>
|
||||
</ScrollArea>
|
||||
{/* </ScrollArea> */}
|
||||
</form>
|
||||
</Form>
|
||||
</div>
|
||||
|
||||
@@ -196,7 +196,7 @@ export function BdstReg<T extends MoType>({
|
||||
</div>
|
||||
</ScrollArea>
|
||||
<div className="border-t border-gray-300 my-4"></div>
|
||||
{/* <ScrollArea className="h-[40vh]"> */}
|
||||
<ScrollArea className="h-[40vh]">
|
||||
<div>
|
||||
{moType === "RNB" ? (
|
||||
<RainRegForm
|
||||
@@ -226,7 +226,7 @@ export function BdstReg<T extends MoType>({
|
||||
></HtdflRegForm>
|
||||
)}
|
||||
</div>
|
||||
{/* </ScrollArea> */}
|
||||
</ScrollArea>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user