Merge pull request 'dev' (#560) from dev into dev-deploy

Reviewed-on: #560

src/components/common/input/CalcInput.jsx

@@ -340,13 +340,19 @@ export const CalculatorInput = forwardRef(
 
       // Tab 키는 계산기 숨기고 기본 동작 허용
       if (e.key === 'Tab') {
+        if (hasOperation) {
+          handleCompute(true) // 계산 수행
+        }
         setShowKeypad(false)
         return
       }
 
       // 모든 방향키는 기본 동작 허용
       if (e.key === 'ArrowLeft' || e.key === 'ArrowRight' || e.key === 'ArrowUp' || e.key === 'ArrowDown') {
-        setShowKeypad(true)
+        if (hasOperation) {
+          handleCompute(true) // 계산 수행
+        }
+        setShowKeypad(false)
         return
       }
 
@@ -360,6 +366,12 @@ export const CalculatorInput = forwardRef(
         return
       }
 
+      // --- 여기서부터는 브라우저의 기본 입력을 막고 계산기 로직만 적용함 ---
+      if (e.key !== 'Process') { // 한글 입력 등 특수 상황 방지 (필요시)
+        // e.preventDefault() 호출 위치를 확인하세요.
+      }
+
+
       e.preventDefault()
       const calculator = calculatorRef.current
       const { allowDecimal } = options

src/components/fabric/QLine.js

@@ -72,13 +72,17 @@ export const QLine = fabric.util.createClass(fabric.Line, {
 
   setLength() {
     // Ensure all required properties are valid numbers
-    const { x1, y1, x2, y2 } = this;
+    const { x1, y1, x2, y2 } = this
     if (isNaN(x1) || isNaN(y1) || isNaN(x2) || isNaN(y2)) {
-      logger.error('Invalid coordinates in QLine:', { x1, y1, x2, y2 });
+      logger.error('Invalid coordinates in QLine:', { x1, y1, x2, y2 })
-      this.length = 0;
+      this.length = 0
-      return;
+      return
     }
-    this.length = calcLinePlaneSize({ x1, y1, x2, y2 }) / 10;
+    this.length = calcLinePlaneSize({ x1, y1, x2, y2 }) / 10
+  },
+
+  setLengthByValue(length) {
+    this.length = length / 10
   },
 
   addLengthText() {

src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx

@@ -123,10 +123,14 @@ export default function PassivityCircuitAllocation(props) {
     }
 
     // targetModule중 북면 설치 여부가 Y인 것과 N인 것이 혼합이면 안됨.
-    const targetModuleGroup = [...new Set(canvas
+    const targetModuleGroup = [
-      .getObjects()
+      ...new Set(
-      .filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id))
+        canvas
-      .map((obj) => obj.moduleInfo.northModuleYn))]
+          .getObjects()
+          .filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id))
+          .map((obj) => obj.moduleInfo.northModuleYn),
+      ),
+    ]
 
     if (targetModuleGroup.length > 1) {
       swalFire({
@@ -142,16 +146,12 @@ export default function PassivityCircuitAllocation(props) {
         const originHaveThisPcsModules = canvas
           .getObjects()
           .filter((obj) => obj.name === POLYGON_TYPE.MODULE && obj.pcs && obj.pcs.id === selectedPcs.id)
-        // 이미 해당 pcs로 설치된 모듈의 surface의 방향을 구한다.
+        // 1. 북면모듈, 북면외모듈 혼합 여부 체크
-        const originSurfaceList = canvas
+        const targetModuleInfos = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id))
-          .getObjects()
+        debugger
-          .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE && originHaveThisPcsModules.map((obj) => obj.surfaceId).includes(obj.id))
+        const newTargetModuleGroup = [...new Set(targetModuleInfos.concat(originHaveThisPcsModules).map((obj) => obj.moduleInfo.northModuleYn))]
 
-        originSurfaceList.concat(originSurfaceList).forEach((surface) => {
+        if (newTargetModuleGroup.length > 1) {
-          surfaceType[`${surface.direction}-${surface.roofMaterial.pitch}`] = surface
-        })
-
-        if (Object.keys(surfaceType).length > 1) {
           swalFire({
             text: getMessage('module.circuit.fix.not.same.roof.error'),
             type: 'alert',
@@ -234,7 +234,6 @@ export default function PassivityCircuitAllocation(props) {
         setSelectedPcs(tempSelectedPcs)
         canvas.add(moduleCircuitText)
       })
-    
 
     const roofSurfaceList = canvas
       .getObjects()

src/components/floor-plan/modal/lineTypes/DoublePitch.jsx

@@ -26,17 +26,15 @@ export default function DoublePitch({ props }) {
     arrow2Ref,
   } = props
 
-  const getLength2 = () => {
+  const getLength2 = (angle1, angle2, length1) => {
-    const angle1Value = angle1Ref.current.value
+    const angle1Value = angle1 !== undefined ? angle1 : angle1Ref.current?.value
-    const angle2Value = angle2Ref.current.value
+    const angle2Value = angle2 !== undefined ? angle2 : angle2Ref.current?.value
-    const length1Value = length1Ref.current.value
+    const length1Value = length1 !== undefined ? length1 : length1Ref.current?.value
 
     const arrow1Value = arrow1Ref.current
-    const arrow2Value = arrow2Ref.current
 
-    if (angle1Value !== 0 && length1Value !== 0 && angle2Value !== 0 && arrow1Value !== '') {
+    if (!isNaN(Number(angle1Value)) && !isNaN(Number(length1Value)) && !isNaN(Number(angle2Value)) && arrow1Value) {
       const radian1 = (getDegreeByChon(angle1Value) * Math.PI) / 180
-
       const radian2 = (getDegreeByChon(angle2Value) * Math.PI) / 180
       return Math.floor((Math.tan(radian1) * length1Value) / Math.tan(radian2))
     }
@@ -178,7 +176,7 @@ export default function DoublePitch({ props }) {
                 ref={angle2Ref}
                 onChange={(value) => {
                   setAngle2(value)
-                  setLength2(getLength2())
+                  setLength2(getLength2(angle1Ref.current?.value, value, length1Ref.current?.value))
                 }}
                 placeholder="45"
                 onFocus={() => (angle2Ref.current.value = '')}

src/hooks/useLine.js

@@ -10,7 +10,7 @@ import {
 } from '@/store/canvasAtom'
 import { QLine } from '@/components/fabric/QLine'
 import { basicSettingState } from '@/store/settingAtom'
-import { calcLineActualSize } from '@/util/qpolygon-utils'
+import { calcLineActualSizeByLineLength } from '@/util/qpolygon-utils'
 import { getDegreeByChon } from '@/util/canvas-util'
 import { useText } from '@/hooks/useText'
 import { fontSelector } from '@/store/fontAtom'
@@ -181,7 +181,7 @@ export const useLine = () => {
         if (isVertical) {
           line.attributes = {
             ...line.attributes,
-            actualSize: calcLineActualSize(line, getDegreeByChon(pitch)),
+            actualSize: calcLineActualSizeByLineLength(lineLength, getDegreeByChon(pitch)),
           }
         } else if (isDiagonal) {
           const yLength = Math.abs(y2 - y1) * 10
@@ -195,7 +195,7 @@ export const useLine = () => {
         if (isHorizontal) {
           line.attributes = {
             ...line.attributes,
-            actualSize: calcLineActualSize(line, getDegreeByChon(pitch)),
+            actualSize: calcLineActualSizeByLineLength(lineLength, getDegreeByChon(pitch)),
           }
         } else if (isDiagonal) {
           const xLength = Math.abs(x2 - x1) * 10

src/hooks/usePolygon.js

@@ -1,7 +1,19 @@
-import { ANGLE_TYPE, canvasState, currentAngleTypeSelector, globalPitchState, pitchTextSelector } from '@/store/canvasAtom'
+import {
+  ANGLE_TYPE,
+  canvasState,
+  currentAngleTypeSelector,
+  globalPitchState,
+  pitchTextSelector,
+} from '@/store/canvasAtom'
 import { useRecoilValue } from 'recoil'
 import { fabric } from 'fabric'
-import { calculateIntersection, findAndRemoveClosestPoint, getDegreeByChon, getDegreeInOrientation, isPointOnLine } from '@/util/canvas-util'
+import {
+  calculateIntersection,
+  findAndRemoveClosestPoint,
+  getDegreeByChon,
+  getDegreeInOrientation,
+  isPointOnLine,
+} from '@/util/canvas-util'
 import { QPolygon } from '@/components/fabric/QPolygon'
 import { isSamePoint, removeDuplicatePolygons } from '@/util/qpolygon-utils'
 import { basicSettingState, flowDisplaySelector } from '@/store/settingAtom'
@@ -1958,6 +1970,38 @@ export const usePolygon = () => {
     canvas.renderAll()
   }
 
+  /**
+   * 폴리곤의 라인 길이가 10 이하로 차이나는 경우 작은 값으로 통일
+   * @param polygon
+   */
+  const unifyLineLengths = (polygon) => {
+    if (!polygon.lines || polygon.lines.length === 0) {
+      return
+    }
+
+    const lines = polygon.lines
+
+    for (let i = 0; i < lines.length; i++) {
+      for (let j = i + 1; j < lines.length; j++) {
+        const length1 = lines[i].getLength()
+        const length2 = lines[j].getLength()
+        const diff = Math.abs(length1 - length2)
+
+        if (diff > 0 && diff <= 10) {
+          const minLength = Math.min(length1, length2)
+          if (length1 > length2) {
+            lines[i].setLengthByValue(minLength)
+          } else {
+            lines[j].setLengthByValue(minLength)
+          }
+        }
+      }
+    }
+
+    addLengthText(polygon)
+    canvas.renderAll()
+  }
+
   /**
    * 폴리곤의 라인 속성을 복도치수, 실제치수에 따라 actualSize 설정
    * @param polygon
@@ -1966,7 +2010,7 @@ export const usePolygon = () => {
     if (!polygon.lines || polygon.lines.length === 0 || !polygon.roofMaterial) {
       return
     }
-
+    unifyLineLengths(polygon)
     polygon.lines.forEach((line) => {
       setActualSize(line, polygon.direction, +polygon.roofMaterial?.pitch)
     })
@@ -1983,5 +2027,6 @@ export const usePolygon = () => {
     splitPolygonWithLines,
     splitPolygonWithSeparate,
     setPolygonLinesActualSize,
+    unifyLineLengths,
   }
 }

src/util/canvas-util.js

@@ -80,7 +80,7 @@ export const getCenterPoint = (point1, point2) => {
  * @returns
  */
 export const getDistance = (x1, y1, x2, y2) => {
-  return Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2)).toFixed(0)
+  return Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2)).toFixed(1)
 }
 
 // polygon의 각 변에 해당 점과 점 사이의 거리를 나타내는 IText를 추가하는 함수

src/util/qpolygon-utils.js

@@ -5992,6 +5992,17 @@ export const calcLineActualSize = (points, degree = 0) => {
   return Big(planeSize).div(theta).round().toNumber()
 }
 
+/**
+ * 포인트와 기울기를 기준으로 선의 길이를 구한다.
+ * @param lineLength
+ * @param degree
+ * @returns number
+ */
+export const calcLineActualSizeByLineLength = (lineLength, degree = 0) => {
+  const theta = Big(Math.cos(Big(degree).times(Math.PI).div(180)))
+  return Big(lineLength).div(theta).round().toNumber()
+}
+
 export const createLinesFromPolygon = (points) => {
   const lines = []
   for (let i = 0; i < points.length; i++) {