From fa0d220aab8e3a24ab4c118ae3d30bce10a3133a Mon Sep 17 00:00:00 2001 From: leedj312 Date: Mon, 10 Mar 2025 18:01:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?tabledata=EB=A1=9C=20=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD,=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=20=EB=84=A4=EC=9D=B4=EC=85=98=20unvisible=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_components/src/ui/table/index.tsx | 12 ++++++------ 1 file 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 c1d048a1f..1e2345a88 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -4,7 +4,7 @@ import UiPageNations from "./uiPageNations"; type UiTableProps = { headName: React.ReactNode|undefined; - publicReuseFacility: { [key: string]: string | number | boolean }[]; + tableData: { [key: string]: string | number | boolean }[]; headlist: UiHeadProps[]; pageSize: number; total: number; @@ -16,7 +16,7 @@ type UiHeadProps={ title:string; } -export function UiTable({ publicReuseFacility, headlist,pageSize , total, children,headName}: UiTableProps) { +export function UiTable({ tableData, headlist,pageSize , total, children,headName}: UiTableProps) { const cur = 1; return ( @@ -25,14 +25,14 @@ export function UiTable({ publicReuseFacility, headlist,pageSize , total, childr {children? <>{children}: - {headlist.map((head) => ( + {headlist?.map((head) => ( {head.title} ))} } - - {publicReuseFacility.map((el: { [key: string]: string | number | boolean },index) => ( + + {tableData?.map((el: { [key: string]: string | number | boolean },index) => ( {headlist.map((head) => ( {el[head.id]} @@ -43,7 +43,7 @@ export function UiTable({ publicReuseFacility, headlist,pageSize , total, childr
- + {total <=0? <>: } ); } \ No newline at end of file From e4d5e21b2944169449844be2842ca3f606d8dc35 Mon Sep 17 00:00:00 2001 From: truthwing Date: Mon, 10 Mar 2025 18:25:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9E=85=ED=8F=AC=ED=8A=B8=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EC=88=98=EC=A0=95=20=EC=84=9C=EC=B9=98=ED=8F=BC=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=81=AC=EA=B8=B0=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EA=B8=80=EC=9E=90=ED=81=AC=EA=B8=B0=202xl=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- .../src/ui/scroll/index.tsx | 4 +- .../src/ui/search_form/index.tsx | 4 +- .../src/ui/select/index.tsx | 4 +- .../src/ui/table/index.tsx | 72 +++++++++---------- 5 files changed, 45 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 3f815ea23..a4574580d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ node_modules # misc -.DS_Store \ No newline at end of file +.DS_Store +apps/wr/.next/**/* +apps/fo/.next/**/* \ No newline at end of file diff --git a/packages/common/business_components/src/ui/scroll/index.tsx b/packages/common/business_components/src/ui/scroll/index.tsx index cf253cf17..cd32e8856 100644 --- a/packages/common/business_components/src/ui/scroll/index.tsx +++ b/packages/common/business_components/src/ui/scroll/index.tsx @@ -1,7 +1,7 @@ -import * as React from "react" import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area" +import * as React from "react" -import { cn } from "@/lib/utils" +import { cn } from "../../lib/utils" const ScrollArea = React.forwardRef< React.ElementRef, diff --git a/packages/common/business_components/src/ui/search_form/index.tsx b/packages/common/business_components/src/ui/search_form/index.tsx index 45444a68f..7c6024748 100644 --- a/packages/common/business_components/src/ui/search_form/index.tsx +++ b/packages/common/business_components/src/ui/search_form/index.tsx @@ -1,9 +1,9 @@ function SearchDiv ({children}:{ children: React.ReactNode; }) { return ( -
+
{children}
) } -export { SearchDiv }; \ No newline at end of file +export { SearchDiv }; diff --git a/packages/common/business_components/src/ui/select/index.tsx b/packages/common/business_components/src/ui/select/index.tsx index 9f5f6d25c..d039c2c2a 100644 --- a/packages/common/business_components/src/ui/select/index.tsx +++ b/packages/common/business_components/src/ui/select/index.tsx @@ -17,9 +17,9 @@ const SelectBox = React.forwardRef< return (
- {label && } + {label && }