src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx

@@ -1,10 +1,13 @@
+import { GlobalDataContext } from '@/app/GlobalDataProvider'
 import QSelectBox from '@/components/common/select/QSelectBox'
 import { useMessage } from '@/hooks/useMessage'
 import { canvasState } from '@/store/canvasAtom'
-import { pcsCheckState } from '@/store/circuitTrestleAtom'
+import { modelState, pcsCheckState } from '@/store/circuitTrestleAtom'
 import { selectedModuleState } from '@/store/selectedModuleOptions'
-import { useEffect, useState } from 'react'
+import { useContext, useEffect, useState } from 'react'
 import { useRecoilState, useRecoilValue } from 'recoil'
+import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
+import { canvasPopupStatusStore } from '@/store/canvasPopupStatusAtom'
 import { useMasterController } from '@/hooks/common/useMasterController'
 import { v4 as uuidv4 } from 'uuid'
 import { globalLocaleStore } from '@/store/localeAtom'
@@ -12,6 +15,7 @@ import { POLYGON_TYPE } from '@/common/common'
 import { useSwal } from '@/hooks/useSwal'
 import { circuitNumDisplaySelector } from '@/store/settingAtom'
 import { fontSelector } from '@/store/fontAtom'
+import { PCS_MKR_MULTI_TYPE } from './PowerConditionalSelect'
 
 export default function StepUp(props) {
   const {
@@ -38,7 +42,6 @@ export default function StepUp(props) {
   const [arrayLength, setArrayLength] = useState(3) //module-table-inner의 반복 개수
   const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState)
   const { getPcsVoltageStepUpList, getPcsAutoRecommendList, getPcsVoltageChk, getPcsConnOptionItemList } = useMasterController()
-  const [originPcsVoltageStepUpList, setOriginPcsVoltageStepUpList] = useState([])
   const canvas = useRecoilValue(canvasState)
   const selectedModules = useRecoilValue(selectedModuleState)
   const [optCodes, setOptCodes] = useState([])
@@ -97,9 +100,6 @@ export default function StepUp(props) {
 
           /** PCS 승압설정 정보 SET */
           setStepUpListData(stepUpListData)
-          if (originPcsVoltageStepUpList.length === 0) {
-            setOriginPcsVoltageStepUpList(stepUpListData)
-          }
 
           /** PCS 옵션 조회 */
           // const formattedOptCodes = formatOptionCodes(res.data.optionList)
@@ -108,7 +108,8 @@ export default function StepUp(props) {
 
           /** 캔버스에 회로 정보 적용 */
           // 병설일때 pcs 있으면 setSubOpsions, 없으면 setMainOptions
-          let mChk = 0
+          console.log('stepUpListData', stepUpListData)
+          let mChk = 0;
           stepUpListData[0].pcsItemList.forEach((pcsItem, index) => {
             const optionList = formatOptionCodes(pcsItem.optionList)
             if (isMultiOptions()) {
@@ -165,7 +166,7 @@ export default function StepUp(props) {
                     targetModule.circuitNumber = module.circuit
                     canvas.add(moduleCircuitText)
                   } else {
-                    mChk++
+                    mChk++;
                   }
                 })
               })
@@ -398,14 +399,10 @@ export default function StepUp(props) {
     }))
   }
 
-  const handleChangeApplyParalQty = (mainIdx, subIdx, applyParalQty) => {
-    handleRowClick(mainIdx, subIdx, applyParalQty)
-  }
-
   /**
    * 행 선택 핸들러 함수 추가
    */
-  const handleRowClick = (mainIdx, subIdx, applyParalQty = null) => {
+  const handleRowClick = (mainIdx, subIdx) => {
     /** 자동 승압 설정인 경우만 실행 */
     if (allocationType !== 'auto') return
 
@@ -437,13 +434,7 @@ export default function StepUp(props) {
 
           /** 선택된 serQty 찾기 */
           const selectedSerQty = matchingPcsItem?.serQtyList.find((serQty) => serQty.selected)?.serQty || 0
-          if (index === 0) {
+
-            return {
-              ...pcsItem,
-              applySerQty: selectedSerQty,
-              applyParalQty: +applyParalQty,
-            }
-          }
           return {
             ...pcsItem,
             applySerQty: selectedSerQty,
@@ -483,7 +474,7 @@ export default function StepUp(props) {
         module.pcsItemId = null
       })
 
-    /** 선택된 모듈 목록 추가 */
+      /** 선택된 모듈 목록 추가 */
     selectedData.roofSurfaceList.forEach((roofSurface) => {
       const targetSurface = canvas.getObjects().filter((obj) => obj.id === roofSurface.roofSurfaceId)[0]
       const moduleIds = targetSurface.modules.map((module) => {
@@ -532,7 +523,7 @@ export default function StepUp(props) {
 
     canvas.renderAll()
     setModuleStatisticsData()
-  }
+    }
 
   /**
    * 현재 선택된 값들을 가져오는 함수 추가
@@ -634,7 +625,7 @@ export default function StepUp(props) {
         <div className="slope-wrap">
           <div className="circuit-overflow">
             {/* 3개일때 className = by-max */}
-            {originPcsVoltageStepUpList.map((stepUp, index) => (
+            {stepUpListData.map((stepUp, index) => (
               <div key={index} className={`module-table-box ${stepUp.pcsItemList.length === 3 ? 'by-max' : ''}`}>
                 {stepUp?.pcsItemList.map((pcsItem, idx) => (
                   <div key={idx} className="module-table-inner">
@@ -654,42 +645,15 @@ export default function StepUp(props) {
                                 <tr
                                   key={`row-${serQtyIdx}`}
                                   className={`${item.selected ? 'on' : ''}`}
+                                  onClick={() => handleRowClick(idx, serQtyIdx)}
                                   style={{ cursor: allocationType === 'auto' ? 'pointer' : 'default' }}
                                 >
-                                  <td
+                                  <td className="al-r">{item.serQty}</td>
-                                    className="al-r"
-                                    onClick={() => {
-                                      handleRowClick(idx, serQtyIdx)
-                                    }}
-                                  >
-                                    {item.serQty}
-                                  </td>
                                   <td className="al-r">
                                     {/* 2025.12.04 select 추가 */}
-                                    {idx === 0 ? (
+                                    <select className="select-light dark table-select" name="" id="">
-                                      <select
+                                      <option value="">{item.paralQty}</option>
-                                        className="select-light dark table-select"
+                                    </select>
-                                        defaultValue={item.paralQty}
-                                        name=""
-                                        id=""
-                                        onChange={(e) => {
-                                          handleChangeApplyParalQty(idx, serQtyIdx, e.target.value)
-                                        }}
-                                      >
-                                        {item.paralQty === 0 && (
-                                          <option key="0" value="0">
-                                            0
-                                          </option>
-                                        )}
-                                        {Array.from({ length: item.paralQty }, (_, i) => i + 1).map((num) => (
-                                          <option key={num} value={num}>
-                                            {num}
-                                          </option>
-                                        ))}
-                                      </select>
-                                    ) : (
-                                      <>{item.paralQty}</>
-                                    )}
                                   </td>
                                   {/* <td className="al-r">{item.paralQty}</td> */}
                                 </tr>

src/hooks/module/useModuleBasicSetting.js

@@ -267,14 +267,14 @@ export function useModuleBasicSetting(tabNum) {
         //도머일때
         if (obj.name === BATCH_TYPE.TRIANGLE_DORMER || obj.name === BATCH_TYPE.PENTAGON_DORMER) {
           const groupPoints = obj.getCurrentPoints()
-          const offsetObjects = offsetPolygon(groupPoints, 30)
+          const offsetObjects = offsetPolygon(groupPoints, 10)
           const dormerOffset = new QPolygon(offsetObjects, batchObjectOptions)
           dormerOffset.setViewLengthText(false)
           canvas.add(dormerOffset) //모듈설치면 만들기
         } else {
           //개구, 그림자일때
           const points = obj.getCurrentPoints()
-          const offsetObjects = offsetPolygon(points, 30)
+          const offsetObjects = offsetPolygon(points, 10)
           const offset = new QPolygon(offsetObjects, batchObjectOptions)
           offset.setViewLengthText(false)
           canvas.add(offset) //모듈설치면 만들기

src/hooks/useCanvasEvent.js

@@ -50,10 +50,6 @@ export function useCanvasEvent() {
 
       if (target) {
         // settleDown(target)
-        // roof 이동 후 좌표 재계산
-        if (target.name === POLYGON_TYPE.ROOF && target.type === 'QPolygon') {
-          target.fire('polygonMoved')
-        }
       }
     },
     addEvent: (e) => {

src/util/skeleton-utils.js

@@ -1003,8 +1003,8 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => {
                   if (isStartEnd.start) {
                     //x1 inside
                     const moveDist = Big(wallLine.x1).minus(wallBaseLine.x1).abs().toNumber()
-                    const aStartY = Big(roofLine.y1).plus(moveDist).toNumber()
+                    const aStartY = Big(roofLine.y1).plus(moveDist).abs().toNumber()
-                    const bStartY = Big(wallLine.y1).plus(moveDist).toNumber()
+                    const bStartY = Big(wallLine.y1).plus(moveDist).abs().toNumber()
                     const inLine = findLineContainingPoint(innerLines, { y: aStartY, x: roofLine.x1 })
                     console.log('startLines:::::::', inLine)
                     const eLineY = Big(bStartY).minus(wallLine.y1).abs().toNumber()