qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-ds' into dev

Browse Source
This commit is contained in:
Daseul Kim 2024-10-21 13:45:55 +09:00
commit 2b18ad2303
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/floor-plan/CanvasLayout.jsx
View File

@ -7,14 +7,11 @@ import { useMessage } from '@/hooks/useMessage'
import { useSwal } from '@/hooks/useSwal' import { useSwal } from '@/hooks/useSwal'
import { usePlan } from '@/hooks/usePlan' import { usePlan } from '@/hooks/usePlan'
import { globalLocaleStore } from '@/store/localeAtom' import { globalLocaleStore } from '@/store/localeAtom'
import { sessionStore } from '@/store/commonAtom'
import { SessionContext } from '@/app/SessionProvider' import { SessionContext } from '@/app/SessionProvider'
export default function CanvasLayout() { export default function CanvasLayout() {
const { session } = useContext(SessionContext) const { session } = useContext(SessionContext)
console.log('session >>> ', session)
const [objectNo, setObjectNo] = useState('test123240822001') // 이후 삭제 필요 const [objectNo, setObjectNo] = useState('test123240822001') // 이후 삭제 필요
const sessionState = useRecoilValue(sessionStore)
const globalLocaleState = useRecoilValue(globalLocaleStore) const globalLocaleState = useRecoilValue(globalLocaleStore)
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -22,8 +19,7 @@ export default function CanvasLayout() {
const { plans, loadCanvasPlanData, handleCurrentPlan, handleAddPlan, handleDeletePlan } = usePlan() const { plans, loadCanvasPlanData, handleCurrentPlan, handleAddPlan, handleDeletePlan } = usePlan()
useEffect(() => { useEffect(() => {
console.log('loadCanvasPlanData 실행, sessionState.userId >>> ', sessionState.userId) loadCanvasPlanData(session.userId, objectNo)
loadCanvasPlanData(sessionState.userId, objectNo)
}, []) }, [])
return ( return (
@ -34,7 +30,7 @@ export default function CanvasLayout() {
<button <button
key={`plan-${plan.id}`} key={`plan-${plan.id}`}
className={`canvas-page-box ${plan.isCurrent === true ? 'on' : ''}`} className={`canvas-page-box ${plan.isCurrent === true ? 'on' : ''}`}
onClick={() => handleCurrentPlan(sessionState.userId, plan.id)} onClick={() => handleCurrentPlan(session.userId, plan.id)}
> >
<span>{plan.name}</span> <span>{plan.name}</span>
<i <i
@ -53,7 +49,7 @@ export default function CanvasLayout() {
))} ))}
</div> </div>
{plans.length < 10 && ( {plans.length < 10 && (
<button className="plane-add" onClick={() => handleAddPlan(sessionState.userId, objectNo)}> <button className="plane-add" onClick={() => handleAddPlan(session.userId, objectNo)}>
<span></span> <span></span>
</button> </button>
)} )}

6
src/hooks/usePlan.js
View File

@ -1,5 +1,6 @@
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useRecoilState } from 'recoil' import { useRecoilState } from 'recoil'
import { v4 as uuidv4 } from 'uuid'
import { canvasState, currentCanvasPlanState, initCanvasPlansState, plansState } from '@/store/canvasAtom' import { canvasState, currentCanvasPlanState, initCanvasPlansState, plansState } from '@/store/canvasAtom'
import { useAxios } from '@/hooks/useAxios' import { useAxios } from '@/hooks/useAxios'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
@ -269,15 +270,16 @@ export function usePlan() {
: addPlan(userId, objectNo) : addPlan(userId, objectNo)
} }
const addPlan = (userId, objectNo, canvasStatus = '') => { const addPlan = (userId, objectNo, canvasStatus = '') => {
const id = uuidv4()
const newPlan = { const newPlan = {
id: planNum, id: id,
name: `Plan ${planNum + 1}`, name: `Plan ${planNum + 1}`,
objectNo: objectNo, objectNo: objectNo,
userId: userId, userId: userId,
canvasStatus: canvasStatus, canvasStatus: canvasStatus,
} }
setPlans([...plans, newPlan]) setPlans([...plans, newPlan])
handleCurrentPlan(userId, planNum) handleCurrentPlan(userId, id)
setPlanNum(planNum + 1) setPlanNum(planNum + 1)
} }