diff --git a/src/components/common/font/FontSetting.jsx b/src/components/common/font/FontSetting.jsx index 26d07ea7..ddddefca 100644 --- a/src/components/common/font/FontSetting.jsx +++ b/src/components/common/font/FontSetting.jsx @@ -87,25 +87,60 @@ export default function FontSetting(props) {
{getMessage('modal.font')}(F)
- setSelectedFont(e)} /> + { + setSelectedFont(e) + }} + showKey={'name'} + sourceKey={'value'} + targetKey={'value'} + />
{getMessage('modal.font.style')}(Y)
- setSelectedFontWeight(e)} /> + { + setSelectedFontWeight(e) + }} + showKey={'name'} + targetKey={'id'} + sourceKey={'id'} + />
{getMessage('modal.font.size')}(S)
- setSelectedFontSize(e)} /> + setSelectedFontSize(e)} + showKey={'name'} + sourceKey={'value'} + targetKey={'value'} + />
{getMessage('modal.font.color')}
- setSelectedFontColor(e)} /> + { + setSelectedFontColor(e) + }} + />
diff --git a/src/components/floor-plan/modal/setting01/SecondOption.jsx b/src/components/floor-plan/modal/setting01/SecondOption.jsx index 941c2d3e..f264edb2 100644 --- a/src/components/floor-plan/modal/setting01/SecondOption.jsx +++ b/src/components/floor-plan/modal/setting01/SecondOption.jsx @@ -21,6 +21,7 @@ export default function SecondOption(props) { const flowFont = useRecoilValue(fontSelector('flowText')) const lengthFont = useRecoilValue(fontSelector('lengthText')) const circuitNumberTextFont = useRecoilValue(fontSelector('circuitNumberText')) + const dimensionLineTextFont = useRecoilValue(fontSelector('dimensionLineText')) const [dimensionId, setDimensionId] = useState(uuidv4()) const [fontId, setFontId] = useState(uuidv4()) const [planSizeId, setPlanSizeId] = useState(uuidv4()) @@ -103,12 +104,7 @@ export default function SecondOption(props) { //치수선 설정 if (!showDimensionLineSettingModal) { setShowDimensionLineSettingModal(true) - fontProps.font = { - fontFamily: '', - fontWeight: '', - fontSize: '', - fontColor: '', - } + fontProps.font = dimensionLineTextFont addPopup(dimensionId, 2, , true) } else { setShowDimensionLineSettingModal(false)