From b10fc27014b771104d8a5c9b2f36b1ee5e3e511f Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 19 Mar 2026 17:15:20 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB/?= =?UTF-8?q?=E6=9E=B6=E5=8F=B0=E8=A8=AD=E5=AE=9A=20-=20=EA=B3=84=EC=82=B0?= =?UTF-8?q?=EA=B8=B0=20=ED=86=A0=ED=81=B4=EB=B2=84=ED=8A=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/modal/basic/BasicSetting.jsx | 10 +++++++++- .../floor-plan/modal/basic/step/Orientation.jsx | 5 +++++ src/components/floor-plan/modal/basic/step/Trestle.jsx | 5 ++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx index ac2b3ca4..983492bf 100644 --- a/src/components/floor-plan/modal/basic/BasicSetting.jsx +++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx @@ -1,5 +1,6 @@ import { MODULE_SETUP_TYPE, POLYGON_TYPE } from '@/common/common' import WithDraggable from '@/components/common/draggable/WithDraggable' +import Image from 'next/image' import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientation' import PitchPlacement from '@/components/floor-plan/modal/basic/step/pitch/PitchPlacement' import Placement from '@/components/floor-plan/modal/basic/step/Placement' @@ -75,6 +76,8 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { const { trigger: placementTrigger } = useCanvasPopupStatusController(3) const [roofsStore, setRoofsStore] = useRecoilState(roofsState) const [isFold, setIsFold] = useState(false) + const [useCalcPad, setUseCalcPad] = useState(false) + const disableKeypad = !useCalcPad // const { initEvent } = useContext(EventContext) const { manualModuleSetup, autoModuleSetup, manualFlatroofModuleSetup, autoFlatroofModuleSetup, manualModuleLayoutSetup, restoreModuleInstArea } = @@ -235,6 +238,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { } const orientationProps = { + disableKeypad, roofs, setRoofs, tabNum, @@ -270,6 +274,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { updateObjectDataApi, } const trestleProps = { + disableKeypad, roofs, setRoofs, setRoofsStore, @@ -320,7 +325,10 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) { )} -
+
+ {/* {tabNum === 1 && } */} {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && ( <> diff --git a/src/components/floor-plan/modal/basic/step/Orientation.jsx b/src/components/floor-plan/modal/basic/step/Orientation.jsx index fe00c93b..9fb66caf 100644 --- a/src/components/floor-plan/modal/basic/step/Orientation.jsx +++ b/src/components/floor-plan/modal/basic/step/Orientation.jsx @@ -24,6 +24,7 @@ export const Orientation = forwardRef((props, ref) => { const [moduleSeriesList, setModuleSeriesList] = useState([]) const [filteredModuleList, setFilteredModuleList] = useState([]) const { + disableKeypad, roofs, setRoofs, tabNum, @@ -462,6 +463,7 @@ export const Orientation = forwardRef((props, ref) => { setInputCompasDeg(value); } }} + disableKeypad={disableKeypad} options={{ allowNegative: true, allowDecimal: false @@ -564,6 +566,7 @@ export const Orientation = forwardRef((props, ref) => { className="input-origin block" value={inputMargin} onChange={(value) => setInputMargin(value)} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false @@ -609,6 +612,7 @@ export const Orientation = forwardRef((props, ref) => { className="input-origin block" value={inputInstallHeight} onChange={(value) => handleChangeInstallHeight(value)} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false @@ -649,6 +653,7 @@ export const Orientation = forwardRef((props, ref) => { className="input-origin block" value={inputVerticalSnowCover} onChange={(value) => handleChangeVerticalSnowCover(value)} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx index 4725962d..16fca772 100644 --- a/src/components/floor-plan/modal/basic/step/Trestle.jsx +++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx @@ -14,7 +14,7 @@ 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 + const { tabNum, setTabNum, trestleTrigger, roofs, setRoofs, moduleSelectionData, setModuleSelectionData, setRoofsStore, disableKeypad } = props const { getMessage } = useMessage() // const [selectedTrestle, setSelectedTrestle] = useState() const currentAngleType = useRecoilValue(currentAngleTypeSelector) @@ -936,6 +936,7 @@ const Trestle = forwardRef((props, ref) => { className="input-origin block" value={eavesMargin ?? 0} onChange={(value) => setEavesMargin(value)} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false @@ -961,6 +962,7 @@ const Trestle = forwardRef((props, ref) => { className="input-origin block" value={ridgeMargin ?? 0} onChange={(value) => setRidgeMargin(value)} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false @@ -986,6 +988,7 @@ const Trestle = forwardRef((props, ref) => { className="input-origin block" value={kerabaMargin ?? 0} onChange={(value) => setKerabaMargin(value)} + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false