육지붕일때 moduleSelectionData 에 margin 추가

src/components/floor-plan/modal/basic/BasicSetting.jsx

@@ -1,34 +1,32 @@
-import { useMessage } from '@/hooks/useMessage'
+import { POLYGON_TYPE } from '@/common/common'
 import WithDraggable from '@/components/common/draggable/WithDraggable'
-import { useContext, useEffect, useRef, useState } from 'react'
+import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientation'
 import PitchPlacement from '@/components/floor-plan/modal/basic/step/pitch/PitchPlacement'
 import Placement from '@/components/floor-plan/modal/basic/step/Placement'
-import { useRecoilValue, useRecoilState } from 'recoil'
+import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
+import { useMasterController } from '@/hooks/common/useMasterController'
+import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
+import { useModuleSelection } from '@/hooks/module/useModuleSelection'
+import { useOrientation } from '@/hooks/module/useOrientation'
+import { useMessage } from '@/hooks/useMessage'
+import { usePopup } from '@/hooks/usePopup'
 import {
-  canvasSettingState,
   canvasState,
   checkedModuleState,
+  currentCanvasPlanState,
   isManualModuleLayoutSetupState,
   isManualModuleSetupState,
   toggleManualSetupModeState,
 } from '@/store/canvasAtom'
-import { usePopup } from '@/hooks/usePopup'
-import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientation'
-import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
-import { useEvent } from '@/hooks/useEvent'
-import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions'
-import { addedRoofsState, corridorDimensionSelector, basicSettingState } from '@/store/settingAtom'
-import { isObjectNotEmpty } from '@/util/common-utils'
-import Swal from 'sweetalert2'
-import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
-import { useMasterController } from '@/hooks/common/useMasterController'
 import { loginUserStore } from '@/store/commonAtom'
-import { currentCanvasPlanState } from '@/store/canvasAtom'
-import { POLYGON_TYPE } from '@/common/common'
-import { useModuleSelection } from '@/hooks/module/useModuleSelection'
-import { useOrientation } from '@/hooks/module/useOrientation'
-import Trestle from './step/Trestle'
 import { roofsState } from '@/store/roofAtom'
+import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
+import { addedRoofsState, basicSettingState } from '@/store/settingAtom'
+import { isObjectNotEmpty } from '@/util/common-utils'
+import { useEffect, useRef, useState } from 'react'
+import { useRecoilState, useRecoilValue } from 'recoil'
+import Swal from 'sweetalert2'
+import Trestle from './step/Trestle'
 
 export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const { getMessage } = useMessage()
@@ -49,7 +47,6 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const [roofs, setRoofs] = useState(addedRoofs)
   const [manualSetupMode, setManualSetupMode] = useRecoilState(toggleManualSetupModeState)
   const [layoutSetup, setLayoutSetup] = useState([{}])
-
   const {
     moduleSelectionInitParams,
     selectedModules,
@@ -140,6 +137,37 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
     setIsManualModuleSetup(false)
   }, [checkedModules])
 
+  useEffect(() => {
+    if (basicSetting.roofSizeSet !== '3') {
+      if (manualSetupMode.indexOf('manualSetup') > -1) {
+        manualModuleSetup()
+      } else if (manualSetupMode.indexOf('manualLayoutSetup') > -1) {
+        manualModuleLayoutSetup(layoutSetup)
+      } else if (manualSetupMode.indexOf('off') > -1) {
+        manualModuleSetup()
+        manualModuleLayoutSetup(layoutSetup)
+      }
+    } else {
+      manualFlatroofModuleSetup(placementFlatRef)
+    }
+
+    if (isClosePopup.close) {
+      closePopup(isClosePopup.id)
+    }
+  }, [manualSetupMode, isClosePopup])
+
+  useEffect(() => {
+    if (isManualModuleLayoutSetup) {
+      manualModuleLayoutSetup(layoutSetup)
+    }
+  }, [layoutSetup])
+
+  useEffect(() => {
+    setIsManualModuleSetup(false)
+    setIsManualModuleLayoutSetup(false)
+    setManualSetupMode(`off`)
+  }, [checkedModules])
+
   const handleBtnNextStep = () => {
     if (tabNum === 1) {
       orientationRef.current.handleNextStep()
@@ -260,37 +288,6 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   }
   const placementProps = {}
 
-  useEffect(() => {
-    if (basicSetting.roofSizeSet !== '3') {
-      if (manualSetupMode.indexOf('manualSetup') > -1) {
-        manualModuleSetup()
-      } else if (manualSetupMode.indexOf('manualLayoutSetup') > -1) {
-        manualModuleLayoutSetup(layoutSetup)
-      } else if (manualSetupMode.indexOf('off') > -1) {
-        manualModuleSetup()
-        manualModuleLayoutSetup(layoutSetup)
-      }
-    } else {
-      manualFlatroofModuleSetup(placementFlatRef)
-    }
-
-    if (isClosePopup.close) {
-      closePopup(isClosePopup.id)
-    }
-  }, [manualSetupMode, isClosePopup])
-
-  useEffect(() => {
-    if (isManualModuleLayoutSetup) {
-      manualModuleLayoutSetup(layoutSetup)
-    }
-  }, [layoutSetup])
-
-  useEffect(() => {
-    setIsManualModuleSetup(false)
-    setIsManualModuleLayoutSetup(false)
-    setManualSetupMode(`off`)
-  }, [checkedModules])
-
   return (
     <WithDraggable isShow={true} pos={pos} className={basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' ? 'll' : 'lx-2'}>
       <WithDraggable.Header title={getMessage('plan.menu.module.circuit.setting.default')} onClose={() => handleClosePopup(id)} />

src/components/floor-plan/modal/basic/step/Orientation.jsx

@@ -67,6 +67,12 @@ export const Orientation = forwardRef((props, ref) => {
     ],
   }
 
+  useEffect(() => {
+    if (moduleSelectionData?.common) {
+      setInputMargin(moduleSelectionData?.common?.margin)
+    }
+  }, [moduleSelectionData])
+
   useEffect(() => {
     if (selectedModules) {
       setSelectedModules(moduleList.find((module) => module.itemId === selectedModules.itemId))
@@ -92,13 +98,6 @@ export const Orientation = forwardRef((props, ref) => {
     }
   }, [managementState])
 
-  useEffect(() => {
-    if (addedRoofs) {
-      // setRoofs(addedRoofs)
-      // setAddedRoofs(roofsStore)
-    }
-  }, [addedRoofs])
-
   useImperativeHandle(ref, () => ({
     handleNextStep,
   }))
@@ -143,6 +142,7 @@ export const Orientation = forwardRef((props, ref) => {
         module: {
           ...selectedModules,
         },
+        margin: inputMargin,
       })
       updateObjectDataApi({
         objectNo: currentCanvasPlan.objectNo, //오브젝트_no

src/hooks/module/useModuleSelection.js

@@ -13,26 +13,22 @@ import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
 export function useModuleSelection(props) {
   const canvas = useRecoilValue(canvasState)
   const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
-
   const [roughnessCodes, setRoughnessCodes] = useState([]) //면조도 목록
   const [windSpeedCodes, setWindSpeedCodes] = useState([]) //기준풍속 목록
   const [moduleList, setModuleList] = useState([{}]) //모듈 목록
-
   const [selectedSurfaceType, setSelectedSurfaceType] = useState({}) //선택된 면조도
   const [installHeight, setInstallHeight] = useState(managementState?.installHeight) //설치 높이
   const [standardWindSpeed, setStandardWindSpeed] = useState() //기준풍속
   const [verticalSnowCover, setVerticalSnowCover] = useState(managementState?.verticalSnowCover) //수직적설량
-
   const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState) //선택된 모듈
+  const [margin, setMargin] = useState(100)
   const [moduleSelectionInitParams, setModuleSelectionInitParams] = useRecoilState(moduleSelectionInitParamsState) //모듈 기본 데이터 ex) 면조도, 높이등등
   const { getModuleTypeItemList } = useMasterController()
   const { findCommonCode } = useCommonCode()
   const resetStatisticsData = useResetRecoilState(moduleStatisticsState)
-
   const { restoreModuleInstArea } = useModuleBasicSetting()
 
   const bindInitData = () => {
-    console.log('bindInitData', managementState)
     setInstallHeight(managementState?.installHeight)
     setStandardWindSpeed(managementState?.standardWindSpeedId)
     setVerticalSnowCover(managementState?.verticalSnowCover)

src/locales/ja.json

@@ -604,6 +604,7 @@
   "myinfo.message.password.error": "パスワードが間違っています。",
   "login": "ログイン",
   "login.auto.page.text": "自動ログイン中です。",
+  "login.fail": "계정이 없거나 비밀번호가 잘못되었습니다.",
   "login.id.save": "ID保存",
   "login.id.placeholder": "IDを入力してください。",
   "login.password.placeholder": "パスワードを入力してください。",
@@ -1053,13 +1054,13 @@
   "roof.line.not.found": "屋根形状がありません",
   "roof.material.can.not.delete": "割り当てられた配置面があります。",
   "chidory.can.not.install": "千鳥配置できない工法です。",
-  "module.layout.setup.max.count": "모듈의 최대 단수는 {0}, 최대 열수는 {1} 입니다. (JA)",
-  "module.layout.setup.max.count.multiple": "모듈 {0}번의 최대 단수는 {1}, 최대 열수는 {2} 입니다. (JA)",
-  "roofAllocation.not.found": "할당할 지붕이 없습니다. (JA)",
-  "modal.module.basic.setting.module.placement.max.size.check": "지붕재별 모듈의 최대 단수. 혼합 최대 단수를 확인하십시오. (JA)",
-  "modal.module.basic.setting.module.placement.max.row": "최대 단수 (JA)",
-  "modal.module.basic.setting.module.placement.max.rows.multiple": "혼합 단수 (JA)",
-  "modal.module.basic.setting.module.placement.mix.asg.yn.error": "혼합 설치 불가능한 모듈입니다. (JA)",
+  "module.layout.setup.max.count": "モジュールの最大段数は{0}、最大列数は{1}です。 (JA)",
+  "module.layout.setup.max.count.multiple": "モジュール{0}の最大段数は{1}、最大列数は{2}です。 (JA)",
+  "roofAllocation.not.found": "割り当てる屋根がありません。 (JA)",
+  "modal.module.basic.setting.module.placement.max.size.check": "屋根材別モジュールの最大単数。混合最大単数を確認してください。 (JA)",
+  "modal.module.basic.setting.module.placement.max.row": "最大 単数(JA)",
+  "modal.module.basic.setting.module.placement.max.rows.multiple": "混合単数(JA)",
+  "modal.module.basic.setting.module.placement.mix.asg.yn.error": "混合インストール不可能なモジュールです。 (JA)",
   "modal.module.basic.setting.module.placement.mix.asg.yn": "ミックス. (JA)",
   "modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)"
 }