From 12f6f42b0e63a70efa19fa6abcd2e6758745669d Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Fri, 7 Mar 2025 11:24:22 +0900 Subject: [PATCH 1/3] =?UTF-8?q?selectbox=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=B0=9B?= =?UTF-8?q?=EC=9D=84=EC=88=98=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_components/src/ui/select/index.tsx | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/common/business_components/src/ui/select/index.tsx b/packages/common/business_components/src/ui/select/index.tsx index 72f304caa..370ee52e8 100644 --- a/packages/common/business_components/src/ui/select/index.tsx +++ b/packages/common/business_components/src/ui/select/index.tsx @@ -7,12 +7,8 @@ const styles = { marginLeft : '2rem', display : 'flex' } as React.CSSProperties, - selectStyle : { - marginLeft: '1rem', - width:'8rem' - } as React.CSSProperties, labelStyle : { - margin:'0.8rem 0.8rem 0.8rem 0.8rem', + margin:'0.8rem 0.8rem 0.8rem 1rem', fontSize: '10px', } as React.CSSProperties } @@ -22,14 +18,14 @@ interface SelectBox1 { val:string } -function SelectBox(props: {label : string, selectArray: SelectBox1[]}){ - const placeHolder = props.selectArray.length > 0 ? props.selectArray[0].text : ""; +function SelectBox(props: {label : string, selectArray: SelectBox1[], styleClassName : string, styleSelect : React.CSSProperties}){ + const placeHolder = props.selectArray?.[0]?.text ?? ""; return ( -
+
{props.label && } - + From 37c2901976a0fd6494a3a814749cc3b161a25d3e Mon Sep 17 00:00:00 2001 From: leedj312 Date: Fri, 7 Mar 2025 13:03:09 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EB=85=B8=EB=93=9C=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20headlist=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ui/table/index.tsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 17360af12..8f1e0761d 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -3,22 +3,26 @@ import UiPageNations from "./uiPageNations"; interface UiTableProps { - headName: string; - publicReuseFacility: any[]; - headlist: { id: string; title: string; }[]; + headName: React.ReactNode|undefined; + publicReuseFacility: { [key: string]: string | number | boolean }[]; + headlist: UiHeadProps[]; pageSize: number; total: number; children: React.ReactNode|undefined; } -export function UiTable(UiTableProps: UiTableProps) { - const { publicReuseFacility, headlist,pageSize , total, children,headName} = UiTableProps; - const cur = 1; +interface UiHeadProps{ + id:string; + title:string; + +} +export function UiTable({ publicReuseFacility, headlist,pageSize , total, children,headName}: UiTableProps) { + const cur = 1; return ( <> -

{headName}

+ {headName?headName:<>} {children? <>{children}: @@ -29,7 +33,7 @@ export function UiTable(UiTableProps: UiTableProps) { - {publicReuseFacility.map((el: any,index) => ( + {publicReuseFacility.map((el: { [key: string]: string | number | boolean },index) => ( {headlist.map((head) => ( {el[head.id]} From 7c03f04078e289e9c252ce7edd4df8ea3892800c Mon Sep 17 00:00:00 2001 From: leedj312 Date: Fri, 7 Mar 2025 13:24:09 +0900 Subject: [PATCH 3/3] =?UTF-8?q?type=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/business_components/src/ui/table/index.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 8f1e0761d..c1d048a1f 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -2,7 +2,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@ import UiPageNations from "./uiPageNations"; -interface UiTableProps { +type UiTableProps = { headName: React.ReactNode|undefined; publicReuseFacility: { [key: string]: string | number | boolean }[]; headlist: UiHeadProps[]; @@ -11,8 +11,7 @@ interface UiTableProps { children: React.ReactNode|undefined; } - -interface UiHeadProps{ +type UiHeadProps={ id:string; title:string;