From 0582dcc8663eb79bcfb833644f054eb7d223bc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
<43837214+Minsiki@users.noreply.github.com>
Date: Wed, 5 Mar 2025 15:11:23 +0900
Subject: [PATCH 1/2] =?UTF-8?q?plan=20=EC=98=AE=EA=B2=BC=EC=9D=84=20?=
=?UTF-8?q?=EB=95=8C=20module=20=EC=A1=B4=EC=9E=AC=ED=95=98=EB=A9=B4=20mod?=
=?UTF-8?q?ule=20=EB=A9=94=EB=89=B4=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/floor-plan/CanvasFrame.jsx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index 6e302fa1..7144a920 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/src/components/floor-plan/CanvasFrame.jsx
@@ -13,7 +13,7 @@ import { useContextMenu } from '@/hooks/useContextMenu'
import { useCanvasConfigInitialize } from '@/hooks/common/useCanvasConfigInitialize'
import { currentMenuState } from '@/store/canvasAtom'
import { totalDisplaySelector } from '@/store/settingAtom'
-import { MENU } from '@/common/common'
+import { MENU, POLYGON_TYPE } from '@/common/common'
import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
import { QcastContext } from '@/app/QcastProvider'
import {
@@ -27,6 +27,7 @@ import {
} from '@/store/circuitTrestleAtom'
import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
+import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
export default function CanvasFrame() {
const canvasRef = useRef(null)
@@ -47,6 +48,7 @@ export default function CanvasFrame() {
const resetPcsCheckState = useResetRecoilState(pcsCheckState)
const { handleModuleSelectionTotal } = useCanvasPopupStatusController()
const { fetchBasicSettings } = useCanvasSetting()
+ const { setSelectedMenu } = useCanvasMenu()
const loadCanvas = () => {
if (!canvas) return
@@ -58,6 +60,10 @@ export default function CanvasFrame() {
canvas?.loadFromJSON(JSON.parse(plan.canvasStatus), function () {
canvasLoadInit() //config된 상태로 캔버스 객체를 그린다
canvas?.renderAll() // 캔버스를 다시 그립니다.
+
+ if (canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE).length > 0) {
+ setSelectedMenu('module')
+ }
})
}
}
From e9a4b04c7339fd4a1d3404d6ae1fe7b896ba665e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
<43837214+Minsiki@users.noreply.github.com>
Date: Wed, 5 Mar 2025 15:11:49 +0900
Subject: [PATCH 2/2] =?UTF-8?q?'=EC=A7=80=EB=B6=95=EC=9E=AC=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80'=20=EB=AC=B8=EA=B5=AC=20=EB=B3=80=EA=B2=BD=20?=
=?UTF-8?q?=EB=B0=8F=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modal/roofAllocation/ContextRoofAllocationSetting.jsx | 2 +-
.../floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx | 2 +-
src/locales/ja.json | 1 +
src/locales/ko.json | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx
index 37fc53bc..30e56c0e 100644
--- a/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx
+++ b/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx
@@ -85,7 +85,7 @@ export default function ContextRoofAllocationSetting(props) {
}}
>
- {getMessage('modal.common.add')}
+ {getMessage('modal.roof.alloc.add.roof.material')}
diff --git a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx
index 7723b9de..3dd03385 100644
--- a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx
+++ b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx
@@ -85,7 +85,7 @@ export default function RoofAllocationSetting(props) {
}}
>
- {getMessage('modal.common.add')}
+ {getMessage('modal.roof.alloc.add.roof.material')}
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 76f16b36..64b2f0f4 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -174,6 +174,7 @@
"modal.roof.alloc.info": "※配置面初期設定で保存した[基本屋根材]を変更したり、屋根材を追加して割り当てることができます。",
"modal.roof.alloc.default.roof.material": "基本屋根材",
"modal.roof.alloc.select.roof.material": "屋根材の選択",
+ "modal.roof.alloc.add.roof.material": "지붕재 추가(JA)",
"modal.roof.alloc.select.parallel": "筋配置",
"modal.roof.alloc.select.stairs": "千鳥配置",
"modal.roof.alloc.apply": "選択した屋根材として割り当て",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 0a1119d0..9252ac19 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -174,6 +174,7 @@
"modal.roof.alloc.info": "※ 배치면 초기설정에서 저장한 [기본 지붕재]를 변경하거나 지붕재를 추가하여 할당할 수 있습니다.",
"modal.roof.alloc.default.roof.material": "기본 지붕재",
"modal.roof.alloc.select.roof.material": "지붕재 선택",
+ "modal.roof.alloc.add.roof.material": "지붕재 추가",
"modal.roof.alloc.select.parallel": "병렬식",
"modal.roof.alloc.select.stairs": "계단식",
"modal.roof.alloc.apply": "선택한 지붕재로 할당",