From 951e2c1f8964844f6fc62a60514a4ee072bfe902 Mon Sep 17 00:00:00 2001 From: ljpark Date: Mon, 29 Jun 2026 16:53:43 +0900 Subject: [PATCH] =?UTF-8?q?wr:=20=EC=A7=80=EB=8F=84=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=20=EC=A0=9C=EB=AA=A9=20style=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wr/app/(popUp-layout)/mapFeaturePopup/page.tsx | 10 ++++++---- .../ui/map/detailPopup/ruseDetailPopup.tsx | 2 ++ .../ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx | 10 +++++----- .../ui/modal/sttn/sttnDetailModal/coDatailModal.tsx | 8 ++++---- .../src/ui/sdmInsertForm/index.tsx | 13 +++++++------ 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/apps/wr/app/(popUp-layout)/mapFeaturePopup/page.tsx b/apps/wr/app/(popUp-layout)/mapFeaturePopup/page.tsx index af09e6eb6..5117229e1 100644 --- a/apps/wr/app/(popUp-layout)/mapFeaturePopup/page.tsx +++ b/apps/wr/app/(popUp-layout)/mapFeaturePopup/page.tsx @@ -97,14 +97,13 @@ export default function MapFeaturePopup() { return ( <> {isDetail ? ( -
+
+
{layerNm === "tb_wr_bdst_ruse_fclt" ? ( ) : layerNm === "tb_il_swage_prcs_fclt" ? (
-
- - </div> + <Title title="하수처리시설 상세정보" /> {/* 높이 조정 */} <UiTable tableData={isDetail || []} @@ -114,6 +113,7 @@ export default function MapFeaturePopup() { headName={"위치정보"} cellClick={() => {}} onPageChange={() => {}} + isHideCount={true} /> <UiTable tableData={isDetail || []} @@ -123,6 +123,7 @@ export default function MapFeaturePopup() { headName={"기본정보"} cellClick={() => {}} onPageChange={() => {}} + isHideCount={true} /> </div> ) : layerNm === "tb_wr_tmpr_dmd_co" ? ( @@ -152,6 +153,7 @@ export default function MapFeaturePopup() { isMap={true} /> )} + </div> </div> ) : ( <></> diff --git a/apps/wr/components/ui/map/detailPopup/ruseDetailPopup.tsx b/apps/wr/components/ui/map/detailPopup/ruseDetailPopup.tsx index 7e4c3b603..dacb810f1 100644 --- a/apps/wr/components/ui/map/detailPopup/ruseDetailPopup.tsx +++ b/apps/wr/components/ui/map/detailPopup/ruseDetailPopup.tsx @@ -1,6 +1,7 @@ import { useWrStore } from "@/app/store"; import type { customPbnst } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg/type"; import { PbnstSttnModal } from "@/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal"; +import { Title } from "@common/business_components/ui"; import { Tabs, TabsContent, @@ -39,6 +40,7 @@ export function RuseDetailPopup({ bscFctCd }: { bscFctCd: string }) { if (!(ruseDetailList && ruseDetailList[0])) return; return ( <div className=""> + <Title title="하수재이용시설 상세정보" /> <Tabs value={fcltTab} onValueChange={setFcltTab}> <TabsList className="mt-2 mb-3 gap-2 flex flex-wrap"> {ruseDetailList.map((item, index) => { diff --git a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx index 1a07720a7..0c168ade8 100644 --- a/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx +++ b/apps/wr/components/ui/modal/sttn/pbnstSttnModal/pbnstSttnModal.tsx @@ -34,7 +34,7 @@ import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { z } from "zod"; -export function PbnstSttnModal({ data, titleVisible,isMap}: { data: customPbnst; titleVisible?: boolean ,isMap?:boolean}) { +export function PbnstSttnModal({ data, isMap }: { data: customPbnst; isMap?: boolean }) { const { pbnstSttn, prfmnc, pbnstPrfmncSttn } = useWrStore((state) => state); const [fcltTab, setFcltTab] = useState<string>("fclt"); const [ruseTab, setRuseTab] = useState<string>("totalPrf"); @@ -254,17 +254,17 @@ export function PbnstSttnModal({ data, titleVisible,isMap}: { data: customPbnst; } }, [data, form]) - const Wrapper: React.ElementType = isMap ?"div": ScrollArea; + const Wrapper: React.ElementType = isMap ? "div" : ScrollArea; return ( <> <div className="min-h-0 px-4 md:px-6 py-4"> - {titleVisible && ( + {!isMap && ( <> - <Title title={"하수재이용 시설 상세정보"} /> + <Title title={"하수재이용시설 상세정보"} /> </> )} - <Wrapper className={ "h-[70vh]" }> + <Wrapper className={isMap ? "min-h-0" : "h-[70vh]"}> <PbnstMngForm form={form} formType={"sttn"} diff --git a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx index 15fcdd1e2..ae233ed74 100644 --- a/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx +++ b/apps/wr/components/ui/modal/sttn/sttnDetailModal/coDatailModal.tsx @@ -4,7 +4,7 @@ import type { customLdrmnt } from "@/app/store/matDmd/ldrmntCoSttn"; import { ldrmntZod } from "@/app/store/matDmd/ldrmntCoSttn/headList"; import { selectClass } from "@/app/store/ruseFcltMng/fcltReg/rainReg"; import { formatCommaNumber, handleCommaNumberChange } from "@/components/lib/func/common"; -import { Form, FormField, FormUi, ScrollArea } from "@common/business_components/ui"; +import { Form, FormField, FormUi, ScrollArea, Title } from "@common/business_components/ui"; import { Button, Input } from "@common/components/ui"; import { zodResolver } from "@hookform/resolvers/zod"; import { useEffect } from "react"; @@ -53,9 +53,9 @@ export default function CoDetailModal({ <Form {...form}> <form onSubmit={form.handleSubmit(onFormSubmit)}> <div className="grid grid-cols-12 items-center card-header"> - <h1 className="text-2xl font-medium text-label col-span-10"> - 잠재수요처 상세정보 - </h1> + <div className="col-span-10"> + <Title title="잠재수요처 상세정보" /> + </div> {!isMap ? ( <Button type="submit" diff --git a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx b/packages/common/business_components/src/ui/sdmInsertForm/index.tsx index 09c357c41..91fa1dc0c 100644 --- a/packages/common/business_components/src/ui/sdmInsertForm/index.tsx +++ b/packages/common/business_components/src/ui/sdmInsertForm/index.tsx @@ -8,7 +8,7 @@ import { toast, Toaster } from "sonner"; import * as z from "zod"; import type { SelectDataType } from "../search_input_select"; import { getCookie } from "@common/components/lib"; - +import { Title } from "@common/business_components/ui"; type thisProps = { selectSidoData: SelectDataType[]; @@ -19,7 +19,7 @@ type thisProps = { bodyClassNm?: string; updateList?:DemandCompType; readOnly?:boolean; - openNetwork:boolean + openNetwork:boolean; } const createFormSchema = (isBznmTotNoDisabled: boolean, isDuplicate: boolean ,updateList?:DemandCompType) => z.object({ @@ -161,10 +161,11 @@ export default function SdmInsertForm({selectSidoData, selectSigunData, dataList return ( <> - <div className="text-center mb-8"> - <h1 className="text-4xl font-bold text-gray-900 underline"> - {!updateList? '수요처 등록' :readOnly==true? '수요처 정보':'수요처 수정'} - </h1> + <div className="mb-8"> + <Title + title={!updateList ? '수요처 등록' : readOnly == true ? '수요처 상세정보' : '수요처 수정'} + > +