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

Merge remote-tracking branch 'origin/qcast-pub' into feature/yj-layoutSetup

Browse Source
This commit is contained in:
김민식 2025-04-04 10:58:38 +09:00
commit 1cad8eaf76
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/floor-plan/modal/basic/BasicSetting.jsx
View File

@ -91,14 +91,14 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
useEffect(() => {
if (roofsStore && addedRoofs) {
console.log('🚀 ~ useEffect ~ roofsStore, addedRoofs:', roofsStore, addedRoofs)
// setRoofs(
// addedRoofs.map((roof, index) => {
// return {
// ...roof,
// ...roofsStore[index]?.addRoof,
// }
// }),
// )
setRoofs(
addedRoofs.map((roof, index) => {
return {
...roof,
...roofsStore[index]?.addRoof,
}
}),
)
setModuleSelectionData({
...moduleSelectionData,

8
src/components/floor-plan/modal/basic/step/Orientation.jsx
View File

@ -5,15 +5,17 @@ import { getDegreeInOrientation } from '@/util/canvas-util'
import { numberCheck } from '@/util/common-utils'
import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
import { addedRoofsState, basicSettingState } from '@/store/settingAtom'
import { useRecoilState, useRecoilValue } from 'recoil'
import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
import QSelectBox from '@/components/common/select/QSelectBox'
import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
import { roofsState } from '@/store/roofAtom'
export const Orientation = forwardRef((props, ref) => {
const { getMessage } = useMessage()
const [hasAnglePassivity, setHasAnglePassivity] = useState(false)
const basicSetting = useRecoilValue(basicSettingState)
const [addedRoofs, setAddedRoofs] = useRecoilState(addedRoofsState) //지붕재 선택
const setRoofsStore = useSetRecoilState(roofsState)
const [roofTab, setRoofTab] = useState(0) //지붕재 탭
const {
roofs,
@ -224,7 +226,9 @@ export const Orientation = forwardRef((props, ref) => {
snowGdChecked: false,
}
})
setRoofs(newRoofs)
// setRoofs(newRoofs)
// setAddedRoofs(newRoofs)
setRoofsStore(newRoofs)
}
return (

24
src/components/floor-plan/modal/basic/step/Trestle.jsx
View File

@ -124,7 +124,7 @@ const Trestle = forwardRef((props, ref) => {
roof: {
moduleTpCd: selectedModules.itemTp ?? '',
roofMatlCd: selectedRoof?.roofMatlCd ?? '',
raftBaseCd: trestleState.raftBaseCd ?? '',
raftBaseCd: selectedRaftBase.clCode,
trestleMkrCd: e.trestleMkrCd,
},
})
@ -137,8 +137,8 @@ const Trestle = forwardRef((props, ref) => {
roof: {
moduleTpCd: selectedModules.itemTp ?? '',
roofMatlCd: selectedRoof?.roofMatlCd ?? '',
raftBaseCd: trestleState.raftBaseCd ?? '',
trestleMkrCd: trestleState.trestleMkrCd,
raftBaseCd: selectedRaftBase.clCode,
trestleMkrCd: selectedTrestle.trestleMkrCd,
constMthdCd: e.constMthdCd,
},
})
@ -151,9 +151,9 @@ const Trestle = forwardRef((props, ref) => {
roof: {
moduleTpCd: selectedModules.itemTp ?? '',
roofMatlCd: selectedRoof?.roofMatlCd ?? '',
raftBaseCd: trestleState.raftBaseCd ?? '',
trestleMkrCd: trestleState.trestleMkrCd,
constMthdCd: trestleState.constMthdCd,
raftBaseCd: selectedRaftBase.clCode,
trestleMkrCd: selectedTrestle.trestleMkrCd,
constMthdCd: selectedConstMthd.constMthdCd,
roofBaseCd: e.roofBaseCd,
illuminationTp: managementState?.surfaceTypeValue ?? '',
instHt: managementState?.installHeight ?? '',
@ -192,10 +192,10 @@ const Trestle = forwardRef((props, ref) => {
roof: {
moduleTpCd: selectedModules.itemTp ?? '',
roofMatlCd: selectedRoof?.roofMatlCd ?? '',
raftBaseCd: trestleState.raftBaseCd ?? '',
trestleMkrCd: trestleState.trestleMkrCd,
constMthdCd: trestleState.constMthdCd,
roofBaseCd: trestleState.roofBaseCd,
raftBaseCd: selectedRaftBase.clCode,
trestleMkrCd: selectedTrestle.trestleMkrCd,
constMthdCd: selectedConstMthd.constMthdCd,
roofBaseCd: selectedRoofBase.roofBaseCd,
illuminationTp: managementState?.surfaceTypeValue ?? '',
instHt: managementState?.installHeight ?? '',
stdWindSpeed: managementState?.standardWindSpeedId ?? '',
@ -222,7 +222,7 @@ const Trestle = forwardRef((props, ref) => {
if (i === selectedRoof?.index) {
return {
...selectedRoof,
...trestleState,
trestle: trestleState,
eavesMargin,
ridgeMargin,
kerabaMargin,
@ -272,8 +272,8 @@ const Trestle = forwardRef((props, ref) => {
...roof.addRoof,
},
trestle: {
...roof.trestle,
...moduleSelectionData.roofConstructions[index]?.trestle,
...roof.trestle,
},
construction: {
...roof.construction,