diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
index 87ad753c..a4e9959f 100644
--- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
+++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
@@ -342,82 +342,6 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
-
- | {getMessage('modal.placement.initial.setting.roof.angle.setting')} |
-
-
- {currentRoof &&
- roofAngleSetArray.map((item, index) => (
-
-
-
- setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
- />
-
-
-
-
- {/* {
- const v = normalizeDecimal(e.target.value)
- e.target.value = v
- if (index === 0) {
- const num = v === '' ? '' : Number(v)
- setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : num, angle: num === '' ? '' : getDegreeByChon(num) })
- } else {
- const num = v === '' ? '' : Number(v)
- setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : getChonByDegree(num), angle: num === '' ? '' : num })
- }
- }}
- /> */}
- {
- if (index === 0) {
- const pitch = value === '' ? '' : Number(value)
- const angle = pitch === '' ? '' : getDegreeByChon(pitch)
- setCurrentRoof((prev) => ({
- ...prev,
- pitch,
- angle,
- }))
- } else {
- const angle = value === '' ? '' : Number(value)
- const pitch = angle === '' ? '' : getChonByDegree(angle)
- setCurrentRoof((prev) => ({
- ...prev,
- pitch,
- angle,
- }))
- }
- }}
- options={{
- allowNegative: false,
- allowDecimal: true,
- }}
- />
-
- {index === 0 ? '寸' : '度'}
-
- ))}
-
- |
-
|
@@ -600,6 +524,82 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
)} */}
|
+
+ | {getMessage('modal.placement.initial.setting.roof.angle.setting')} |
+
+
+ {currentRoof &&
+ roofAngleSetArray.map((item, index) => (
+
+
+
+ setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
+ />
+
+
+
+
+ {/* {
+ const v = normalizeDecimal(e.target.value)
+ e.target.value = v
+ if (index === 0) {
+ const num = v === '' ? '' : Number(v)
+ setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : num, angle: num === '' ? '' : getDegreeByChon(num) })
+ } else {
+ const num = v === '' ? '' : Number(v)
+ setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : getChonByDegree(num), angle: num === '' ? '' : num })
+ }
+ }}
+ /> */}
+ {
+ if (index === 0) {
+ const pitch = value === '' ? '' : Number(value)
+ const angle = pitch === '' ? '' : getDegreeByChon(pitch)
+ setCurrentRoof((prev) => ({
+ ...prev,
+ pitch,
+ angle,
+ }))
+ } else {
+ const angle = value === '' ? '' : Number(value)
+ const pitch = angle === '' ? '' : getChonByDegree(angle)
+ setCurrentRoof((prev) => ({
+ ...prev,
+ pitch,
+ angle,
+ }))
+ }
+ }}
+ options={{
+ allowNegative: false,
+ allowDecimal: true,
+ }}
+ />
+
+ {index === 0 ? '寸' : '度'}
+
+ ))}
+
+ |
+