From 41c8c11ec02426b61fcf5bc10ec1a1ab7a89c021 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Tue, 4 Mar 2025 18:05:17 +0900 Subject: [PATCH] =?UTF-8?q?table=20colspan=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/src/pages/site/ui/site-page.tsx | 5 +- apps/wr/app/publicReuseFaciltyInsert/page.tsx | 82 ++++++++++++++++++- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/apps/cs/src/pages/site/ui/site-page.tsx b/apps/cs/src/pages/site/ui/site-page.tsx index 54469c42a..d6efc8e15 100644 --- a/apps/cs/src/pages/site/ui/site-page.tsx +++ b/apps/cs/src/pages/site/ui/site-page.tsx @@ -3,8 +3,7 @@ import "@common/assets/styles/grid.css"; import { useRouter } from "next/navigation"; -import { Button, Input, DataTable } from "@common/components"; -import { data, columns } from "../model/__mocks__"; +import { Button, Input } from "@common/components"; import { SitePageLayout } from "./layout"; function SitePage() { @@ -28,7 +27,7 @@ function SitePage() {
- + {/* */}
diff --git a/apps/wr/app/publicReuseFaciltyInsert/page.tsx b/apps/wr/app/publicReuseFaciltyInsert/page.tsx index 965445202..f5e565fd3 100644 --- a/apps/wr/app/publicReuseFaciltyInsert/page.tsx +++ b/apps/wr/app/publicReuseFaciltyInsert/page.tsx @@ -1,4 +1,15 @@ import {UiTable} from '@common/business_components'; +import { TableRow } from '@common/components'; +import { TableHead } from '@common/components'; + + + +interface TableUpperProps { + id: string; + title: string; + upName : string; + upSequnce: number; +} const publicReuseFacility = [ { @@ -34,6 +45,42 @@ const publicReuseFacility = [ ] +const publicReuseFacilityUper = [ + { + sido: "서울", + sigungo: "강남구", + facilityName: "난지", + location: "경기도 고양시 덕양구 대차로 4가", + locationgubun: "500", + facilityCapacity: "800,000", + reuse: "Y", + register: "Y" + }, + { + sido: "서울", + sigungo: "강남구", + facilityName: "난지", + location: "경기도 고양시 덕양구 대차로 4가", + locationgubun: "500", + facilityCapacity: "800,000", + reuse: "Y", + register: "Y" + }, + { + sido: "서울", + sigungo: "강남구", + facilityName: "난지", + location: "경기도 고양시 덕양구 대차로 4가", + locationgubun: "500", + facilityCapacity: "800,000", + yn: "Y", + authoDay: "2012", + area:"123" + }, + ] + + + const headList = [ { id: "sido", title: "시도" }, { id: "sigungo", title: "시군구" }, @@ -45,10 +92,41 @@ const headList = [ { id: "register", title: '등록여부' }]; -export default function PublicReuseFaciltyInsert() { + + const upHeadList = [ + { id: "sido", title: "시도" }, + { id: "sigungo", title: "시군구" }, + { id: "facilityName", title: "시설명" }, + { id: "location", title: "위치" }, + { id: "locationgubun", title: "지역구분" }, + { id: "facilityCapacity", title: "시설용량" }, + { id: "yn", title: '여부', upName:'upChangeRe' , upSequnce:1 }, + { id: "authoDay", title: '허가일',upName:'upChangeRe', upSequnce:2 }, + { id: "area", title: '면적' ,upName:'upChangeRe',upSequnce:3 }]; + + const headMakeColSpan = (upHeadList: any) => { + return ( <> + { + upHeadList.map((head: TableUpperProps) => + (head.upName === 'upChangeRe'&& head.upSequnce=== 1?{'중축 개축 증축 '}: + head.upSequnce> 1?null:{head.title}))} + + + {upHeadList.map((head: TableUpperProps) => + (head.upName === 'upChangeRe'?{head.title}:null))} + + ) + } + + + + export default function PublicReuseFaciltyInsert() { + + const nodeList= headMakeColSpan(upHeadList); const total = 100; return (
- +
); } +