dev #481

Merged
ysCha merged 2 commits from dev into prd-deploy 2025-12-16 10:46:54 +09:00
Showing only changes of commit b35ae4407a - Show all commits

View File

@ -350,7 +350,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
label=""
className="input-origin block"
readOnly={currentRoof?.roofAngleSet !== item.value}
value={index === 0 ? currentRoof?.pitch || '0' : currentRoof?.angle || '0'}
value={index === 0 ? (currentRoof?.pitch ?? basicSetting?.inclBase ?? '0') : (currentRoof?.angle ?? '0')}
onChange={(value) => {
if (index === 0) {
const pitch = value === '' ? '' : Number(value);
@ -372,7 +372,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
}}
options={{
allowNegative: false,
allowDecimal: true //(index !== 0),
allowDecimal: true
}}
/>
</div>
@ -520,7 +520,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla
label=""
className="input-origin block"
ref={roofRef.hajebichi}
value={currentRoof?.hajebichi || '0'}
value={currentRoof?.hajebichi ?? basicSetting?.roofPchBase ?? '0'}
onChange={(value) => {
const hajebichi = value === '' ? '' : Number(value);
setCurrentRoof(prev => ({