Merge pull request 'dev' (#643) from dev into dev-deploy

Reviewed-on: #643

src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx

@@ -125,7 +125,8 @@ export default function StepUp(props) {
                 setSeletedMainOption(optionList[0])
               }
             }
-            const selectedSerQty = pcsItem.serQtyList.find((serQty) => serQty.selected)
+            const serQtyList = pcsItem.serQtyList ?? []
+            const selectedSerQty = serQtyList.find((serQty) => serQty.selected)
             if (selectedSerQty) {
               selectedSerQty.roofSurfaceList.forEach((roofSurface) => {
                 const targetSurface = canvas.getObjects().filter((obj) => obj.id === roofSurface.roofSurfaceId)[0]

src/hooks/option/useCanvasSetting.js

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

src/locales/ja.json

@@ -997,7 +997,9 @@
   "estimate.detail.itemTableHeader.amount": "数量",
   "estimate.detail.itemTableHeader.unit": "単位",
   "estimate.detail.itemTableHeader.salePrice": "単価",
+  "estimate.detail.itemTableHeader.unitPrice": "定価",
   "estimate.detail.itemTableHeader.saleTotPrice": "金額（税別）",
+  "estimate.detail.itemTableHeader.unitTotprice": "金額（税別）",
   "estimate.detail.docPopup.title": "見積書出力オプションの設定",
   "estimate.detail.docPopup.explane": "ダウンロードする文書オプションを選択し、[見積書出力]ボタンをクリックします。",
   "estimate.detail.docPopup.schUnitPriceFlg": "ダウンロードファイル",

src/locales/ko.json

@@ -997,7 +997,9 @@
   "estimate.detail.itemTableHeader.amount": "수량",
   "estimate.detail.itemTableHeader.unit": "단위",
   "estimate.detail.itemTableHeader.salePrice": "단가",
+  "estimate.detail.itemTableHeader.unitPrice": "정가",
   "estimate.detail.itemTableHeader.saleTotPrice": "금액(부가세별도)",
+  "estimate.detail.itemTableHeader.unitTotprice": "금액(부가세별도)",
   "estimate.detail.docPopup.title": "문서다운로드 옵션설정",
   "estimate.detail.docPopup.explane": "다운로드할 문서 옵션을 선택한 후 문서 다운로드 버튼을 클릭합니다.",
   "estimate.detail.docPopup.schUnitPriceFlg": "다운로드 파일",

src/store/fontAtom.js

@@ -1,11 +1,14 @@
 import { atom, selectorFamily } from 'recoil'
 
-const defaultFont = {
+const makeDefaultFont = (fontSize) => ({
   fontFamily: { id: 1, name: 'MS PGothic', value: 'MS PGothic' },
   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' },
-}
+})
+
+const defaultFont = makeDefaultFont(28)
+const defaultCircuitNumberFont = makeDefaultFont(36)
 
 export const globalFontAtom = atom({
   key: 'fontAtom',
@@ -14,7 +17,7 @@ export const globalFontAtom = atom({
     dimensionLineText: defaultFont,
     flowText: defaultFont,
     lengthText: defaultFont,
-    circuitNumberText: defaultFont,
+    circuitNumberText: defaultCircuitNumberFont,
   },
 })