Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

This commit is contained in:
yoosangwook 2025-02-07 20:08:57 +09:00
commit e0489a8698

View File

@ -23,6 +23,7 @@ import { v4 as uuidv4 } from 'uuid'
import { useEstimate } from '@/hooks/useEstimate' import { useEstimate } from '@/hooks/useEstimate'
import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle' import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle'
import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController' import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
import { useImgLoader } from '@/hooks/floorPlan/useImgLoader'
const ALLOCATION_TYPE = { const ALLOCATION_TYPE = {
AUTO: 'auto', AUTO: 'auto',
@ -50,6 +51,9 @@ export default function CircuitTrestleSetting({ id }) {
// const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState) // const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState)
const [stepUpListData, setStepUpListData] = useState([]) const [stepUpListData, setStepUpListData] = useState([])
const [seletedOption, setSeletedOption] = useState(null) const [seletedOption, setSeletedOption] = useState(null)
const { handleCanvasToPng } = useImgLoader()
const { const {
makers, makers,
setMakers, setMakers,
@ -339,12 +343,11 @@ export default function CircuitTrestleSetting({ id }) {
setViewCircuitNumberTexts(false) setViewCircuitNumberTexts(false)
//TODO : handleCanvasToPng(1)
const result = await apply() const result = await apply()
if (result) { if (result) {
// TODO : handleCanvasToPng(2)
setViewCircuitNumberTexts(true) setViewCircuitNumberTexts(true)
await saveEstimate(result) await saveEstimate(result)
} }