diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx index 5b464337..7165e867 100644 --- a/src/components/floor-plan/modal/basic/BasicSetting.jsx +++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx @@ -38,7 +38,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { const [isClosePopup, setIsClosePopup] = useState({ close: false, id: 0 }) // const { initEvent } = useContext(EventContext) - const { manualModuleSetup, autoModuleSetup, manualFlatroofModuleSetup, autoFlatroofModuleSetup } = useModuleBasicSetting(1) + const { manualModuleSetup, autoModuleSetup, manualFlatroofModuleSetup, autoFlatroofModuleSetup } = useModuleBasicSetting(tabNum) const { updateObjectDate } = useMasterController() const handleBtnNextStep = () => { if (tabNum === 1) { diff --git a/src/components/floor-plan/modal/basic/step/Module.jsx b/src/components/floor-plan/modal/basic/step/Module.jsx index 45e99dff..a574fb65 100644 --- a/src/components/floor-plan/modal/basic/step/Module.jsx +++ b/src/components/floor-plan/modal/basic/step/Module.jsx @@ -58,8 +58,8 @@ export default function Module({ setTabNum }) { useEffect(() => { if (tempModuleSelectionData.roofConstructions.length > 0) { if (tempModuleSelectionData.common.moduleItemId && isObjectNotEmpty(tempModuleSelectionData.module)) { - setModuleSelectionData(tempModuleSelectionData) //저장된 temp데이터가 지붕재(addedRoofs) 개수와 같으면 모듈 선택 저장 + setModuleSelectionData(tempModuleSelectionData) if (tempModuleSelectionData.roofConstructions.length === addedRoofs.length) { moduleSelectedDataTrigger(tempModuleSelectionData) } @@ -83,7 +83,7 @@ export default function Module({ setTabNum }) { header: [ { name: getMessage('module'), width: 150, prop: 'module', type: 'color-box' }, { - name: `${getMessage('높이')} (mm)`, + name: `${getMessage('height')} (mm)`, prop: 'height', }, { name: `${getMessage('width')} (mm)`, prop: 'width' }, diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index a1c79b5c..60c2e168 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -47,7 +47,7 @@ export default function CircuitTrestleSetting({ id }) { // 회로할당(승합설정)에서 선택된 값들을 저장할 상태 추가 const [selectedStepUpValues, setSelectedStepUpValues] = useState({}) const [getStepUpSelections, setGetStepUpSelections] = useState(null) - const { trigger: setCircuitData } = useCanvasPopupStatusController(4) + // const { trigger: setCircuitData } = useCanvasPopupStatusController(4) // const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState) const [stepUpListData, setStepUpListData] = useState([]) const [seletedOption, setSeletedOption] = useState(null) @@ -75,19 +75,19 @@ export default function CircuitTrestleSetting({ id }) { getModuleList, removeNotAllocationModules, } = useCircuitTrestle() - + // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2) useEffect(() => { if (!managementState) { setManagementState(managementStateLoaded) } - setCircuitData({ - makers, - selectedMaker, - series, - models, - selectedModels, - pcsCheck, - }) + // setCircuitData({ + // makers, + // selectedMaker, + // series, + // models, + // selectedModels, + // pcsCheck, + // }) }, []) // 수동할당 시 모듈 삭제 @@ -141,7 +141,7 @@ export default function CircuitTrestleSetting({ id }) { ...getOptYn(), useModuleItemList: getUseModuleItemList(), roofSurfaceList: getRoofSurfaceList(), - pcsItemList: getPcsItemList(), + pcsItemList: pcsItemList, } // 추천 목록 선택 setSelectedModels(pcsItemList) @@ -249,10 +249,6 @@ export default function CircuitTrestleSetting({ id }) { // 파워컨디셔너 추천 목록 조회 getPcsAutoRecommendList(params).then((res) => { if (res.data?.pcsItemList) { - const itemList = models.filter((model) => { - return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId) - }) - let pcsItemList = [] let pcsObj = {} models.forEach((model) => { @@ -356,21 +352,25 @@ export default function CircuitTrestleSetting({ id }) { // 이전 버튼 클릭 시 const onClickPrev = () => { - setAllocationType(ALLOCATION_TYPE.AUTO) + // setAllocationType(ALLOCATION_TYPE.AUTO) swalFire({ text: '할당한 회로 번호가 초기화됩니다.', type: 'alert', icon: 'warning', confirmFn: () => { - const circuitModules = canvas - .getObjects() - .filter((obj) => obj.name === 'module' && selectedModels.map((model) => model.id).includes(obj.circuit?.circuitInfo?.id)) + const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module') canvas.remove(...circuitModules.map((module) => module.circuit)) circuitModules.forEach((obj) => { obj.circuit = null obj.pcsItemId = null }) - setAllocationType(ALLOCATION_TYPE.AUTO) + + if (allocationType === ALLOCATION_TYPE.PASSIVITY) { + setAllocationType(ALLOCATION_TYPE.AUTO) + } else { + setTabNum(1) + } + canvas.renderAll() }, }) @@ -516,7 +516,7 @@ export default function CircuitTrestleSetting({ id }) { )} {tabNum === 2 && (
- {/*