From ab613bc967a53378f2bc682336a97acb312307f2 Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Wed, 5 Feb 2025 12:52:09 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EC=95=88=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/font/FontSetting.jsx    | 43 +++++++++++++++++--
 .../modal/setting01/SecondOption.jsx          |  8 +---
 2 files changed, 41 insertions(+), 10 deletions(-)

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) {
               <div className="font-option-item">
                 <div className="option-item-tit">{getMessage('modal.font')}(F)</div>
                 <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 className="font-option-item">
                 <div className="option-item-tit">{getMessage('modal.font.style')}(Y)</div>
                 <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 className="font-option-item">
                 <div className="option-item-tit">{getMessage('modal.font.size')}(S)</div>
                 <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 className="font-option-item">
                 <div className="option-item-tit">{getMessage('modal.font.color')}</div>
                 <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>
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, <DimensionLineSetting {...dimensionProps} />, true)
         } else {
           setShowDimensionLineSettingModal(false)