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

Merge pull request '[1480]사의 각도 설정을 "각도"로 했을 때 발생하는 문제' (#737) from dev into dev-deploy

Browse Source 
Reviewed-on: #737
This commit is contained in:
ysCha 2026-03-30 18:35:33 +09:00
commit 1c2bb7147a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hooks/common/useCanvasConfigInitialize.js
View File

@ -47,12 +47,12 @@ export function useCanvasConfigInitialize() {
offsetTexts.forEach((obj) => { offsetTexts.forEach((obj) => {
let text = `${!obj.originText ? '' : obj.originText}` let text = `${!obj.originText ? '' : obj.originText}`
if (!obj.onlyOffset) { if (!obj.onlyOffset) {
text = text + `-∠${getDegreeByChon(obj.pitch)}${angleUnit}` text = text + `-∠${obj.roofAngle ?? getDegreeByChon(obj.pitch)}${angleUnit}`
} }
obj.set({ text: text }) obj.set({ text: text })
}) })
flowTexts.forEach((obj) => { flowTexts.forEach((obj) => {
obj.set({ text: `${!obj.originText ? '' : obj.originText + '-'}∠${getDegreeByChon(obj.pitch)}${pitchText}` }) obj.set({ text: `${!obj.originText ? '' : obj.originText + '-'}∠${obj.roofAngle ?? getDegreeByChon(obj.pitch)}${pitchText}` })
}) })
} }

10
src/hooks/usePolygon.js
View File

@ -333,6 +333,7 @@ export const usePolygon = () => {
moduleCompass: polygon.moduleCompass, moduleCompass: polygon.moduleCompass,
visible: isFlowDisplay, visible: isFlowDisplay,
pitch: polygon.roofMaterial?.pitch ?? 4, pitch: polygon.roofMaterial?.pitch ?? 4,
roofAngle: polygon.roofMaterial?.angle,
parentId: polygon.id, parentId: polygon.id,
}) })
arrow.setViewLengthText(false) arrow.setViewLengthText(false)
@ -348,7 +349,7 @@ export const usePolygon = () => {
const drawDirectionStringToArrow2 = (polygon, showDirectionText) => { const drawDirectionStringToArrow2 = (polygon, showDirectionText) => {
let { direction, surfaceCompass, moduleCompass, arrow } = polygon let { direction, surfaceCompass, moduleCompass, arrow } = polygon
if (moduleCompass === null || moduleCompass === undefined) { if (moduleCompass === null || moduleCompass === undefined) {
const textObj = new fabric.Text(`${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText}`, { const textObj = new fabric.Text(`${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : (arrow.roofAngle ?? getDegreeByChon(arrow.pitch))}${pitchText}`, {
fontFamily: flowFontOptions.fontFamily.value, fontFamily: flowFontOptions.fontFamily.value,
fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal', fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
fontStyle: flowFontOptions.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal', fontStyle: flowFontOptions.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
@ -357,6 +358,7 @@ export const usePolygon = () => {
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',
pitch: arrow.pitch, pitch: arrow.pitch,
roofAngle: arrow.roofAngle,
name: 'flowText', name: 'flowText',
selectable: false, selectable: false,
left: arrow.stickeyPoint.x, left: arrow.stickeyPoint.x,
@ -490,7 +492,7 @@ export const usePolygon = () => {
text = text + (sameDirectionCnt.length + 1) text = text + (sameDirectionCnt.length + 1)
polygon.set('directionText', text) polygon.set('directionText', text)
const textObj = new fabric.Text( const textObj = new fabric.Text(
`${showDirectionText && text} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})`, `${showDirectionText && text} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : (arrow.roofAngle ?? getDegreeByChon(arrow.pitch))}${pitchText})`,
{ {
fontFamily: flowFontOptions.fontFamily.value, fontFamily: flowFontOptions.fontFamily.value,
fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal', fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
@ -498,6 +500,7 @@ export const usePolygon = () => {
fontSize: flowFontOptions.fontSize.value, fontSize: flowFontOptions.fontSize.value,
fill: flowFontOptions.fontColor.value, fill: flowFontOptions.fontColor.value,
pitch: arrow.pitch, pitch: arrow.pitch,
roofAngle: arrow.roofAngle,
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',
name: 'flowText', name: 'flowText',
@ -707,7 +710,7 @@ export const usePolygon = () => {
const addTextByArrows = (arrows, txt, canvas) => { const addTextByArrows = (arrows, txt, canvas) => {
arrows.forEach((arrow, index) => { arrows.forEach((arrow, index) => {
// const textStr = `${txt}${index + 1} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})` // const textStr = `${txt}${index + 1} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})`
const textStr = `${txt} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})` const textStr = `${txt} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : (arrow.roofAngle ?? getDegreeByChon(arrow.pitch))}${pitchText})`
const text = new fabric.Text(`${textStr}`, { const text = new fabric.Text(`${textStr}`, {
fontFamily: flowFontOptions.fontFamily.value, fontFamily: flowFontOptions.fontFamily.value,
@ -716,6 +719,7 @@ export const usePolygon = () => {
fontSize: flowFontOptions.fontSize.value, fontSize: flowFontOptions.fontSize.value,
fill: flowFontOptions.fontColor.value, fill: flowFontOptions.fontColor.value,
pitch: arrow.pitch, pitch: arrow.pitch,
roofAngle: arrow.roofAngle,
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',
name: 'flowText', name: 'flowText',