From f202cfd33e20297771d817a6d01e978102b1f08f Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 18 Dec 2025 16:14:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=8B=9C=EA=B3=B5:=20?= =?UTF-8?q?=EA=B3=84=EC=82=B0=EA=B8=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/basic/step/Orientation.jsx | 35 +++++++++-- .../floor-plan/modal/basic/step/Trestle.jsx | 61 +++++++++++++++---- 2 files changed, 79 insertions(+), 17 deletions(-) diff --git a/src/components/floor-plan/modal/basic/step/Orientation.jsx b/src/components/floor-plan/modal/basic/step/Orientation.jsx index 7a1fb6b1..fdf599be 100644 --- a/src/components/floor-plan/modal/basic/step/Orientation.jsx +++ b/src/components/floor-plan/modal/basic/step/Orientation.jsx @@ -437,13 +437,26 @@ export const Orientation = forwardRef((props, ref) => {
- checkDegree(e.target.value)}*/} + {/*/>*/} + checkDegree(e.target.value)} + onChange={(value) => setInputCompasDeg(value)} + options={{ + allowNegative: true, + allowDecimal: false + }} />
° @@ -534,7 +547,19 @@ export const Orientation = forwardRef((props, ref) => {
{getMessage('modal.module.basic.setting.module.placement.area')}
- setInputMargin(normalizeDecimal(e.target.value))} /> + {/* setInputMargin(normalizeDecimal(e.target.value))} />*/} + setInputMargin(value)} + options={{ + allowNegative: false, + allowDecimal: false + }} + />
m
diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx index 13f46a31..a1061a87 100644 --- a/src/components/floor-plan/modal/basic/step/Trestle.jsx +++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx @@ -10,6 +10,7 @@ import { forwardRef, useContext, useEffect, useImperativeHandle, useRef, useStat import { useRecoilState, useRecoilValue } from 'recoil' import Swal from 'sweetalert2' import { normalizeDigits } from '@/util/input-utils' +import { CalculatorInput } from '@/components/common/input/CalcInput' const Trestle = forwardRef((props, ref) => { const { tabNum, setTabNum, trestleTrigger, roofs, setRoofs, moduleSelectionData, setModuleSelectionData, setRoofsStore } = props @@ -885,12 +886,24 @@ const Trestle = forwardRef((props, ref) => {
{getMessage('modal.module.basic.setting.module.placement.area.eaves')}
- dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, eavesMargin: e.target.value } })}*/} + {/* onChange={(e) => setEavesMargin(+e.target.value)}*/} + {/*/>*/} + dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, eavesMargin: e.target.value } })} - onChange={(e) => setEavesMargin(+e.target.value)} + onChange={(value) => setEavesMargin(value)} + options={{ + allowNegative: false, + allowDecimal: false + }} />
mm @@ -898,12 +911,24 @@ const Trestle = forwardRef((props, ref) => {
{getMessage('modal.module.basic.setting.module.placement.area.ridge')}
- dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, ridgeMargin: e.target.value } })}*/} + {/* onChange={(e) => setRidgeMargin(+e.target.value)}*/} + {/*/>*/} + dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, ridgeMargin: e.target.value } })} - onChange={(e) => setRidgeMargin(+e.target.value)} + onChange={(value) => setRidgeMargin(value)} + options={{ + allowNegative: false, + allowDecimal: false + }} />
mm @@ -911,12 +936,24 @@ const Trestle = forwardRef((props, ref) => {
{getMessage('modal.module.basic.setting.module.placement.area.keraba')}
- dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, kerabaMargin: e.target.value } })}*/} + {/* onChange={(e) => setKerabaMargin(+e.target.value)}*/} + {/*/>*/} + dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, kerabaMargin: e.target.value } })} - onChange={(e) => setKerabaMargin(+e.target.value)} + onChange={(value) => setKerabaMargin(value)} + options={{ + allowNegative: false, + allowDecimal: false + }} />
mm