From bd07a4aff28d7bbc8912b462996f939960c7586b Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Sat, 8 Feb 2025 21:33:25 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=8Cfix:=20=EB=B0=B0=EC=B9=98=EB=A9=B4?= =?UTF-8?q?=20=EB=A9=94=EB=89=B4=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EC=BB=A8?= =?UTF-8?q?=ED=8E=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 32 +++++++++++++++++++++--- src/locales/ja.json | 4 ++- src/locales/ko.json | 3 ++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index ed2249b0..db248f94 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -170,11 +170,37 @@ export default function CanvasMenu(props) { setType('outline') break case 3: - setType('surface') - break - case 4: console.log('๐Ÿš€ ~ onClickNav ~ menu:', menu) console.log('๐Ÿš€ ~ onClickNav ~ menuNumber:', menuNumber) + if (menuNumber > menu.index) { + const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) + if (modules.length > 0) { + swalFire({ + text: getMessage('module.delete.confirm'), + type: 'confirm', + confirmFn: () => { + //ํ•ด๋‹น ๋ฉ”๋‰ด ์ด๋™์‹œ ๋ฐฐ์น˜๋ฉด ์‚ญ์ œ + const moduleSurfacesArray = canvas + .getObjects() + .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE || obj.name === POLYGON_TYPE.MODULE) + if (moduleSurfacesArray.length > 0) { + moduleSurfacesArray.forEach((moduleSurface) => { + canvas.remove(moduleSurface) + }) + canvas.renderAll() + } + setType('surface') + }, + denyFn: () => { + setType('surface') + }, + }) + } + } else { + setType('surface') + } + break + case 4: if (menuNumber < menu.index) { if (!checkMenuAndCanvasState()) { swalFire({ text: getMessage('menu.validation.canvas.roof') }) diff --git a/src/locales/ja.json b/src/locales/ja.json index f459b5ee..adc8708b 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1010,5 +1010,7 @@ "batch.object.outside.roof": "ใ‚ชใƒ–ใ‚ธใ‚งใ‚ฏใƒˆใฏๅฑ‹ๆ นใซ่จญ็ฝฎใ™ใ‚‹ๅฟ…่ฆใŒใ‚ใ‚Šใพใ™ใ€‚", "batch.object.notinstall.cross": "ใ‚ชใƒ–ใ‚ธใ‚งใ‚ฏใƒˆใฏ้‡่ค‡ใ—ใฆใ‚คใƒณใ‚นใƒˆใƒผใƒซใงใใพใ›ใ‚“ใ€‚", "module.not.batch.north": "๋ถ์ชฝ์—๋Š” ๋ชจ๋“ˆ์„ ๋ฐฐ์น˜ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.", - "max.select": "์ตœ๋Œ€ {0}๊ฐœ๊นŒ์ง€ ์„ ํƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.(JA)" + "module.trestleDetail.not.exist": "๊ฐ€๋Œ€ ์ƒ์„ธ ์ •๋ณด๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค.", + "max.select": "์ตœ๋Œ€ {0}๊ฐœ๊นŒ์ง€ ์„ ํƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.(JA)", + "module.delete.confirm": "ใƒ‘ใƒใƒซใ‚’ๅ‰Š้™คใ—ใฆ้ขๅ…ฅๅŠ›ใซๆˆปใ‚Šใพใ™ใ€‚ๆญฃใ—ใ„ใงใ™ใ‹๏ผŸ\nใฏใ„๏ผฝใ‚’้ธๆŠžใ™ใ‚‹ใจๅ‰Š้™คใ—ใ€้ขๅ…ฅๅŠ›ใซๆˆปใ‚Šใพใ™ใ€‚\nใ„ใ„ใˆใ€ใ‚’้ธๆŠžใ™ใ‚‹ใจใ€ๅ‰Š้™คใ›ใšใซ็พๅœจใฎ็Šถๆ…‹ใ‚’็ถญๆŒใ—ใพใ™ใ€‚" } diff --git a/src/locales/ko.json b/src/locales/ko.json index 021b75e9..15e6e363 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1012,5 +1012,6 @@ "batch.object.notinstall.cross": "์˜ค๋ธŒ์ ํŠธ๋Š” ๊ฒน์ณ์„œ ์„ค์น˜ ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.", "module.not.batch.north": "๋ถ์ชฝ์—๋Š” ๋ชจ๋“ˆ์„ ๋ฐฐ์น˜ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.", "module.trestleDetail.not.exist": "๊ฐ€๋Œ€ ์ƒ์„ธ ์ •๋ณด๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค.", - "max.select": "์ตœ๋Œ€ {0}๊ฐœ๊นŒ์ง€ ์„ ํƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค." + "max.select": "์ตœ๋Œ€ {0}๊ฐœ๊นŒ์ง€ ์„ ํƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.", + "module.delete.confirm": "ํŒจ๋„์„ ์‚ญ์ œํ•˜๊ณ  ๋ฉด์ž…๋ ฅ์œผ๋กœ ๋Œ์•„๊ฐ‘๋‹ˆ๋‹ค. ๋งž์Šต๋‹ˆ๊นŒ?\n[์˜ˆ]๋ฅผ ์„ ํƒํ•˜๋ฉด ์‚ญ์ œํ•˜๊ณ , ๋ฉด ์ž…๋ ฅ์œผ๋กœ ๋Œ์•„๊ฐ‘๋‹ˆ๋‹ค.\n[์•„๋‹ˆ์˜ค]๋ฅผ ์„ ํƒํ•˜๋ฉด ์‚ญ์ œํ•˜์ง€ ์•Š๊ณ  ํ˜„์žฌ ์ƒํƒœ๋ฅผ ์œ ์ง€ํ•ฉ๋‹ˆ๋‹ค." }