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

Merge branch 'qcast-pub' into dev

Browse Source
This commit is contained in:
김민식 2025-02-04 09:51:40 +09:00
commit 9a9867b55a
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
View File

@ -157,27 +157,26 @@ export default function CircuitTrestleSetting({ id }) {
} }
const getRoofSurfaceList = () => { const getRoofSurfaceList = () => {
return canvas const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
.getObjects() roofSurfaceList.sort((a, b) => a.left - b.left || b.top - a.top)
.filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) return roofSurfaceList.map((obj) => {
.map((obj) => { return {
return { roofSurfaceId: obj.id,
roofSurfaceId: obj.id, roofSurface: canvas
roofSurface: canvas .getObjects()
.getObjects() .filter((o) => o.id === obj.parentId)[0]
.filter((o) => o.id === obj.parentId)[0] .directionText.replace(/[0-9]/g, ''),
.directionText.replace(/[0-9]/g, ''), roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch,
roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, moduleList: getModuleList(obj).map((module) => {
moduleList: getModuleList(obj).map((module) => { return {
return { itemId: module.moduleInfo.itemId,
itemId: module.moduleInfo.itemId, circuit: module.circuitNumber ? module.circuitNumber : null,
circuit: module.circuitNumber ? module.circuitNumber : null, pcsItemId: module.circuit ? module.circuit?.pcsItemId : null,
pcsItemId: module.circuit ? module.circuit?.pcsItemId : null, uniqueId: module.id ? module.id : null,
uniqueId: module.id ? module.id : null, }
} }),
}), }
} })
})
} }
const getModuleList = (surface) => { const getModuleList = (surface) => {

3
src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
View File

@ -206,6 +206,9 @@ export default function PassivityCircuitAllocation(props) {
.getObjects() .getObjects()
.filter((obj) => targetModules.includes(obj.id)) .filter((obj) => targetModules.includes(obj.id))
.forEach((obj) => { .forEach((obj) => {
if (obj.circuit) {
canvas.remove(obj.circuit)
}
const moduleCircuitText = new fabric.Text(getCircuitNumber(), { const moduleCircuitText = new fabric.Text(getCircuitNumber(), {
left: obj.left + obj.width / 2, left: obj.left + obj.width / 2,
top: obj.top + obj.height / 2, top: obj.top + obj.height / 2,