From e4d5e21b2944169449844be2842ca3f606d8dc35 Mon Sep 17 00:00:00 2001 From: truthwing Date: Mon, 10 Mar 2025 18:25:06 +0900 Subject: [PATCH 1/7] =?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 && }
) From 8dfa052ea6c9214a73cd4a13513feefd88fd4823 Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Tue, 11 Mar 2025 13:55:14 +0900 Subject: [PATCH 4/7] =?UTF-8?q?search=20=EC=98=81=EC=97=AD=20label=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20lg=20>=202xl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/search_input/index.tsx | 2 +- .../business_components/src/ui/search_input_select/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/business_components/src/ui/search_input/index.tsx b/packages/common/business_components/src/ui/search_input/index.tsx index 936b8ddbc..f2d1caeb4 100644 --- a/packages/common/business_components/src/ui/search_input/index.tsx +++ b/packages/common/business_components/src/ui/search_input/index.tsx @@ -8,7 +8,7 @@ const SearchInput = React.forwardRef< console.log(ref); return (
- {label && } + {label && }
) diff --git a/packages/common/business_components/src/ui/search_input_select/index.tsx b/packages/common/business_components/src/ui/search_input_select/index.tsx index b00615e4b..1496d9ddd 100644 --- a/packages/common/business_components/src/ui/search_input_select/index.tsx +++ b/packages/common/business_components/src/ui/search_input_select/index.tsx @@ -17,7 +17,7 @@ export type SelectDataType = { const SearchInputSelect = React.forwardRefvoid}>(({className, label, selectData, onSelectValue}, refs) => { return (
- {label && } + {label && }
+