dev #930

Merged
ysCha merged 95 commits from dev into dev-deploy 2026-06-23 18:00:25 +09:00
2 changed files with 26 additions and 2 deletions
Showing only changes of commit 78e4225069 - Show all commits

View File

@ -689,7 +689,18 @@ export default function CircuitTrestleSetting({ id }) {
.map((obj) => {
obj.pcses = getStepUpListData()
})
await capture(1)
// ( )
try {
await capture(1)
} catch (e) {
console.log('🚀 ~ capture(1) error:', e)
setIsGlobalLoading(false)
swalFire({
text: getMessage('common.message.send.error'),
icon: 'error',
})
return
}
// result=null

View File

@ -106,6 +106,18 @@ export function useImgLoader() {
canvas.renderAll()
// 렌더링 완료 대기 (최대 3초, 초과 시 에러)
const renderReady = await new Promise((resolve) => {
const timeout = setTimeout(() => resolve(false), 3000)
requestAnimationFrame(() => {
clearTimeout(timeout)
resolve(true)
})
})
if (!renderReady) {
throw new Error('RENDER_TIMEOUT')
}
const formData = new FormData()
// 3. 도면 오브젝트의 바운딩 박스 계산
@ -164,8 +176,9 @@ export function useImgLoader() {
} catch (e) {
canvas.backgroundColor = originalBg
canvas.renderAll()
setIsGlobalLoading(false)
toggleLineEtc(true)
console.log('🚀 ~ handleCanvasToPng ~ e:', e)
throw e
}
}