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

Merge pull request 'dev' (#141) from dev into prd-deploy

Browse Source 
Reviewed-on: #141
This commit is contained in:
ysCha 2025-06-24 16:07:46 +09:00
commit a151046943
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/floor-plan/CanvasFrame.jsx
View File

@ -68,9 +68,10 @@ export default function CanvasFrame() {
canvas?.loadFromJSON(JSON.parse(plan.canvasStatus), function () {
canvasLoadInit() //config된 상태로 캔버스 객체를 그린다
canvas?.renderAll() // 캔버스를 다시 그립니다.
if (canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE).length > 0) {
setSelectedMenu('module')
} else if (canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.WALL).length > 0) {
setSelectedMenu('outline')
} else {
setSelectedMenu('surface')
}

11
src/hooks/common/useRoofFn.js
View File

@ -202,7 +202,7 @@ export function useRoofFn() {
}
const roof = roofBase[0]
const wall = roof.wall
const wall = canvas.getObjects().find((obj) => obj.name === POLYGON_TYPE.WALL && obj.attributes?.roofId === roof.id)
const checkPolygon = new fabric.Polygon(roof.points, {
name: 'moveRoofPolygon',
@ -230,16 +230,11 @@ export function useRoofFn() {
const texts = canvas.getObjects().filter((obj) => obj.type === 'text' && (obj.attributes?.roofId === roof.id || obj.parentId === roof.id))
texts.forEach((text) => canvas.remove(text))
const outerLines = canvas.getObjects().filter((obj) => obj.type === 'QLine' && (obj.attributes?.roofId === roof.id || obj.parentId === roof.id))
const allRoofObject = canvas
.getObjects()
.filter(
(obj) => obj !== roof && /*obj !== wall &&*/ (obj.attributes?.roofId === roof.id || obj.parentId === roof.id || obj.parentId === wall.id),
)
// // Calculate the movement delta
.filter((obj) => obj !== roof && (obj.attributes?.roofId === roof.id || obj.parentId === roof.id || obj.parentId === wall.id))
/** 지붕이 움직인 만큼의 delta를 구한다. */
const originalRoofLeft = roof.left
const originalRoofTop = roof.top

6
src/util/qpolygon-utils.js
View File

@ -7585,6 +7585,8 @@ const reDrawPolygon = (polygon, canvas) => {
selectable: polygon.selectable,
fontSize: polygon.fontSize,
wall: polygon.wall !== undefined ? polygon.wall : null,
originX: polygon.originX,
originY: polygon.originY,
})
const newLines = newPolygon.lines
@ -7609,8 +7611,8 @@ const reDrawPolygon = (polygon, canvas) => {
}
})
canvas?.add(newPolygon)
canvas?.renderAll()
canvas.add(newPolygon)
canvas.renderAll()
return newPolygon
}