From 9c0ca52036e480e6e7e351d6c312999a735f2c15 Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Thu, 27 Mar 2025 10:07:09 +0900 Subject: [PATCH 1/4] =?UTF-8?q?title=EC=98=81=EC=97=AD,=20main=5Fcontents?= =?UTF-8?q?=20=EC=98=81=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_components/src/ui/main_content_div/index.tsx | 2 +- packages/common/business_components/src/ui/title/index.tsx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/common/business_components/src/ui/main_content_div/index.tsx b/packages/common/business_components/src/ui/main_content_div/index.tsx index d1e818196..1432f472e 100644 --- a/packages/common/business_components/src/ui/main_content_div/index.tsx +++ b/packages/common/business_components/src/ui/main_content_div/index.tsx @@ -2,7 +2,7 @@ export default function MainDiv(props: {children: React.ReactNode}) { return ( -
+
{props.children}
) diff --git a/packages/common/business_components/src/ui/title/index.tsx b/packages/common/business_components/src/ui/title/index.tsx index aaa9d74fd..b496ad55f 100644 --- a/packages/common/business_components/src/ui/title/index.tsx +++ b/packages/common/business_components/src/ui/title/index.tsx @@ -2,7 +2,11 @@ function Title(props: {title: string}) { return ( -

{props.title}

+
+

+ {props.title} +

+
) } From fa209d0c5d3745409a38e708f3d9792f8f3e81ac Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Thu, 27 Mar 2025 11:04:59 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=EC=A4=91=20(=ED=91=9C=EC=98=81=EC=97=AD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/table/index.tsx | 10 ++++++---- .../common/business_components/src/ui/title/index.tsx | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index d22a5835d..e56bd7a5d 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -24,8 +24,9 @@ export function UiTable({ tableData, headlist, pageSize, total, children, headNa {headName ?
{headName}
: <>} - - +
+
+ {children ? <>{children} : {headlist?.map((head) => ( {head.title} @@ -41,8 +42,9 @@ export function UiTable({ tableData, headlist, pageSize, total, children, headNa ))} -
- {total <= 0 ? <> : } + + {total <= 0 ? <> : } +
); } diff --git a/packages/common/business_components/src/ui/title/index.tsx b/packages/common/business_components/src/ui/title/index.tsx index b496ad55f..5b6d9bff4 100644 --- a/packages/common/business_components/src/ui/title/index.tsx +++ b/packages/common/business_components/src/ui/title/index.tsx @@ -2,11 +2,9 @@ function Title(props: {title: string}) { return ( -

{props.title}

-
) } From 33d82eff22cb66a0a85900e5683f24a9fc6a3dea Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Thu, 27 Mar 2025 13:21:42 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=91=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/business_components/src/ui/table/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index e56bd7a5d..b8c2706bc 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -22,9 +22,9 @@ export function UiTable({ tableData, headlist, pageSize, total, children, headNa return ( <> {headName ?
- {headName} +

{headName}

: <>} -
+
{children ? <>{children} : From a263ec0961bc475b8bc1797ef8360d36116e5871 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Thu, 27 Mar 2025 15:24:09 +0900 Subject: [PATCH 4/4] =?UTF-8?q?selectbox1=20val=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20alert=5Fdialog=5Fui=20=EB=B0=8F=20dialog?= =?UTF-8?q?=5Fui=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/ui/{alert_dialog_ui => dialog_ui}/index.tsx | 0 packages/common/business_components/src/ui/select/index.tsx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/common/business_components/src/ui/{alert_dialog_ui => dialog_ui}/index.tsx (100%) diff --git a/packages/common/business_components/src/ui/alert_dialog_ui/index.tsx b/packages/common/business_components/src/ui/dialog_ui/index.tsx similarity index 100% rename from packages/common/business_components/src/ui/alert_dialog_ui/index.tsx rename to packages/common/business_components/src/ui/dialog_ui/index.tsx diff --git a/packages/common/business_components/src/ui/select/index.tsx b/packages/common/business_components/src/ui/select/index.tsx index 1f1294666..c7fbc5ef0 100644 --- a/packages/common/business_components/src/ui/select/index.tsx +++ b/packages/common/business_components/src/ui/select/index.tsx @@ -5,7 +5,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from ". /** 차트 기본 스타일 */ interface SelectBox1 { text:string, - val:string + val:string|number } const SelectBox = React.forwardRef<