From 7e2180cd76b036f45c34742db234680b1fd14635 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 11 Dec 2024 15:08:36 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=B6=95=EC=9E=AC=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20hook=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/common/useMasterController.js | 2 ++ src/hooks/option/useCanvasSetting.js | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/hooks/common/useMasterController.js b/src/hooks/common/useMasterController.js index e2125af1..d0cac892 100644 --- a/src/hooks/common/useMasterController.js +++ b/src/hooks/common/useMasterController.js @@ -14,6 +14,7 @@ export function useMasterController() { const getRoofMaterialList = async () => { return await get({ url: '/api/v1/master/getRoofMaterialList' }).then((res) => { console.log('🚀🚀 ~ getRoofMaterialList ~ res:', res) + return res }) } @@ -25,6 +26,7 @@ export function useMasterController() { const getModuleTypeItemList = async (roofMaterialCd) => { return await get({ url: `/api/v1/master/getModuleTypeItemList/${roofMaterialCd}` }).then((res) => { console.log('🚀🚀 ~ getModuleTypeItemList ~ res:', res) + return res }) } diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index 660dcefa..dfc0c244 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -27,6 +27,7 @@ import { globalFontAtom } from '@/store/fontAtom' import { dimensionLineSettingsState } from '@/store/commonUtilsAtom' import { gridColorState } from '@/store/gridAtom' import { useColor } from 'react-color-palette' +import { useMasterController } from '@/hooks/common/useMasterController' const defaultDotLineGridSetting = { INTERVAL: { @@ -91,7 +92,7 @@ export function useCanvasSetting() { const [canvasSetting, setCanvasSetting] = useRecoilState(canvasSettingState) const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState) - + const { getRoofMaterialList } = useMasterController() const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom) const SelectOptions = [ @@ -101,10 +102,9 @@ export function useCanvasSetting() { { id: 4, name: '1/10', value: 1 / 10 }, ] - useEffect(() => { - get({ url: `/api/v1/master/getRoofMaterialList` }).then((res) => { - setRoofMaterials(res.data) - }) + useEffect(async () => { + const { data } = await getRoofMaterialList() + setRoofMaterials(data) }, []) useEffect(() => {