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 2025-02-05 12:52:09 +09:00
parent ae54f4d6a4
commit ab613bc967
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/components/common/font/FontSetting.jsx
View File

@ -87,25 +87,60 @@ export default function FontSetting(props) {
<div className="font-option-item"> <div className="font-option-item">
<div className="option-item-tit">{getMessage('modal.font')}(F)</div> <div className="option-item-tit">{getMessage('modal.font')}(F)</div>
<div className="grid-select"> <div className="grid-select">
<QSelectBox options={fonts} value={selectedFont} onChange={(e) => setSelectedFont(e)} /> <QSelectBox
options={fonts}
value={selectedFont}
onChange={(e) => {
setSelectedFont(e)
}}
showKey={'name'}
sourceKey={'value'}
targetKey={'value'}
/>
</div> </div>
</div> </div>
<div className="font-option-item"> <div className="font-option-item">
<div className="option-item-tit">{getMessage('modal.font.style')}(Y)</div> <div className="option-item-tit">{getMessage('modal.font.style')}(Y)</div>
<div className="grid-select"> <div className="grid-select">
<QSelectBox options={fontOptions} value={selectedFontWeight} onChange={(e) => setSelectedFontWeight(e)} /> <QSelectBox
options={fontOptions}
value={selectedFontWeight}
onChange={(e) => {
setSelectedFontWeight(e)
}}
showKey={'name'}
targetKey={'id'}
sourceKey={'id'}
/>
</div> </div>
</div> </div>
<div className="font-option-item"> <div className="font-option-item">
<div className="option-item-tit">{getMessage('modal.font.size')}(S)</div> <div className="option-item-tit">{getMessage('modal.font.size')}(S)</div>
<div className="grid-select"> <div className="grid-select">
<QSelectBox options={fontSizes} value={selectedFontSize} onChange={(e) => setSelectedFontSize(e)} /> <QSelectBox
options={fontSizes}
value={selectedFontSize}
onChange={(e) => setSelectedFontSize(e)}
showKey={'name'}
sourceKey={'value'}
targetKey={'value'}
/>
</div> </div>
</div> </div>
<div className="font-option-item"> <div className="font-option-item">
<div className="option-item-tit">{getMessage('modal.font.color')}</div> <div className="option-item-tit">{getMessage('modal.font.color')}</div>
<div className="grid-select"> <div className="grid-select">
<QSelectBox title={''} options={fontColors} value={selectedFontColor} onChange={(e) => setSelectedFontColor(e)} /> <QSelectBox
title={''}
options={fontColors}
showKey={'name'}
sourceKey={'id'}
targetKey={'id'}
value={selectedFontColor}
onChange={(e) => {
setSelectedFontColor(e)
}}
/>
</div> </div>
</div> </div>
</div> </div>

8
src/components/floor-plan/modal/setting01/SecondOption.jsx
View File

@ -21,6 +21,7 @@ export default function SecondOption(props) {
const flowFont = useRecoilValue(fontSelector('flowText')) const flowFont = useRecoilValue(fontSelector('flowText'))
const lengthFont = useRecoilValue(fontSelector('lengthText')) const lengthFont = useRecoilValue(fontSelector('lengthText'))
const circuitNumberTextFont = useRecoilValue(fontSelector('circuitNumberText')) const circuitNumberTextFont = useRecoilValue(fontSelector('circuitNumberText'))
const dimensionLineTextFont = useRecoilValue(fontSelector('dimensionLineText'))
const [dimensionId, setDimensionId] = useState(uuidv4()) const [dimensionId, setDimensionId] = useState(uuidv4())
const [fontId, setFontId] = useState(uuidv4()) const [fontId, setFontId] = useState(uuidv4())
const [planSizeId, setPlanSizeId] = useState(uuidv4()) const [planSizeId, setPlanSizeId] = useState(uuidv4())
@ -103,12 +104,7 @@ export default function SecondOption(props) {
//치수선 설정 //치수선 설정
if (!showDimensionLineSettingModal) { if (!showDimensionLineSettingModal) {
setShowDimensionLineSettingModal(true) setShowDimensionLineSettingModal(true)
fontProps.font = { fontProps.font = dimensionLineTextFont
fontFamily: '',
fontWeight: '',
fontSize: '',
fontColor: '',
}
addPopup(dimensionId, 2, <DimensionLineSetting {...dimensionProps} />, true) addPopup(dimensionId, 2, <DimensionLineSetting {...dimensionProps} />, true)
} else { } else {
setShowDimensionLineSettingModal(false) setShowDimensionLineSettingModal(false)