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

Merge branch 'dev' into feature/qcast-229

Browse Source
This commit is contained in:
basssy 2025-02-25 10:09:25 +09:00
commit 77c17c72c8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/floor-plan/CanvasMenu.jsx
View File

@ -265,7 +265,7 @@ export default function CanvasMenu(props) {
if (estimateDetail.estimateDate !== null && estimateDetail.docNo) { if (estimateDetail.estimateDate !== null && estimateDetail.docNo) {
setSelectedMenu(menu.type) setSelectedMenu(menu.type)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/simulator/6?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
if (pathname === '/floor-plan/simulator/6') { if (pathname === '/floor-plan/simulator/6') {
setIsGlobalLoading(false) setIsGlobalLoading(false)
} }

14
src/hooks/module/useModuleBasicSetting.js
View File

@ -1333,9 +1333,9 @@ export function useModuleBasicSetting(tabNum) {
installedLastHeightCoord = moduleY + height + heightMargin installedLastHeightCoord = moduleY + height + heightMargin
} else { } else {
//디버깅용 //디버깅용
tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) // tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 })
canvas?.add(tempModule) // canvas?.add(tempModule)
canvas.renderAll() // canvas.renderAll()
} }
} }
if (isInstall) { if (isInstall) {
@ -1643,9 +1643,9 @@ export function useModuleBasicSetting(tabNum) {
// } // }
} else { } else {
//디버깅용 //디버깅용
tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 }) // tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 })
canvas?.add(tempModule) // canvas?.add(tempModule)
canvas.renderAll() // canvas.renderAll()
} }
} }
@ -2625,7 +2625,7 @@ export function useModuleBasicSetting(tabNum) {
* 스냅기능 * 스냅기능
*/ */
let snapDistance = 10 let snapDistance = 10
let cellSnapDistance = 20 let cellSnapDistance = 50
let intvHor = flowDirection === 'south' || flowDirection === 'north' ? 1 : 3 let intvHor = flowDirection === 'south' || flowDirection === 'north' ? 1 : 3
let intvVer = flowDirection === 'south' || flowDirection === 'north' ? 3 : 1 let intvVer = flowDirection === 'south' || flowDirection === 'north' ? 3 : 1