src/components/common/input/CalcInput.jsx

@@ -3,7 +3,7 @@ import { createCalculator } from '@/util/calc-utils'
 import '@/styles/calc.scss'
 
 export const CalculatorInput = forwardRef(
-  ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder, name='', disabled = false }, ref) => {
+  ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder }, ref) => {
     const [showKeypad, setShowKeypad] = useState(false)
     const [displayValue, setDisplayValue] = useState(value || '0')
     const [hasOperation, setHasOperation] = useState(false)
@@ -353,7 +353,6 @@ export const CalculatorInput = forwardRef(
           ref={inputRef}
           type="text"
           id={id}
-          name={name}
           value={displayValue}
           readOnly={readOnly}
           className={className}
@@ -364,7 +363,6 @@ export const CalculatorInput = forwardRef(
           tabIndex={readOnly ? -1 : 0}
           placeholder={placeholder}
           autoComplete={'off'}
-          disabled={disabled}
         />
 
         {showKeypad && !readOnly && (

src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx

@@ -346,7 +346,6 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
                             /> */}
                             <CalculatorInput
                               id=""
-                              name=""
                               label=""
                               className="input-origin block"
                               readOnly={currentRoof?.roofAngleSet !== item.value}
@@ -413,33 +412,15 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
                       <div className="flex-ment">
                         <span>W</span>
                         <div className="input-grid" style={{ width: '84px' }}>
-                          {/*<input*/}
+                          <input
-                          {/*  type="text"*/}
+                            type="text"
-                          {/*  className="input-origin block"*/}
-                          {/*  name={`width`}*/}
-                          {/*  ref={roofRef.width}*/}
-                          {/*  value={parseInt(currentRoof?.width)}*/}
-                          {/*  onChange={(e) => changeInput(normalizeDigits(e.target.value), e)}*/}
-                          {/*  readOnly={currentRoof?.widAuth === 'R'}*/}
-                          {/*  disabled={currentRoof?.roofSizeSet === '3'}*/}
-                          {/*/>*/}
-
-                          <CalculatorInput
-                            id=""
-                            name={'width'}
-                            label=""
                             className="input-origin block"
+                            name={`width`}
                             ref={roofRef.width}
-                            value={currentRoof?.width||0}
+                            value={parseInt(currentRoof?.width)}
-                            onChange={(value) => {
+                            onChange={(e) => changeInput(normalizeDigits(e.target.value), e)}
-                              setCurrentRoof({ ...currentRoof, value })
-                            }}
                             readOnly={currentRoof?.widAuth === 'R'}
                             disabled={currentRoof?.roofSizeSet === '3'}
-                            options={{
-                              allowNegative: false,
-                              allowDecimal: false //(index !== 0),
-                            }}
                           />
                         </div>
                       </div>
@@ -448,33 +429,15 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
                       <div className="flex-ment">
                         <span>L</span>
                         <div className="input-grid" style={{ width: '84px' }}>
-                          {/*<input*/}
+                          <input
-                          {/*  type="text"*/}
+                            type="text"
-                          {/*  className="input-origin block"*/}
-                          {/*  name={`length`}*/}
-                          {/*  ref={roofRef.length}*/}
-                          {/*  value={parseInt(currentRoof?.length)}*/}
-                          {/*  onChange={(e) => changeInput(normalizeDigits(e.target.value), e)}*/}
-                          {/*  readOnly={currentRoof?.lenAuth === 'R'}*/}
-                          {/*  disabled={currentRoof?.roofSizeSet === '3'}*/}
-                          {/*/>*/}
-
-                          <CalculatorInput
-                            id=""
-                            name={'length'}
-                            label=""
                             className="input-origin block"
+                            name={`length`}
                             ref={roofRef.length}
-                            value={currentRoof?.length||0}
+                            value={parseInt(currentRoof?.length)}
-                            onChange={(value) => {
+                            onChange={(e) => changeInput(normalizeDigits(e.target.value), e)}
-                              setCurrentRoof({ ...currentRoof, value })
-                            }}
                             readOnly={currentRoof?.lenAuth === 'R'}
                             disabled={currentRoof?.roofSizeSet === '3'}
-                            options={{
-                              allowNegative: false,
-                              allowDecimal: false //(index !== 0),
-                            }}
                           />
                         </div>
                       </div>
@@ -502,34 +465,16 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
                       <div className="flex-ment">
                         <span>{getMessage('hajebichi')}</span>
                         <div className="input-grid" style={{ width: '84px' }}>
-                          {/*<input*/}
+                          <input
-                          {/*  type="text"*/}
+                            type="text"
-                          {/*  className="input-origin block"*/}
-                          {/*  name={`hajebichi`}*/}
-                          {/*  ref={roofRef.hajebichi}*/}
-                          {/*  value={parseInt(currentRoof?.hajebichi)}*/}
-                          {/*  onChange={(e) => changeInput(normalizeDigits(e.target.value), e)}*/}
-                          {/*  readOnly={currentRoof?.roofPchAuth === 'R'}*/}
-                          {/*  disabled={currentRoof?.roofSizeSet === '3'}*/}
-                          {/*/>*/}
-                          <CalculatorInput
-                            id=""
-                            name={'hajebichi'}
-                            label=""
                             className="input-origin block"
+                            name={`hajebichi`}
                             ref={roofRef.hajebichi}
-                            value={currentRoof?.hajebichi||0}
+                            value={parseInt(currentRoof?.hajebichi)}
-                            onChange={(value) => {
+                            onChange={(e) => changeInput(normalizeDigits(e.target.value), e)}
-                              setCurrentRoof({ ...currentRoof, value })
-                            }}
                             readOnly={currentRoof?.roofPchAuth === 'R'}
                             disabled={currentRoof?.roofSizeSet === '3'}
-                            options={{
-                              allowNegative: false,
-                              allowDecimal: false //(index !== 0),
-                            }}
                           />
-
                         </div>
                       </div>
                     )}