qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
yoosangwook 2025-02-24 10:53:51 +09:00
commit 40b266af4f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/floor-plan/CanvasMenu.jsx
View File

@ -177,7 +177,6 @@ export default function CanvasMenu(props) {
case 3: case 3:
if (menuNumber > menu.index) { if (menuNumber > menu.index) {
const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE)
const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
if (modules.length > 0) { if (modules.length > 0) {
swalFire({ swalFire({
@ -185,7 +184,7 @@ export default function CanvasMenu(props) {
type: 'confirm', type: 'confirm',
confirmFn: () => { confirmFn: () => {
//해당 메뉴 이동시 배치면 삭제 //해당 메뉴 이동시 배치면 삭제
const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
roofs.forEach((roof) => { roofs.forEach((roof) => {
roof.set({ selectable: true }) roof.set({ selectable: true })
setSurfaceShapePattern(roof, null, false, roof.roofMaterial) setSurfaceShapePattern(roof, null, false, roof.roofMaterial)
@ -315,6 +314,13 @@ export default function CanvasMenu(props) {
if (menuNumber === 3) { if (menuNumber === 3) {
const moduleSurfacesArray = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) const moduleSurfacesArray = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
if (moduleSurfacesArray.length > 0) { if (moduleSurfacesArray.length > 0) {
const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
roofs.forEach((roof) => {
roof.set({ selectable: true })
setSurfaceShapePattern(roof, null, false, roof.roofMaterial)
delete roof.moduleCompass
drawDirectionArrow(roof)
})
moduleSurfacesArray.forEach((moduleSurface) => { moduleSurfacesArray.forEach((moduleSurface) => {
moduleSurface.modules = [] moduleSurface.modules = []
canvas.remove(moduleSurface) canvas.remove(moduleSurface)