Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/skeleton-dev

src/components/common/input/CalcInput.jsx

@@ -3,7 +3,7 @@ import { createCalculator } from '@/util/calc-utils'
 import '@/styles/calc.scss'
 
 export const CalculatorInput = forwardRef(
-  ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder, name='', disabled = false, maxLength = 6 }, ref) => {
+  ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder, name='', disabled = false, maxLength = 12 }, ref) => {
     const [showKeypad, setShowKeypad] = useState(false)
     const [displayValue, setDisplayValue] = useState(value || '0')
     const [hasOperation, setHasOperation] = useState(false)

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

@@ -634,7 +634,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">
@@ -659,7 +659,7 @@ export default function StepUp(props) {
                                   <td
                                     className="al-r"
                                     onClick={() => {
-                                      handleRowClick(idx, serQtyIdx)
+                                      handleRowClick(idx, serQtyIdx, item.paralQty)
                                     }}
                                   >
                                     {item.serQty}
@@ -681,7 +681,14 @@ export default function StepUp(props) {
                                             0
                                           </option>
                                         )}
-                                        {Array.from({ length: item.paralQty }, (_, i) => i + 1).map((num) => (
+                                        {Array.from(
+                                          {
+                                            length: originPcsVoltageStepUpList[index]
+                                              ? originPcsVoltageStepUpList[index]?.pcsItemList[idx].serQtyList[serQtyIdx].paralQty
+                                              : item.paralQty,
+                                          },
+                                          (_, i) => i + 1,
+                                        ).map((num) => (
                                           <option key={num} value={num}>
                                             {num}
                                           </option>

src/hooks/roofcover/useRoofAllocationSetting.js

@@ -316,12 +316,13 @@ export function useRoofAllocationSetting(id) {
       addPopup(popupId, 1, <ActualSizeSetting id={popupId} />)
     } else {
       apply()
-      //기존 지붕 선은 남겨둔다.
-      drawOriginRoofLine()
+
       resetPoints()
 
       basicSettingSave()
     }
+    //기존 지붕 선은 남겨둔다.
+    drawOriginRoofLine()
   }
 
   const drawOriginRoofLine = () => {

src/hooks/useCirCuitTrestle.js

@@ -91,6 +91,7 @@ export function useCircuitTrestle(executeEffect = false) {
       return {
         itemId: m.itemId,
         mixMatlNo: m.mixMatlNo,
+        northModuleYn: m.northModuleYn,
       }
     })
   }