Merge branch 'dev' into feature/design-remake
This commit is contained in:
commit
fda35b6927
@ -852,7 +852,10 @@ export const usePolygon = () => {
|
||||
if (checkLineOverlap(innerLine, polygonLine)) {
|
||||
// innerLine의 type을 polygonLine의 type으로 변경
|
||||
if (innerLine.attributes && polygonLine.attributes.type) {
|
||||
// polygonLine.need = false
|
||||
// innerLine이 polygonLine보다 긴 경우 polygonLine.need를 false로 변경
|
||||
if (polygonLine.length < innerLine.length) {
|
||||
polygonLine.need = false
|
||||
}
|
||||
innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize
|
||||
innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize
|
||||
innerLine.attributes.type = polygonLine.attributes.type
|
||||
@ -1008,6 +1011,9 @@ export const usePolygon = () => {
|
||||
/*const originInnerStroke = innerLine.stroke
|
||||
innerLine.set({ stroke: 'red' })
|
||||
canvas.renderAll()*/
|
||||
if (checkLineOverlap(line, innerLine)) {
|
||||
return
|
||||
}
|
||||
if (isPointOnLine(line, innerLine.startPoint)) {
|
||||
canvas.renderAll()
|
||||
if (isSamePoint(line.startPoint, innerLine.startPoint) || isSamePoint(line.endPoint, innerLine.startPoint)) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user