From f1efc6b5614a9fbb914fafac9dcd4af111915298 Mon Sep 17 00:00:00 2001 From: ysCha Date: Wed, 4 Feb 2026 16:30:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[1457]=20=EA=B8=B0=EB=B3=B8=ED=8F=B0?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/option/useCanvasSetting.js | 8 ++++---- src/store/fontAtom.js | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index d6cc0e2b..88c32d5f 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/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', /** 치수선 글꼴 설정 */ diff --git a/src/store/fontAtom.js b/src/store/fontAtom.js index 3cc4396c..1e42a6b6 100644 --- a/src/store/fontAtom.js +++ b/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, }, }) From d2c56ceff78c7a4eb020fd82acd063e527ced587 Mon Sep 17 00:00:00 2001 From: ysCha Date: Wed, 4 Feb 2026 16:31:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?serQtyList=EA=B0=80=20=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20find=EB=A5=BC=20?= =?UTF-8?q?=ED=98=B8=EC=B6=9C=ED=95=B4=20=EC=97=90=EB=9F=AC=20=EB=B0=9C?= =?UTF-8?q?=EC=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index e4e8a615..f8ae00ad 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/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] From 43df05beee3b50ce33389674b97730a450b8d1ec Mon Sep 17 00:00:00 2001 From: ysCha Date: Wed, 4 Feb 2026 16:31:53 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=A0=95=EA=B0=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ja.json | 2 ++ src/locales/ko.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/locales/ja.json b/src/locales/ja.json index debbec54..0c589e1e 100644 --- a/src/locales/ja.json +++ b/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": "ダウンロードファイル", diff --git a/src/locales/ko.json b/src/locales/ko.json index bbb2d7b1..6ada9943 100644 --- a/src/locales/ko.json +++ b/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": "다운로드 파일",