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

feature/ysCha #23

Closed
ysCha wants to merge 259 commits from feature/ysCha into main
pull from: feature/ysCha
merge into: qcast3:main
Conversation 0 Commits 259 Files Changed 73 +5 -7
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2897dc26e3 - Show all commits

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

@ -125,7 +125,7 @@ export const Orientation = forwardRef((props, ref) => {
setVerticalSnowCover(inputVerticalSnowCover)
setSelectedSurfaceType(inputRoughness)
setStandardWindSpeed(inputStandardWindSpeed)
nextStep()
nextStep(inputCompasDeg)
setManagementState({
...managementState,
installHeight: inputInstallHeight,

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

@ -369,8 +369,6 @@ const Trestle = forwardRef((props, ref) => {
// ...constructionList.find((construction) => newAddedRoofs[index].construction.constTp === construction.constTp),
...roof.construction,
roofIndex: roof.index,
setupCover: roof.construction.cvrChecked,
setupSnowCover: roof.construction.snowGdChecked,
selectedIndex: roof.index,
},
trestleDetail: roof.trestleDetail,

2
src/hooks/module/useModuleBasicSetting.js
View File

@ -409,7 +409,7 @@ export function useModuleBasicSetting(tabNum) {
useEffect(() => {
if (canvasSetting.roofSizeSet != '3') {
if (isObjectNotEmpty(moduleSelectionData) && moduleSelectionData.common.saleStoreNorthFlg === '1') {
if (isObjectNotEmpty(moduleSelectionData) && moduleSelectionData?.common?.saleStoreNorthFlg === '1') {
setSaleStoreNorthFlg(true)
}
}

6
src/hooks/module/useOrientation.js
View File

@ -22,8 +22,8 @@ export function useOrientation() {
})
}, [])*/
const nextStep = () => {
if (isNaN(compasDeg)) {
const nextStep = (compas = compasDeg) => {
if (isNaN(compas)) {
setCompasDeg(0)
}
const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
@ -36,7 +36,7 @@ export function useOrientation() {
roofs.forEach((roof) => {
roof.set({
moduleCompass: isNaN(compasDeg) ? 0 : compasDeg,
moduleCompass: isNaN(compas) ? 0 : compas,
})
drawDirectionArrow(roof)
})