From 025b7ede7c1389d0d1e2fbd4d26d06a8a15d6727 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 19 Mar 2026 16:51:36 +0900 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9D=A2=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=20-=20=EA=B3=84=EC=82=B0=EA=B8=B0=20?= =?UTF-8?q?=ED=86=A0=ED=81=B4=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/placementShape/PlacementShapeSetting.jsx | 13 +++++++++++-- .../roofAllocation/ContextRoofAllocationSetting.jsx | 9 ++++++++- .../modal/roofAllocation/RoofAllocationSetting.jsx | 9 ++++++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx index a4e9959f..9ba4e342 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from 'react' - +import Image from 'next/image' import { useMessage } from '@/hooks/useMessage' import { usePopup } from '@/hooks/usePopup' @@ -35,6 +35,8 @@ export const ROOF_MATERIAL_LAYOUT = { export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, planNo, openPoint }) { const [showSizeGuideModal, setShowSizeGuidModal] = useState(false) const [showMaterialGuideModal, setShowMaterialGuidModal] = useState(false) + const [useCalcPad, setUseCalcPad] = useState(false) + const disableKeypad = !useCalcPad const { getMessage } = useMessage() const roofMaterials = useRecoilValue(roofMaterialsAtom) @@ -398,6 +400,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla }} readOnly={currentRoof?.widAuth === 'R'} disabled={currentRoof?.roofSizeSet === '3'} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false, //(index !== 0), @@ -433,6 +436,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla }} readOnly={currentRoof?.lenAuth === 'R'} disabled={currentRoof?.roofSizeSet === '3'} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false, //(index !== 0), @@ -490,6 +494,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla }} readOnly={currentRoof?.roofPchAuth === 'R'} disabled={currentRoof?.roofSizeSet === '3'} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false, //(index !== 0), @@ -588,6 +593,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla })) } }} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: true, @@ -603,7 +609,10 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla -
+
+ diff --git a/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx index 05b2759a..5f031e13 100644 --- a/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx +++ b/src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx @@ -1,5 +1,6 @@ import { useMessage } from '@/hooks/useMessage' import WithDraggable from '@/components/common/draggable/WithDraggable' +import Image from 'next/image' import QSelectBox from '@/components/common/select/QSelectBox' import { useRoofAllocationSetting } from '@/hooks/roofcover/useRoofAllocationSetting' import { usePopup } from '@/hooks/usePopup' @@ -38,6 +39,8 @@ export default function ContextRoofAllocationSetting(props) { handleChangePitch, } = useRoofAllocationSetting(id) + const [useCalcPad, setUseCalcPad] = useState(false) + const disableKeypad = !useCalcPad const { findCommonCode } = useCommonCode() const pitchText = useRecoilValue(pitchTextSelector) const globalLocale = useRecoilValue(globalLocaleStore) @@ -223,6 +226,7 @@ export default function ContextRoofAllocationSetting(props) { onChange={(value) => { handleChangePitch(value, index) }} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: true //(index !== 0), @@ -238,7 +242,10 @@ export default function ContextRoofAllocationSetting(props) { })}
-
+
+ diff --git a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx index 79b524ef..a0e8a641 100644 --- a/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx +++ b/src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx @@ -1,5 +1,6 @@ import { useMessage } from '@/hooks/useMessage' import WithDraggable from '@/components/common/draggable/WithDraggable' +import Image from 'next/image' import QSelectBox from '@/components/common/select/QSelectBox' import { useRoofAllocationSetting } from '@/hooks/roofcover/useRoofAllocationSetting' import { usePopup } from '@/hooks/usePopup' @@ -37,6 +38,8 @@ export default function RoofAllocationSetting(props) { handleChangeInput, handleChangePitch, } = useRoofAllocationSetting(id) + const [useCalcPad, setUseCalcPad] = useState(false) + const disableKeypad = !useCalcPad const pitchText = useRecoilValue(pitchTextSelector) const { findCommonCode } = useCommonCode() const [raftCodes, setRaftCodes] = useState([]) @@ -224,6 +227,7 @@ export default function RoofAllocationSetting(props) { onChange={(value) => { handleChangePitch(value, index) }} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: true //(index !== 0), @@ -260,7 +264,10 @@ export default function RoofAllocationSetting(props) { })}
-
+
+