Merge branch 'qcast-pub' into dev

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

@@ -234,9 +234,11 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
                 <tr>
                   <th>{getMessage('modal.placement.initial.setting.roof.angle.setting')}</th>
                   <td>
-                    <div className="pop-form-radio">
+                    <div className="pop-form-radio place">
                       {currentRoof &&
-                        roofAngleSetArray.map((item) => (
+                        roofAngleSetArray.map((item, index) => (
+                          <div className="outline-form">
+                            <span>
                               <div className="d-check-radio pop" key={item.id}>
                                 <input
                                   type="radio"
@@ -248,6 +250,23 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
                                 />
                                 <label htmlFor={item.id}>{getMessage(item.message)}</label>
                               </div>
+                            </span>
+                            <div className="input-grid mr5">
+                              <input
+                                type="number"
+                                className="input-origin block"
+                                defaultValue={4}
+                                readOnly={currentRoof?.roofAngleSet !== item.value}
+                                value={index === 0 ? currentRoof?.pitch : currentRoof?.angle}
+                                onChange={(e) =>
+                                  index === 0
+                                    ? setCurrentRoof({ ...currentRoof, pitch: e.target.value })
+                                    : setCurrentRoof({ ...currentRoof, angle: e.target.value })
+                                }
+                              />
+                            </div>
+                            <span className="thin">{index === 0 ? '寸' : '度'}</span>
+                          </div>
                         ))}
                     </div>
                   </td>

src/styles/_modal.scss

@@ -523,6 +523,17 @@ $alert-color: #101010;
     display: flex;
     align-items: center;
     gap: 10px;
+    &.place{
+        gap: 15px;
+        .outline-form{
+            span{
+                width: fit-content;
+            }
+            .input-grid{
+                width: 80px;
+            }
+        }
+    }
 }
 .placement-option{
     display: flex;