diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js index 9c690a6b..3e24920c 100644 --- a/src/hooks/usePolygon.js +++ b/src/hooks/usePolygon.js @@ -427,12 +427,13 @@ export const usePolygon = () => { text = '西西南' } - const sameDirectionCnt = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF && obj.directionText === text) + const sameDirectionCnt = canvas.getObjects().filter((obj) => { + const onlyStrDirection = obj.directionText?.replace(/[0-9]/g, '') + return obj.name === POLYGON_TYPE.ROOF && onlyStrDirection === text + }) text = text + (sameDirectionCnt.length + 1) - polygon.set('directionText', text) - const textObj = new fabric.Text(`${text} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})`, { fontFamily: flowFontOptions.fontFamily.value, fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',