feature/ysCha #23

Closed
ysCha wants to merge 259 commits from feature/ysCha into main
2 changed files with 14 additions and 4 deletions
Showing only changes of commit d8e43b0d81 - Show all commits

View File

@ -42,7 +42,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState) const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState)
const [isClosePopup, setIsClosePopup] = useState({ close: false, id: 0 }) const [isClosePopup, setIsClosePopup] = useState({ close: false, id: 0 })
const [checkedModules, setCheckedModules] = useRecoilState(checkedModuleState) const [checkedModules, setCheckedModules] = useRecoilState(checkedModuleState)
const [roofs, setRoofs] = useState(null) const [roofs, setRoofs] = useState(addedRoofs)
const { const {
moduleSelectionInitParams, moduleSelectionInitParams,
selectedModules, selectedModules,

View File

@ -258,9 +258,19 @@ const Trestle = forwardRef((props, ref) => {
setRoofs(newAddedRoofs) setRoofs(newAddedRoofs)
setModuleSelectionData({ setModuleSelectionData({
...moduleSelectionData, ...moduleSelectionData,
roofConstruction: { roofConstructions: newAddedRoofs.map((roof) => {
...newAddedRoofs, return {
}, addRoof: {
...roof.addRoof,
},
trestle: {
...roof.trestle,
},
construction: {
...roof.construction,
},
}
}),
}) })
trestleTrigger({ trestleTrigger({
roofConstruction: newAddedRoofs.map((roof) => { roofConstruction: newAddedRoofs.map((roof) => {