Compare commits
No commits in common. "7ff0178b198475d3e08d2e88a6a09c691a5a3009" and "ebd84967f23e9907677effaa01e4c4e03e157d5e" have entirely different histories.
7ff0178b19
...
ebd84967f2
@ -1,13 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
apps: [
|
|
||||||
{
|
|
||||||
name: 'qcast-front-development',
|
|
||||||
script: 'node_modules/next/dist/bin/next',
|
|
||||||
instances: 1,
|
|
||||||
exec_mode: 'fork',
|
|
||||||
env: {
|
|
||||||
NODE_ENV: 'development',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@ -2,12 +2,9 @@ module.exports = {
|
|||||||
apps: [
|
apps: [
|
||||||
{
|
{
|
||||||
name: 'qcast-front-production',
|
name: 'qcast-front-production',
|
||||||
script: 'node_modules/next/dist/bin/next',
|
script: 'npm run start:dev',
|
||||||
instances: 2,
|
instance: 2,
|
||||||
exec_mode: 'cluster',
|
exec_mode: 'cluster',
|
||||||
env: {
|
|
||||||
NODE_ENV: 'production',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|||||||
@ -452,7 +452,7 @@ const Trestle = forwardRef((props, ref) => {
|
|||||||
}),
|
}),
|
||||||
|
|
||||||
new Promise((resolve) => {
|
new Promise((resolve) => {
|
||||||
const roofConstructions = newAddedRoofs.map((roof, index) => ({
|
const roofConstruction = newAddedRoofs.map((roof, index) => ({
|
||||||
roofIndex: newRoofs[index].index,
|
roofIndex: newRoofs[index].index,
|
||||||
addRoof: newRoofs[index],
|
addRoof: newRoofs[index],
|
||||||
trestle: {
|
trestle: {
|
||||||
@ -468,9 +468,9 @@ const Trestle = forwardRef((props, ref) => {
|
|||||||
trestleDetail: roof.trestleDetail,
|
trestleDetail: roof.trestleDetail,
|
||||||
}))
|
}))
|
||||||
trestleTrigger({
|
trestleTrigger({
|
||||||
roofConstructions,
|
roofConstruction,
|
||||||
})
|
})
|
||||||
setRoofsStore(roofConstructions)
|
setRoofsStore(roofConstruction)
|
||||||
resolve()
|
resolve()
|
||||||
}),
|
}),
|
||||||
]
|
]
|
||||||
|
|||||||
@ -76,15 +76,16 @@ export function useCanvasPopupStatusController(param = 1) {
|
|||||||
roofSurfaceList.forEach((surface) => {
|
roofSurfaceList.forEach((surface) => {
|
||||||
surface.modules = modules.filter((module) => module.surfaceId === surface.id)
|
surface.modules = modules.filter((module) => module.surfaceId === surface.id)
|
||||||
})
|
})
|
||||||
if (data.roofConstructions) {
|
if (data.roofConstruction) {
|
||||||
setRoofs(data.roofConstructions)
|
setRoofs(data.roofConstruction)
|
||||||
setManagementState({ ...managementState, roofs: data.roofConstructions.map((roof) => roof.construction.managementState) })
|
setManagementState({ ...managementState, roofs: data.roofConstruction.map((roof) => roof.construction.managementState) })
|
||||||
// setModuleSelectionDataStore({ ...moduleSelectionDataStore, roofConstructions: data.roofConstruction })
|
// setModuleSelectionDataStore({ ...moduleSelectionDataStore, roofConstructions: data.roofConstruction })
|
||||||
resultData = { ...resultData, roofConstructions: data.roofConstructions }
|
resultData = { ...resultData, ...data }
|
||||||
}
|
}
|
||||||
// if (data?.module) setManagementState(data.common.managementState)
|
// if (data?.module) setManagementState(data.common.managementState)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
console.log('resultData', resultData)
|
||||||
setModuleSelectionDataStore(resultData)
|
setModuleSelectionDataStore(resultData)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user