qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '[1351]경사도 기본 수치 추가 inclBase' (#479) from dev_ysCha into dev

Browse Source 
Reviewed-on: #479
This commit is contained in:
ysCha 2025-12-16 10:46:12 +09:00
commit 01a34fb8bc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
View File

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