From e6f097355cf4c9eb4fa549286ae2f925cc54d0ef Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Tue, 4 Mar 2025 16:51:36 +0900 Subject: [PATCH 1/5] =?UTF-8?q?search=5Fform=20=EC=B6=94=EA=B0=80=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/business_components/src/ui/index.ts | 3 ++- .../business_components/src/ui/search_form/index.tsx | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 packages/common/business_components/src/ui/search_form/index.tsx diff --git a/packages/common/business_components/src/ui/index.ts b/packages/common/business_components/src/ui/index.ts index e29c71c40..d2df4d3ce 100644 --- a/packages/common/business_components/src/ui/index.ts +++ b/packages/common/business_components/src/ui/index.ts @@ -1,3 +1,4 @@ export * from "./chart"; export * from "./table"; -export * from "./form"; \ No newline at end of file +export * from "./form"; +export * from "./search_form"; \ No newline at end of file diff --git a/packages/common/business_components/src/ui/search_form/index.tsx b/packages/common/business_components/src/ui/search_form/index.tsx new file mode 100644 index 000000000..0b41b5efc --- /dev/null +++ b/packages/common/business_components/src/ui/search_form/index.tsx @@ -0,0 +1,9 @@ +function SearchDiv (props: { leftPart1: string }) { + return ( +
+ {props.leftPart1} +
+ ) +} + +export { SearchDiv }; \ No newline at end of file From 3704927378134d533aee4ea0988724731066f392 Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Tue, 4 Mar 2025 16:57:59 +0900 Subject: [PATCH 2/5] =?UTF-8?q?childnode=20=ED=98=95=EC=8B=9D=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/src/ui/search_form/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0b41b5efc..457c22024 100644 --- a/packages/common/business_components/src/ui/search_form/index.tsx +++ b/packages/common/business_components/src/ui/search_form/index.tsx @@ -1,7 +1,7 @@ -function SearchDiv (props: { leftPart1: string }) { +function SearchDiv ({children}:{ children: React.ReactNode; }) { return (
- {props.leftPart1} + {children}
) } From c320a75cdde411adabdc17095a36124b583a032b Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Tue, 4 Mar 2025 17:14:46 +0900 Subject: [PATCH 3/5] =?UTF-8?q?selectbox=20lib=20=EC=84=A4=EC=B9=98?= =?UTF-8?q?=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/business_components/package.json | 1 + .../src/ui/select/index.tsx | 158 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 packages/common/business_components/src/ui/select/index.tsx diff --git a/packages/common/business_components/package.json b/packages/common/business_components/package.json index ca6f67b76..341081f7c 100644 --- a/packages/common/business_components/package.json +++ b/packages/common/business_components/package.json @@ -28,6 +28,7 @@ "@common/components": "workspace:*", "@hookform/resolvers": "^4.1.2", "@radix-ui/react-label": "^2.1.2", + "@radix-ui/react-select": "^2.1.6", "@radix-ui/react-slot": "^1.1.2", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", diff --git a/packages/common/business_components/src/ui/select/index.tsx b/packages/common/business_components/src/ui/select/index.tsx new file mode 100644 index 000000000..b416f8dec --- /dev/null +++ b/packages/common/business_components/src/ui/select/index.tsx @@ -0,0 +1,158 @@ +import * as React from "react" +import * as SelectPrimitive from "@radix-ui/react-select" +import { Check, ChevronDown, ChevronUp } from "lucide-react" + +import { cn } from "@/lib/utils" + +const Select = SelectPrimitive.Root + +const SelectGroup = SelectPrimitive.Group + +const SelectValue = SelectPrimitive.Value + +const SelectTrigger = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + span]:line-clamp-1", + className + )} + {...props} + > + {children} + + + + +)) +SelectTrigger.displayName = SelectPrimitive.Trigger.displayName + +const SelectScrollUpButton = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + +)) +SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName + +const SelectScrollDownButton = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + + + +)) +SelectScrollDownButton.displayName = + SelectPrimitive.ScrollDownButton.displayName + +const SelectContent = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, position = "popper", ...props }, ref) => ( + + + + + {children} + + + + +)) +SelectContent.displayName = SelectPrimitive.Content.displayName + +const SelectLabel = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +SelectLabel.displayName = SelectPrimitive.Label.displayName + +const SelectItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, children, ...props }, ref) => ( + + + + + + + + {children} + +)) +SelectItem.displayName = SelectPrimitive.Item.displayName + +const SelectSeparator = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef +>(({ className, ...props }, ref) => ( + +)) +SelectSeparator.displayName = SelectPrimitive.Separator.displayName + +export { + Select, + SelectGroup, + SelectValue, + SelectTrigger, + SelectContent, + SelectLabel, + SelectItem, + SelectSeparator, + SelectScrollUpButton, + SelectScrollDownButton, +} From 7aa6f3449da886d5d03171cd1d5c754a16296982 Mon Sep 17 00:00:00 2001 From: YangJinSoo94 Date: Tue, 4 Mar 2025 17:19:48 +0900 Subject: [PATCH 4/5] =?UTF-8?q?index.ts=EC=97=90=20select=20export=20?= =?UTF-8?q?=EA=B5=AC=EB=AC=B8=EC=B6=94=EA=B0=80=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/business_components/src/ui/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/common/business_components/src/ui/index.ts b/packages/common/business_components/src/ui/index.ts index d2df4d3ce..ef8fa6f8c 100644 --- a/packages/common/business_components/src/ui/index.ts +++ b/packages/common/business_components/src/ui/index.ts @@ -1,4 +1,5 @@ export * from "./chart"; export * from "./table"; export * from "./form"; -export * from "./search_form"; \ No newline at end of file +export * from "./search_form"; +export * from "./select"; \ No newline at end of file From 7078f932ef6393c64d7967f1ea2cf5bf5aab04e6 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Tue, 4 Mar 2025 17:58:30 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=97=A4?= =?UTF-8?q?=EB=8D=94=20colspan=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 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 6a5033963..17360af12 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -3,29 +3,30 @@ import UiPageNations from "./uiPageNations"; interface UiTableProps { + headName: string; publicReuseFacility: any[]; headlist: { id: string; title: string; }[]; pageSize: number; total: number; + children: React.ReactNode|undefined; } export function UiTable(UiTableProps: UiTableProps) { - const { publicReuseFacility, headlist,pageSize , total} = UiTableProps; - let cur = 1; - + const { publicReuseFacility, headlist,pageSize , total, children,headName} = UiTableProps; + const cur = 1; return ( <> -

공공하수처리시설 목록

+

{headName}

- + {children? <>{children}: {headlist.map((head) => ( {head.title} ))} - - + } + {publicReuseFacility.map((el: any,index) => (