From 1d4d1ab381b5ce61c1f29dc24b17ce926edbf8d0 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 13 Mar 2026 16:44:05 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=82=B0=EA=B8=B0=20=ED=86=A0?= =?UTF-8?q?=EA=B8=80=20=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 --- public/static/images/common/Icon_OFF_Black.png | Bin 0 -> 683 bytes public/static/images/common/Icon_ON_Black.png | Bin 0 -> 723 bytes src/components/common/input/CalcInput.jsx | 4 ++-- .../floor-plan/modal/lineTypes/Angle.jsx | 4 +++- .../floor-plan/modal/lineTypes/Diagonal.jsx | 4 ++++ .../floor-plan/modal/lineTypes/DoublePitch.jsx | 4 ++++ .../floor-plan/modal/lineTypes/OuterLineWall.jsx | 3 ++- .../floor-plan/modal/lineTypes/RightAngle.jsx | 4 +++- .../modal/outerlinesetting/WallLineSetting.jsx | 12 ++++++++++++ .../placementShape/PlacementShapeDrawing.jsx | 12 ++++++++++++ .../modal/placementSurface/PlacementSurface.jsx | 3 ++- .../placementSurface/PlacementSurfaceSetting.jsx | 7 ++++++- 12 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 public/static/images/common/Icon_OFF_Black.png create mode 100644 public/static/images/common/Icon_ON_Black.png diff --git a/public/static/images/common/Icon_OFF_Black.png b/public/static/images/common/Icon_OFF_Black.png new file mode 100644 index 0000000000000000000000000000000000000000..c77f8311f7ace2f2436f43f909df4ce0fc0ed4e7 GIT binary patch literal 683 zcmV;c0#yBpP)sL5_ ziI#Ti7pOdDq!L;RW}#v1Qd02no=g&Az}*Ehj%Q{ko88Sl+55K00LP5^e13-MVzF@e znf13^9$m|_xX~9guP1IF1|+hrM7iR4LSmzoMl> zBn6k%dl;zK4p!M_uW_;k!;&Gl02DAXfPPics!0SXWBVnahaA3@>T0Ecao089r$ZQMnjCU6ebx&m2228cR@$y@~x zy1GMA`69{=jIj-IRzVDoWj*9dzf$EK!@Ap@#1w(SB*ux}D z?VRV%;{_NWuK9RVpa7o)FJX%zrF8T8{1;D?PUe@5M&o0J5EzX{T_#2UaZ0=QHApBo ztjfpeqN+`N-Jl=+0lzUmU)Lu7k488SuTpdI^lK+PIc)X)7=A}kBhGZPz5#U{HzrcK RpHKh*002ovPDHLkV1gOCB3}Ri literal 0 HcmV?d00001 diff --git a/public/static/images/common/Icon_ON_Black.png b/public/static/images/common/Icon_ON_Black.png new file mode 100644 index 0000000000000000000000000000000000000000..04c22ff77bf694981963109985b882611823b478 GIT binary patch literal 723 zcmV;^0xbQBP)1#o5S}|+KnFa*iOQ0SU1w!{TpoTyYP-9jQ(ji&D8_DY>=gk@0*7B*k+m3zGx?ktnti)4vJg7W!1g~MtF&*yU*3f1mUBMFhCzpb&i}r zGOeI|2rj+b?LKgRSbmB@_z)c6x^S3p`14CtS}YculdJj=x`&7zj@Np~ulY`uM|sL- zvlNfVNd-7yzu(`f7O<|}ZhwHht%qDBzla4Gf80}Qj)lz~-Sw8o6^6s1ol2$tvl!@O z&enZvwOapn2!Zi { + ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder, name='', disabled = false, maxLength = 12, disableKeypad = false }, ref) => { const [showKeypad, setShowKeypad] = useState(false) const [displayValue, setDisplayValue] = useState(value || '0') const [hasOperation, setHasOperation] = useState(false) @@ -478,7 +478,7 @@ export const CalculatorInput = forwardRef( maxLength={maxLength} /> - {showKeypad && !readOnly && ( + {showKeypad && !readOnly && !disableKeypad && (
{getMessage('outerLine.property.info')}
+ diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx index 8010675d..95758b8c 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeDrawing.jsx @@ -9,11 +9,13 @@ import { OUTER_LINE_TYPE } from '@/store/outerLineAtom' import OuterLineWall from '@/components/floor-plan/modal/lineTypes/OuterLineWall' import { usePlacementShapeDrawing } from '@/hooks/surface/usePlacementShapeDrawing' import { usePopup } from '@/hooks/usePopup' +import Image from 'next/image' export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { const { getMessage } = useMessage() const { closePopup } = usePopup() const [buttonAct, setButtonAct] = useState(1) + const [useCalcPad, setUseCalcPad] = useState(false) const types = [ { id: 1, name: getMessage('straight.line'), type: OUTER_LINE_TYPE.OUTER_LINE }, { id: 2, name: getMessage('right.angle'), type: OUTER_LINE_TYPE.RIGHT_ANGLE }, @@ -49,12 +51,15 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { handleFix, } = usePlacementShapeDrawing(id) + const disableKeypad = !useCalcPad + const outerLineProps = { length1, setLength1, length1Ref, arrow1, setArrow1, + disableKeypad, } const rightAngleProps = { @@ -68,6 +73,7 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { setArrow1, arrow2, setArrow2, + disableKeypad, } const doublePitchProps = { @@ -89,6 +95,7 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { setArrow2, arrow1Ref, arrow2Ref, + disableKeypad, } const angleProps = { @@ -98,6 +105,7 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { length1, setLength1, length1Ref, + disableKeypad, } const diagonalLineProps = { @@ -114,6 +122,7 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) { setArrow1, arrow2, setArrow2, + disableKeypad, } const onClickButton = (button) => { @@ -140,6 +149,9 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) {
+ diff --git a/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx b/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx index 4ede1367..1a7df9d8 100644 --- a/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx +++ b/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx @@ -5,7 +5,7 @@ import { CalculatorInput } from '@/components/common/input/CalcInput' const PlacementSurface = forwardRef((props, refs) => { const { getMessage } = useMessage() - const { id, lines, info, rotate, xInversion, yInversion } = props + const { id, lines, info, rotate, xInversion, yInversion, disableKeypad } = props let { length1, length2, length3, length4, length5, lengthetc, azimuth } = refs const [azimuthDirection, setAzimuthDirection] = useState(azimuth.current) @@ -114,6 +114,7 @@ const PlacementSurface = forwardRef((props, refs) => { ? length4 : length5 } + disableKeypad={disableKeypad} options={{ allowNegative: false, allowDecimal: false diff --git a/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx b/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx index ae29b778..47a73ab7 100644 --- a/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx +++ b/src/components/floor-plan/modal/placementSurface/PlacementSurfaceSetting.jsx @@ -19,6 +19,7 @@ export default function PlacementSurfaceSetting({ id, pos = { x: 50, y: 230 } }) const canvas = useRecoilValue(canvasState) const { closePopup } = usePopup() const [isHidden, setIsHidden] = useState(false) + const [useCalcPad, setUseCalcPad] = useState(false) const { applySurfaceShape } = useSurfaceShapeBatch({ isHidden, setIsHidden }) @@ -217,6 +218,7 @@ export default function PlacementSurfaceSetting({ id, pos = { x: 50, y: 230 } }) rotate, xInversion, yInversion, + disableKeypad: !useCalcPad, } const getInversionState = () => { @@ -291,7 +293,10 @@ export default function PlacementSurfaceSetting({ id, pos = { x: 50, y: 230 } })
-
+
+