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

폰트관련 옵션 수정, 문자표시 수정

Browse Source
This commit is contained in:
hyojun.choi 2024-11-12 16:56:04 +09:00
parent 499e75b981
commit d4a678aae6
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks/option/useFirstOption.js
View File

@ -40,7 +40,7 @@ export function useFirstOption() {
optionName = ['roof', POLYGON_TYPE.ROOF] optionName = ['roof', POLYGON_TYPE.ROOF]
break break
case 'wordDisplay': //문자 표시 case 'wordDisplay': //문자 표시
optionName = ['6'] optionName = ['commonText']
break break
case 'circuitNumDisplay': //회로번호 표시 case 'circuitNumDisplay': //회로번호 표시
optionName = ['7'] optionName = ['7']

17
src/hooks/usePolygon.js
View File

@ -285,12 +285,14 @@ export const usePolygon = () => {
const { direction, surfaceCompass, moduleCompass, arrow } = polygon const { 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 : getDegreeByChon(arrow.pitch)}${pitchText}`, {
fontFamily: flowFontOptions.fontFamily.value,
fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
fontStyle: flowFontOptions.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
fontSize: flowFontOptions.fontSize.value, fontSize: flowFontOptions.fontSize.value,
fill: flowFontOptions.fontColor.value, fill: flowFontOptions.fontColor.value,
fontFamily: flowFontOptions.fontFamily.value,
fontWeight: flowFontOptions.fontWeight.value,
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',
pitch: arrow.pitch,
name: 'flowText', name: 'flowText',
selectable: false, selectable: false,
left: arrow.stickeyPoint.x, left: arrow.stickeyPoint.x,
@ -426,10 +428,12 @@ export const usePolygon = () => {
} }
const textObj = new fabric.Text(`${text} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})`, { 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',
fontStyle: flowFontOptions.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
fontSize: flowFontOptions.fontSize.value, fontSize: flowFontOptions.fontSize.value,
fill: flowFontOptions.fontColor.value, fill: flowFontOptions.fontColor.value,
fontFamily: flowFontOptions.fontFamily.value, pitch: arrow.pitch,
fontWeight: flowFontOptions.fontWeight.value,
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',
name: 'flowText', name: 'flowText',
@ -641,10 +645,11 @@ export const usePolygon = () => {
const textStr = `${txt} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})` const textStr = `${txt} (${currentAngleType === ANGLE_TYPE.SLOPE ? arrow.pitch : getDegreeByChon(arrow.pitch)}${pitchText})`
const text = new fabric.Text(`${textStr}`, { const text = new fabric.Text(`${textStr}`, {
fontFamily: flowFontOptions.fontFamily.value,
fontWeight: flowFontOptions.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
fontStyle: flowFontOptions.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
fontSize: flowFontOptions.fontSize.value, fontSize: flowFontOptions.fontSize.value,
fill: flowFontOptions.fontColor.value, fill: flowFontOptions.fontColor.value,
fontFamily: flowFontOptions.fontFamily.value,
fontWeight: flowFontOptions.fontWeight.value,
pitch: arrow.pitch, pitch: arrow.pitch,
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',