From cc3bf02b17e39faacbedae6de1bdb5fd5c98701e Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 2 Jul 2025 10:47:36 +0900 Subject: [PATCH 1/4] =?UTF-8?q?capture=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=A0=84=20=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?= =?UTF-8?q?=20=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 22 ++++++++++++++----- src/locales/ja.json | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 803ea4d9..26dbf402 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -107,6 +107,20 @@ export default function CircuitTrestleSetting({ id }) { } }, []) + const capture = (type) => { + beforeCapture() + setTimeout(() => { + handleCanvasToPng(type) + afterCapture() + }, 1000) + + return new Promise((resolve) => { + setTimeout(() => { + resolve(true) + }, 1000) + }) + } + // 캡쳐 전 처리 const beforeCapture = () => { // setCanvasZoom(100) @@ -387,9 +401,7 @@ export default function CircuitTrestleSetting({ id }) { .map((obj) => { obj.pcses = getStepUpListData() }) - beforeCapture() - handleCanvasToPng(1) - afterCapture() + await capture(1) //회로할당 저장 시 result=null인 경우에도 회로번호 텍스트 표시 유지 처리 @@ -406,9 +418,7 @@ export default function CircuitTrestleSetting({ id }) { const result = await getEstimateData() if (result) { - beforeCapture() - handleCanvasToPng(2) - afterCapture() + await capture(2) // 견적서 저장 await saveEstimate(result) } else { diff --git a/src/locales/ja.json b/src/locales/ja.json index f0bab819..8629e287 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -89,7 +89,7 @@ "plan.menu.placement.surface.all.remove": "配置面全体を削除", "plan.menu.module.circuit.setting": "モジュール配置、回路構成", "plan.menu.module.circuit.setting.default": "モジュール/架台設定", - "modal.module.basic.setting.orientation.setting": "方位設定", + "modal.module.basic.setting.orientation.setting": "方位/モジュール設定", "modal.module.basic.setting.orientation.setting.info": "※シミュレーション計算用方位を指定します。南の方位を設定してください。", "modal.module.basic.setting.orientation.setting.angle.passivity": "角度変更", "modal.module.basic.setting.module.roof.material": "屋根材", @@ -97,7 +97,7 @@ "modal.module.basic.setting.module.rafter.margin": "垂木の間隔", "modal.module.basic.setting.module.construction.method": "工法", "modal.module.basic.setting.module.under.roof": "屋根下地", - "modal.module.basic.setting.module.setting": "モジュールの選択", + "modal.module.basic.setting.module.setting": "架台設定", "modal.module.basic.setting.module.placement.area": "モジュール配置領域", "modal.module.basic.setting.module.placement.margin": "モジュール間の間隙", "modal.module.basic.setting.module.placement.area.eaves": "軒側", From 2a3ae5b0be99bf17386d9ae60671de843bc06ede Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 2 Jul 2025 10:51:57 +0900 Subject: [PATCH 2/4] =?UTF-8?q?50%=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/CircuitTrestleSetting.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 26dbf402..6f67db76 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -123,10 +123,7 @@ export default function CircuitTrestleSetting({ id }) { // 캡쳐 전 처리 const beforeCapture = () => { - // setCanvasZoom(100) - const x = canvas.width / 2 - const y = canvas.height / 2 - canvas.zoomToPoint(new fabric.Point(x, y), 0.5) + setCanvasZoom(100) changeFontSize('lengthText', '28') changeFontSize('circuitNumber', '28') changeFontSize('flowText', '28') From 422a331d90254053b24bbc6cffb50c141c70b3b8 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 2 Jul 2025 10:52:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?50%=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/CircuitTrestleSetting.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 6f67db76..7030d937 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -124,6 +124,8 @@ export default function CircuitTrestleSetting({ id }) { // 캡쳐 전 처리 const beforeCapture = () => { setCanvasZoom(100) + canvas.set({ zoom: 1 }) + canvas.viewportTransform = [1, 0, 0, 1, 0, 0] changeFontSize('lengthText', '28') changeFontSize('circuitNumber', '28') changeFontSize('flowText', '28') @@ -132,9 +134,6 @@ export default function CircuitTrestleSetting({ id }) { // 캡쳐 후 처리 const afterCapture = () => { - setCanvasZoom(100) - canvas.set({ zoom: 1 }) - canvas.viewportTransform = [1, 0, 0, 1, 0, 0] changeFontSize('lengthText', lengthText.fontSize.value) changeFontSize('circuitNumber', circuitNumberText.fontSize.value) changeFontSize('flowText', flowText.fontSize.value) From f24715b5d41b5085333cbc4a5df23ffe6af4e32c Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 2 Jul 2025 11:00:35 +0900 Subject: [PATCH 4/4] =?UTF-8?q?50%=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/CircuitTrestleSetting.jsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 7030d937..26dbf402 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -123,9 +123,10 @@ export default function CircuitTrestleSetting({ id }) { // 캡쳐 전 처리 const beforeCapture = () => { - setCanvasZoom(100) - canvas.set({ zoom: 1 }) - canvas.viewportTransform = [1, 0, 0, 1, 0, 0] + // setCanvasZoom(100) + const x = canvas.width / 2 + const y = canvas.height / 2 + canvas.zoomToPoint(new fabric.Point(x, y), 0.5) changeFontSize('lengthText', '28') changeFontSize('circuitNumber', '28') changeFontSize('flowText', '28') @@ -134,6 +135,9 @@ export default function CircuitTrestleSetting({ id }) { // 캡쳐 후 처리 const afterCapture = () => { + setCanvasZoom(100) + canvas.set({ zoom: 1 }) + canvas.viewportTransform = [1, 0, 0, 1, 0, 0] changeFontSize('lengthText', lengthText.fontSize.value) changeFontSize('circuitNumber', circuitNumberText.fontSize.value) changeFontSize('flowText', flowText.fontSize.value)