From 3190a4420ad82de4a8cd49bf5be8c07921a4fa94 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Fri, 27 Sep 2024 18:16:09 +0900 Subject: [PATCH] =?UTF-8?q?Canvas=20=EC=83=81=ED=83=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=A1=B0=EA=B1=B4=20userId=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Roof2.jsx | 2 +- src/components/floor-plan/modal/grid/DotLineGrid.jsx | 6 +----- src/hooks/usePlan.js | 6 +++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx index a31f54e7..bf63b348 100644 --- a/src/components/Roof2.jsx +++ b/src/components/Roof2.jsx @@ -143,7 +143,7 @@ export default function Roof2(props) { // const [canvasState, setCanvasState] = useRecoilState(canvasAtom) useEffect(() => { - get({ url: `/api/canvas-management/canvas-statuses/by-object/test123240822001` }).then((res) => { + get({ url: `/api/canvas-management/canvas-statuses/by-object/test123240822001/${userId}` }).then((res) => { console.log(res) const arrangeData = res.map((item) => { diff --git a/src/components/floor-plan/modal/grid/DotLineGrid.jsx b/src/components/floor-plan/modal/grid/DotLineGrid.jsx index d0e06fa9..db700207 100644 --- a/src/components/floor-plan/modal/grid/DotLineGrid.jsx +++ b/src/components/floor-plan/modal/grid/DotLineGrid.jsx @@ -28,11 +28,7 @@ export default function DotLineGrid(props) { const SelectOption = [ { id: 1, name: getMessage('modal.canvas.setting.grid.dot.line.setting.line.origin'), value: 1 }, { id: 2, name: '1/2', value: 1 / 2 }, - { - id: 3, - name: '1/4', - value: 1 / 4, - }, + { id: 3, name: '1/4', value: 1 / 4 }, { id: 4, name: '1/10', value: 1 / 10 }, ] const [selectOption, setSelectOption] = useState(SelectOption[0]) diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js index bd6c9eff..55854cb7 100644 --- a/src/hooks/usePlan.js +++ b/src/hooks/usePlan.js @@ -3,6 +3,8 @@ import { canvasState, currentCanvasPlanState, initCanvasPlansState } from '@/sto import { useAxios } from '@/hooks/useAxios' import { useMessage } from '@/hooks/useMessage' import { toastUp } from '@/hooks/useToast' +import { sessionStore } from '@/store/commonAtom' +import { useState } from 'react' export function usePlan() { const [canvas, setCanvas] = useRecoilState(canvasState) @@ -10,6 +12,8 @@ export function usePlan() { const [initCanvasPlans, setInitCanvasPlans] = useRecoilState(initCanvasPlansState) const { getMessage } = useMessage() const { get, promisePost, promisePut } = useAxios() + const [sessionState, setSessionState] = useRecoilState(sessionStore) + const [userId, setUserId] = useState(sessionState.userId) /** * 마우스 포인터의 가이드라인을 제거합니다. @@ -134,7 +138,7 @@ export function usePlan() { * objectNo에 해당하는 canvas 목록을 조회하는 함수 */ const getCanvasByObjectNo = async (objectNo) => { - return get({ url: `/api/canvas-management/canvas-statuses/by-object/${objectNo}` }).then((res) => + return get({ url: `/api/canvas-management/canvas-statuses/by-object/${objectNo}/${userId}` }).then((res) => res.map((item) => ({ id: item.id, name: item.objectNo + '-' + item.id, // tab button에 표출될 이름 (임시)