diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx
index 67e2faa1..58cf29b5 100644
--- a/src/components/floor-plan/modal/basic/BasicSetting.jsx
+++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx
@@ -84,10 +84,6 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
setIsManualModuleSetup(!isManualModuleSetup)
}
- useEffect(() => {
- manualModuleSetup()
- }, [isManualModuleSetup])
-
const updateObjectDataApi = async (params) => {
const res = await updateObjectDate(params)
}
diff --git a/src/components/floor-plan/modal/basic/step/Module.jsx b/src/components/floor-plan/modal/basic/step/Module.jsx
index 4823ab6e..347e4c69 100644
--- a/src/components/floor-plan/modal/basic/step/Module.jsx
+++ b/src/components/floor-plan/modal/basic/step/Module.jsx
@@ -189,7 +189,7 @@ export default function Module({ setTabNum }) {
onChange={(e) => setInputInstallHeight(e.target.value)}
/>
- mm
+ m
@@ -226,7 +226,7 @@ export default function Module({ setTabNum }) {
onChange={(e) => setInputVerticalSnowCover(e.target.value)}
/>
- mm
+ cm
diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js
index 67a5e467..bf4d4a86 100644
--- a/src/hooks/module/useModuleBasicSetting.js
+++ b/src/hooks/module/useModuleBasicSetting.js
@@ -324,6 +324,18 @@ export function useModuleBasicSetting(tabNum) {
})
}
+ useEffect(() => {
+ console.log('리코일 바뀌냐??')
+ console.log('isManualModuleSetup', isManualModuleSetup)
+ console.log('saleStoreNorthFlg', saleStoreNorthFlg)
+
+ if (moduleSelectionData.common.saleStoreNorthFlg === '1') {
+ setSaleStoreNorthFlg(true)
+ }
+
+ manualModuleSetup()
+ }, [isManualModuleSetup])
+
/**
* trestle에서 영역을 가져와 mouse:move 이벤트로 해당 영역에 진입했을때 booleanPointInPolygon 로 진입여부를 확인
* 확인 후 셀을 이동시킴
@@ -364,7 +376,7 @@ export function useModuleBasicSetting(tabNum) {
lockRotation: true, // 회전 잠금
lockScalingX: true, // X 축 크기 조정 잠금
lockScalingY: true, // Y 축 크기 조정 잠금
- name: 'module',
+ name: POLYGON_TYPE.MODULE,
}
if (moduleSetupSurfaces.length !== 0) {
@@ -429,6 +441,10 @@ export function useModuleBasicSetting(tabNum) {
parentId: moduleSetupSurfaces[i].parentId,
})
+ console.log('trestlePolygon', trestlePolygon)
+ console.log('saleStoreNorthFlg', saleStoreNorthFlg)
+ console.log('trestlePolygon.isNorth', trestlePolygon.isNorth)
+
//북면이고 북면설치상점이 아니면 그냥 return
if (trestlePolygon.isNorth && !saleStoreNorthFlg) {
return
@@ -646,13 +662,15 @@ export function useModuleBasicSetting(tabNum) {
})
}
} else {
- //수동모드 해제시 모듈 설치면 선택 잠금
- moduleSetupSurfaces.forEach((obj) => {
- obj.set({
- selectable: true,
- evented: true,
+ if (moduleSetupSurfaces) {
+ //수동모드 해제시 모듈 설치면 선택 잠금
+ moduleSetupSurfaces.forEach((obj) => {
+ obj.set({
+ selectable: true,
+ evented: true,
+ })
})
- })
+ }
removeMouseEvent('mouse:up')
removeMouseEvent('mouse:move')
@@ -1693,7 +1711,7 @@ export function useModuleBasicSetting(tabNum) {
lockScalingY: true, // Y 축 크기 조정 잠금
parentId: moduleSetupSurface.parentId,
surfaceId: moduleSetupSurface.id,
- name: 'module',
+ name: POLYGON_TYPE.MODULE,
}
if (moduleSetupSurfaces.length !== 0) {
@@ -2102,7 +2120,7 @@ export function useModuleBasicSetting(tabNum) {
lockScalingY: true, // Y 축 크기 조정 잠금
parentId: moduleSetupSurface.parentId,
surfaceId: moduleSetupSurface.id,
- name: 'module',
+ name: POLYGON_TYPE.MODULE,
}
let leftMargin, bottomMargin, square
diff --git a/src/hooks/module/useModuleSelection.js b/src/hooks/module/useModuleSelection.js
index d0b812e5..3208a71a 100644
--- a/src/hooks/module/useModuleSelection.js
+++ b/src/hooks/module/useModuleSelection.js
@@ -89,11 +89,12 @@ export function useModuleSelection(props) {
getModuleData(roofsIds)
- //메뉴 이동시 배치면 삭제
- 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 || obj.name === POLYGON_TYPE.MODULE)
if (moduleSurfacesArray.length > 0) {
moduleSurfacesArray.forEach((moduleSurface) => {
- moduleSurface.module = []
canvas.remove(moduleSurface)
})
canvas.renderAll()
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 38723da7..47257675 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -999,5 +999,6 @@
"construction.length.difference": "屋根面工法をすべて選択してください。",
"menu.validation.canvas.roof": "パネルを配置するには、屋根面を入力する必要があります。",
"batch.object.outside.roof": "オブジェクトは屋根に設置する必要があります。",
- "batch.object.notinstall.cross": "オブジェクトは重複してインストールできません。"
+ "batch.object.notinstall.cross": "オブジェクトは重複してインストールできません。",
+ "module.not.batch.north": "북쪽에는 모듈을 배치할 수 없습니다."
}
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 5c7c17d6..7249b0f5 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -90,7 +90,7 @@
"modal.module.basic.setting.orientation.setting.info": "※시뮬레이션 계산용 방위를 지정합니다. 남쪽의 방위를 설정해주세요.",
"modal.module.basic.setting.orientation.setting.angle.passivity": "각도를 직접 입력",
"modal.module.basic.setting.module.roof.material": "지붕재",
- "modal.module.basic.setting.module.trestle.maker": "가대메이거",
+ "modal.module.basic.setting.module.trestle.maker": "가대메이커",
"modal.module.basic.setting.module.rafter.margin": "서까래 간격",
"modal.module.basic.setting.module.construction.method": "공법",
"modal.module.basic.setting.module.under.roof": "지붕밑바탕",