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

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

Browse Source 
Reviewed-on: #283
This commit is contained in:
ysCha 2025-08-08 16:40:29 +09:00
commit ebb45740a8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks/roofcover/useAuxiliaryDrawing.js
View File

@ -883,7 +883,7 @@ export function useAuxiliaryDrawing(id, isUseEffect = true) {
return return
} }
cutAuxiliary() // cutAuxiliary()
const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)

4
src/hooks/usePolygon.js
View File

@ -845,12 +845,14 @@ export const usePolygon = () => {
polygonLines.forEach((polygonLine) => { polygonLines.forEach((polygonLine) => {
if (checkLineOverlap(innerLine, polygonLine)) { if (checkLineOverlap(innerLine, polygonLine)) {
// innerLine의 type을 polygonLine의 type으로 변경 // innerLine의 type을 polygonLine의 type으로 변경
if (polygonLine.attributes?.type && innerLine.attributes) { if (innerLine.attributes && polygonLine.attributes.type) {
// polygonLine.need = false // polygonLine.need = false
innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize
innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize
innerLine.attributes.type = polygonLine.attributes.type
innerLine.direction = polygonLine.direction innerLine.direction = polygonLine.direction
innerLine.attributes.isStart = true innerLine.attributes.isStart = true
innerLine.parentLine = polygonLine
} }
} }
}) })