From 7edc6752e4683c8fde6404ef60adc9ae7e6ab706 Mon Sep 17 00:00:00 2001 From: Minsiki Date: Sun, 9 Feb 2025 13:43:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?-=20=EB=8B=A8=EC=9C=84=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8(Unit=20Test)=20#679=20=EC=88=98=EC=A0=95=20-=20?= =?UTF-8?q?=EB=A7=88=ED=95=A0=EB=8B=B9=20=ED=9A=8C=EB=A1=9C=20=EC=9E=88?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=8A=B9=EC=95=95=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EB=AA=BB=EA=B0=80=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx | 3 --- src/hooks/useCirCuitTrestle.js | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 1e989963..ad929138 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -458,11 +458,8 @@ export default function CircuitTrestleSetting({ id }) { swalFire({ title: getMessage('not.allocation.exist.module'), type: 'alert', - confirmFn: () => {}, }) return - // canvas.remove(...notAllocationModules) - // canvas.renderAll() } setTabNum(2) } diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index 4cae3ab3..fd4cb180 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -61,8 +61,7 @@ export function useCircuitTrestle() { // 사용된 모듈아이템 목록 const getUseModuleItemList = () => { - console.log('🚀 ~ getUseModuleItemList ~ selectedModules:', selectedModules) - return moduleSelectionData.module?.itemList?.map((m) => { + return selectedModules?.itemList?.map((m) => { return { itemId: m.itemId, mixMatlNo: m.mixMatlNo, From 4e162582cc92250cc083642ec1c95d8f01cf393d 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: Mon, 10 Feb 2025 15:13:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?-=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useContextMenu.js | 4 ++-- src/locales/ja.json | 3 ++- src/locales/ko.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/hooks/useContextMenu.js b/src/hooks/useContextMenu.js index 184a3aea..f2e73748 100644 --- a/src/hooks/useContextMenu.js +++ b/src/hooks/useContextMenu.js @@ -243,7 +243,7 @@ export function useContextMenu() { name: getMessage('contextmenu.auxiliary.remove.all'), fn: () => { if (!currentObject) { - swalFire({ text: '지붕을 선택해주세요.' }) + swalFire({ text: getMessage('roof.is.not.selected') }) return } const innerLines = canvas.getObjects().filter((obj) => obj.id === currentObject.attributes.roofId)[0]?.innerLines @@ -405,7 +405,7 @@ export function useContextMenu() { [ { id: 'sizeEdit', - name: '사이즈 변경', + name: getMessage('contextmenu.size.edit'), component: , }, { diff --git a/src/locales/ja.json b/src/locales/ja.json index ab6d722b..a9ae072d 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1011,5 +1011,6 @@ "batch.object.notinstall.cross": "オブジェクトは重複してインストールできません。", "module.not.batch.north": "북쪽에는 모듈을 배치할 수 없습니다.", "max.select": "최대 {0}개까지 선택할 수 있습니다.(JA)", - "not.allocation.exist.module": "할당하지 않은 모듈이 있습니다.(JA)" + "not.allocation.exist.module": "할당하지 않은 모듈이 있습니다.(JA)", + "roof.is.not.selected": "지붕을 선택해주세요.(JA)" } diff --git a/src/locales/ko.json b/src/locales/ko.json index 887e9cae..dbcae2b4 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1013,5 +1013,6 @@ "module.not.batch.north": "북쪽에는 모듈을 배치할 수 없습니다.", "module.trestleDetail.not.exist": "가대 상세 정보가 없습니다.", "max.select": "최대 {0}개까지 선택할 수 있습니다.", - "not.allocation.exist.module": "할당하지 않은 모듈이 있습니다." + "not.allocation.exist.module": "할당하지 않은 모듈이 있습니다.", + "roof.is.not.selected": "지붕을 선택해주세요." }