From 2f4745a65a357ab110009a30bf6ba5a0de8926b1 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Tue, 11 Mar 2025 13:52:34 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=97=EB=AC=BC=EC=9E=AC=EC=9D=B4=EC=9A=A9?= =?UTF-8?q?=20=ED=8F=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/rainReuseFacilityInsert/index.tsx | 50 +++++++++++++------ apps/wr/app/store/store.tsx | 12 +++-- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/apps/wr/app/store/rainReuseFacilityInsert/index.tsx b/apps/wr/app/store/rainReuseFacilityInsert/index.tsx index 53b193f6e..b9ce5c669 100644 --- a/apps/wr/app/store/rainReuseFacilityInsert/index.tsx +++ b/apps/wr/app/store/rainReuseFacilityInsert/index.tsx @@ -1,10 +1,11 @@ + export type TableUpperProps = { id: string; title: string; upName?: string; upSequnce?: number; } -type buildingOfType = { +type rainFacOfType = { sido: string, sigungo: string, facilityName: string, @@ -33,7 +34,7 @@ const upHeadList:TableUpperProps[] = [ { id: "authoDay", title: '허가일',upName:'upChangeRe', upSequnce:2 }, { id: "area", title: '면적' ,upName:'upChangeRe',upSequnce:3 }]; -const buildingObject:buildingOfType[] = [ +const rainOfObject:rainFacOfType[] = [ { sido: "서울", sigungo: "종로구", @@ -78,32 +79,53 @@ const buildingObject:buildingOfType[] = [ }, ] -export type buildingTableState ={ building:{ + +type selectArray ={ + text:string, + val:string + +} +const selectHomeWater = [ + { text: '집수면', val: "1" }, + { text: "종류", val: "2" }, + ]; + + const selectYN= [ + { text: 'Y', val: "1" }, + { text: 'N', val: "2" }, + ]; + +export type rainFacState ={ rain:{ isInit: boolean; upHeadList: TableUpperProps[]; - buildingObject: buildingOfType[]; + rainOfObject: rainFacOfType[]; + selectHomeWater:selectArray[]; + selectYN:selectArray[]; }} -type buildingTableActions = { +type rainFacSActions = { decrementList: () => void } -export type buildingTableType = buildingTableState & buildingTableActions; +export type rainFacType = rainFacState & rainFacSActions; -export const buildingtableStateExport:buildingTableState= {building:{ +export const rainFacStateExport:rainFacState= {rain:{ isInit:false, upHeadList: upHeadList, - buildingObject: buildingObject, + rainOfObject: rainOfObject, + selectHomeWater:selectHomeWater, + selectYN:selectYN + }} -export const buildingTableActionsExport:(set:any)=>buildingTableActions=(set: any) => { +export const rainFacActionsExport:(set:any)=>rainFacSActions=(set: any) => { return { decrementList:()=>set( - (state:buildingTableState) => { + (state:rainFacState) => { return ( - {building:{ - upHeadList: state.building.upHeadList, - buildingObject: - state.building.buildingObject.slice(0, state.building.buildingObject.length - 1) + {rain:{ + upHeadList: state.rain.upHeadList, + rainOfObject: + state.rain.rainOfObject.slice(0, state.rain.rainOfObject.length - 1) }})} ) } diff --git a/apps/wr/app/store/store.tsx b/apps/wr/app/store/store.tsx index 9ef142fff..ff7c014ec 100644 --- a/apps/wr/app/store/store.tsx +++ b/apps/wr/app/store/store.tsx @@ -1,16 +1,18 @@ import { createStore } from 'zustand/vanilla'; 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 = { +import { rainFacActionsExport, rainFacStateExport, type rainFacState, type rainFacType } from './rainReuseFacilityInsert'; + + +export type WrStore = pubFacState & rainFacType; +export const StoreZus = (initState: rainFacState& pubFacState = { ...pubFacStateExport, - ...buildingtableStateExport + ...rainFacStateExport }) => { return createStore()((set) => { return { ...initState, ...pubFacActionsExport(set), - ...buildingTableActionsExport(set) + ...rainFacActionsExport(set) } }) }