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/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx
index eba860561..4f86d08e5 100644
--- a/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx
+++ b/apps/wr/app/reuseFaciltyManage/reuseFacilityInsert/publicReuseFaciltyInsert/page.tsx
@@ -1,7 +1,7 @@
'use client'
import { ScrollArea, SearchDiv, SelectBox, UiTable } from '@common/business_components';
-import { Button, TableHead, TableRow } from '@common/components';
+import { Button } from '@common/components';
import { PublicReuseFaciltyFormInsert } from '../../../../components/ui/publicReuseInsertForm';
import { useWrStore } from '../../../store';
@@ -11,43 +11,44 @@ import { useWrStore } from '../../../store';
const {pubFac} = useWrStore((state) => state);
const { pubFacHeadList, publicReuseFacilityData, selectLabel} = pubFac;
console.log(pubFacHeadList)
-
- const searchDiv ='시군구'
- const selectBox = [{text:'한양', value:1}]
- const headName= ()=>{
- return(
-
○공공 허수처리시설 등록
- )
+ const searchDiv = '시군구'
+ const selectBox = [{ text: '한양', val: "1" }, { text: '서울', val: "2" }, { text: '부산', val: "3" }]
+ const headName = () => {
+ return (
+ ○공공 허수처리시설 등록
+ )
}
- return ( <>
-
-
-
하수재이용시설 등록
-
-
-
-
-
+ const onSelectValue = (val: string) => {
+ console.log(val)
+ }
+ return (
+ <>
+
+
+
하수재이용시설 등록
+
+
+
+
+
+
+
+
+
+
+ {/*
*/}
+
-
-
-
-
-
- UiTable>
+
-
-
-
- >
- )}
-
-
-
+
+ >
+ )
+}
\ No newline at end of file
diff --git a/apps/wr/app/store/store.tsx b/apps/wr/app/store/store.tsx
index 93a4fe6c9..9ef142fff 100644
--- a/apps/wr/app/store/store.tsx
+++ b/apps/wr/app/store/store.tsx
@@ -1,13 +1,15 @@
import { createStore } from 'zustand/vanilla';
-import { pubFacActionsExport, pubFacStateExport, type pubFacState, type pubFacType } from './publicReuseFaciltyInsert/index';
-import { buildingTableActionsExport, buildingtableStateExport, type buildingTableType } from './rainReuseFacilityInsert';
-export type WrStore = pubFacType & buildingTableType;
-export const StoreZus = (initState: pubFacState = pubFacStateExport) => {
+import { pubFacActionsExport, pubFacStateExport, type pubFacState } from './publicReuseFaciltyInsert/index';
+import { buildingTableActionsExport, buildingtableStateExport, type buildingTableState, type buildingTableType } from './rainReuseFacilityInsert';
+export type WrStore = pubFacState & buildingTableType;
+export const StoreZus = (initState: buildingTableState& pubFacState = {
+ ...pubFacStateExport,
+ ...buildingtableStateExport
+}) => {
return createStore()((set) => {
return {
...initState,
...pubFacActionsExport(set),
- ...buildingtableStateExport,
...buildingTableActionsExport(set)
}
})
diff --git a/apps/wr/components/ui/publicReuseInsertForm.tsx b/apps/wr/components/ui/publicReuseInsertForm.tsx
index bf4405ab6..0221abf10 100644
--- a/apps/wr/components/ui/publicReuseInsertForm.tsx
+++ b/apps/wr/components/ui/publicReuseInsertForm.tsx
@@ -1,15 +1,14 @@
"use client";
+import { SelectBox } from "@common/business_components";
import { FileUpload, UiTable } from "@common/business_components/ui";
-import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from "@common/business_components/ui/form";
-import { Button, FileSearch, Input } from "@common/components";
+import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@common/business_components/ui/form";
+import { Button, DatePicker, Input } from "@common/components";
import { zodResolver } from "@hookform/resolvers/zod";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { z } from "zod";
import { useWrStore } from "../../app/store/index";
-import { SelectBox } from "@common/business_components";
-import { DatePicker } from "@common/components";
const formSchema = z.object({
username: z.string().min(2).max(50),
@@ -17,13 +16,14 @@ const formSchema = z.object({
});
-type typeOfForm = {
- labelName: string;
- type: string;
- selectvlaue?: { text: string; val: string }[];
-}
+// type typeOfForm = {
+// labelName: string;
+// type: string;
+// selectvlaue?: { text: string; val: string }[];
+// }
export function PublicReuseFaciltyFormInsert() {
- const { upHeadList, publicReuseFacilityUper } = useWrStore((state) => state);
+ const { pubFac } = useWrStore((state) => state);
+ const { upHeadList, publicReuseFacilityUper } = pubFac;
const total = 100;
const form = useForm>({
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 &&
}