dev #168

Merged
ysCha merged 4 commits from dev into prd-deploy 2025-07-02 14:42:10 +09:00
2 changed files with 18 additions and 8 deletions

View File

@ -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 = () => { const beforeCapture = () => {
// setCanvasZoom(100) // setCanvasZoom(100)
@ -387,9 +401,7 @@ export default function CircuitTrestleSetting({ id }) {
.map((obj) => { .map((obj) => {
obj.pcses = getStepUpListData() obj.pcses = getStepUpListData()
}) })
beforeCapture() await capture(1)
handleCanvasToPng(1)
afterCapture()
// result=null // result=null
@ -406,9 +418,7 @@ export default function CircuitTrestleSetting({ id }) {
const result = await getEstimateData() const result = await getEstimateData()
if (result) { if (result) {
beforeCapture() await capture(2)
handleCanvasToPng(2)
afterCapture()
// //
await saveEstimate(result) await saveEstimate(result)
} else { } else {

View File

@ -89,7 +89,7 @@
"plan.menu.placement.surface.all.remove": "配置面全体を削除", "plan.menu.placement.surface.all.remove": "配置面全体を削除",
"plan.menu.module.circuit.setting": "モジュール配置、回路構成", "plan.menu.module.circuit.setting": "モジュール配置、回路構成",
"plan.menu.module.circuit.setting.default": "モジュール/架台設定", "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.info": "※シミュレーション計算用方位を指定します。南の方位を設定してください。",
"modal.module.basic.setting.orientation.setting.angle.passivity": "角度変更", "modal.module.basic.setting.orientation.setting.angle.passivity": "角度変更",
"modal.module.basic.setting.module.roof.material": "屋根材", "modal.module.basic.setting.module.roof.material": "屋根材",
@ -97,7 +97,7 @@
"modal.module.basic.setting.module.rafter.margin": "垂木の間隔", "modal.module.basic.setting.module.rafter.margin": "垂木の間隔",
"modal.module.basic.setting.module.construction.method": "工法", "modal.module.basic.setting.module.construction.method": "工法",
"modal.module.basic.setting.module.under.roof": "屋根下地", "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.area": "モジュール配置領域",
"modal.module.basic.setting.module.placement.margin": "モジュール間の間隙", "modal.module.basic.setting.module.placement.margin": "モジュール間の間隙",
"modal.module.basic.setting.module.placement.area.eaves": "軒側", "modal.module.basic.setting.module.placement.area.eaves": "軒側",