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

dev #644

Merged
ysCha merged 3 commits from dev into prd-deploy 2026-02-04 17:50:56 +09:00
Conversation 0 Commits 3 Files Changed 5 +11 -8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1efc6b561 - Show all commits

8
src/hooks/option/useCanvasSetting.js
View File

@ -802,25 +802,25 @@ export function useCanvasSetting(executeEffect = true) {
/** 문자 글꼴 설정 */ /** 문자 글꼴 설정 */
wordFont: globalFont.commonText.fontFamily?.value ?? 'MS PGothic', wordFont: globalFont.commonText.fontFamily?.value ?? 'MS PGothic',
wordFontStyle: globalFont.commonText.fontWeight?.value ?? 'normal', wordFontStyle: globalFont.commonText.fontWeight?.value ?? 'normal',
wordFontSize: globalFont.commonText.fontSize?.value ?? 16, wordFontSize: globalFont.commonText.fontSize?.value ?? 28,
wordFontColor: globalFont.commonText.fontColor?.value ?? 'black', wordFontColor: globalFont.commonText.fontColor?.value ?? 'black',
/** 흐름방향 글꼴 설정 */ /** 흐름방향 글꼴 설정 */
flowFont: globalFont.flowText.fontFamily?.value ?? 'MS PGothic', flowFont: globalFont.flowText.fontFamily?.value ?? 'MS PGothic',
flowFontStyle: globalFont.flowText.fontWeight?.value ?? 'normal', flowFontStyle: globalFont.flowText.fontWeight?.value ?? 'normal',
flowFontSize: globalFont.flowText.fontSize?.value ?? 16, flowFontSize: globalFont.flowText.fontSize?.value ?? 28,
flowFontColor: globalFont.flowText.fontColor?.value ?? 'black', flowFontColor: globalFont.flowText.fontColor?.value ?? 'black',
/** 치수 글꼴 설정 */ /** 치수 글꼴 설정 */
dimensioFont: globalFont.dimensionLineText.fontFamily?.value ?? 'MS PGothic', dimensioFont: globalFont.dimensionLineText.fontFamily?.value ?? 'MS PGothic',
dimensioFontStyle: globalFont.dimensionLineText.fontWeight?.value ?? 'normal', dimensioFontStyle: globalFont.dimensionLineText.fontWeight?.value ?? 'normal',
dimensioFontSize: globalFont.dimensionLineText.fontSize?.value ?? 16, dimensioFontSize: globalFont.dimensionLineText.fontSize?.value ?? 28,
dimensioFontColor: globalFont.dimensionLineText.fontColor?.value ?? 'black', dimensioFontColor: globalFont.dimensionLineText.fontColor?.value ?? 'black',
/** 회로번호 글꼴 설정 */ /** 회로번호 글꼴 설정 */
circuitNumFont: globalFont.circuitNumberText.fontFamily?.value ?? 'MS PGothic', circuitNumFont: globalFont.circuitNumberText.fontFamily?.value ?? 'MS PGothic',
circuitNumFontStyle: globalFont.circuitNumberText.fontWeight?.value ?? 'normal', circuitNumFontStyle: globalFont.circuitNumberText.fontWeight?.value ?? 'normal',
circuitNumFontSize: globalFont.circuitNumberText.fontSize?.value ?? 16, circuitNumFontSize: globalFont.circuitNumberText.fontSize?.value ?? 36,
circuitNumFontColor: globalFont.circuitNumberText.fontColor?.value ?? 'black', circuitNumFontColor: globalFont.circuitNumberText.fontColor?.value ?? 'black',
/** 치수선 글꼴 설정 */ /** 치수선 글꼴 설정 */

11
src/store/fontAtom.js
View File

@ -1,11 +1,14 @@
import { atom, selectorFamily } from 'recoil' import { atom, selectorFamily } from 'recoil'
const defaultFont = { const makeDefaultFont = (fontSize) => ({
fontFamily: { id: 1, name: 'MS PGothic', value: 'MS PGothic' }, fontFamily: { id: 1, name: 'MS PGothic', value: 'MS PGothic' },
fontWeight: { id: 'normal', name: '보통', value: 'normal' }, fontWeight: { id: 'normal', name: '보통', value: 'normal' },
fontSize: { id: 16, name: 16, value: 16 }, fontSize: { id: fontSize, name: fontSize, value: fontSize },
fontColor: { id: 'black', name: '검정색', value: 'black' }, fontColor: { id: 'black', name: '검정색', value: 'black' },
} })
const defaultFont = makeDefaultFont(28)
const defaultCircuitNumberFont = makeDefaultFont(36)
export const globalFontAtom = atom({ export const globalFontAtom = atom({
key: 'fontAtom', key: 'fontAtom',
@ -14,7 +17,7 @@ export const globalFontAtom = atom({
dimensionLineText: defaultFont, dimensionLineText: defaultFont,
flowText: defaultFont, flowText: defaultFont,
lengthText: defaultFont, lengthText: defaultFont,
circuitNumberText: defaultFont, circuitNumberText: defaultCircuitNumberFont,
}, },
}) })