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

Merge branch 'dev' into feature/yj-layoutSetup

Browse Source 
# Conflicts:
#	src/components/floor-plan/modal/basic/BasicSetting.jsx
This commit is contained in:
yjnoh 2025-04-02 15:21:15 +09:00
commit 8c33611440
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,12 +48,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 [manualSetupMode, setManualSetupMode] = useRecoilState(toggleManualSetupModeState) const [roofs, setRoofs] = useState(addedRoofs)
const [layoutSetup, setLayoutSetup] = useState([{}])
const [isManualModuleSetup, setIsManualModuleSetup] = useRecoilState(isManualModuleSetupState)
const [isManualModuleLayoutSetup, setIsManualModuleLayoutSetup] = useRecoilState(isManualModuleLayoutSetupState)
const [roofs, setRoofs] = useState(null)
const { const {
moduleSelectionInitParams, moduleSelectionInitParams,
selectedModules, selectedModules,

16
src/components/floor-plan/modal/basic/step/Trestle.jsx
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) => {