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

- api 데이터 중 circuit 정보 없는 module 설정안하게 수정

Browse Source
This commit is contained in:
김민식 2025-02-21 16:20:33 +09:00
parent 6401195deb
commit 28640a7000
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
View File

@ -119,30 +119,32 @@ export default function StepUp(props) {
// 새로운 모듈 회로 정보 추가 // 새로운 모듈 회로 정보 추가
roofSurface.moduleList.forEach((module) => { roofSurface.moduleList.forEach((module) => {
const targetModule = canvas.getObjects().filter((obj) => obj.id === module.uniqueId)[0] const targetModule = canvas.getObjects().find((obj) => obj.id === module.uniqueId)
const moduleCircuitText = new fabric.Text(module.circuit, { if (targetModule && module.circuit !== '' && module.circuit) {
left: targetModule.left + targetModule.width / 2, const moduleCircuitText = new fabric.Text(module.circuit, {
top: targetModule.top + targetModule.height / 2, left: targetModule.left + targetModule.width / 2,
fontFamily: circuitNumberText.fontFamily.value, top: targetModule.top + targetModule.height / 2,
fontWeight: circuitNumberText.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal', fontFamily: circuitNumberText.fontFamily.value,
fontStyle: circuitNumberText.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal', fontWeight: circuitNumberText.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
fontSize: circuitNumberText.fontSize.value, fontStyle: circuitNumberText.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
fill: circuitNumberText.fontColor.value, fontSize: circuitNumberText.fontSize.value,
width: targetModule.width, fill: circuitNumberText.fontColor.value,
height: targetModule.height, width: targetModule.width,
textAlign: 'center', height: targetModule.height,
originX: 'center', textAlign: 'center',
originY: 'center', originX: 'center',
name: 'circuitNumber', originY: 'center',
parentId: targetModule.id, name: 'circuitNumber',
circuitInfo: module.pcsItemId, parentId: targetModule.id,
selectable: false, circuitInfo: module.pcsItemId,
visible: isDisplayCircuitNumber, selectable: false,
}) visible: isDisplayCircuitNumber,
targetModule.circuit = moduleCircuitText })
targetModule.pcsItemId = module.pcsItemId targetModule.circuit = moduleCircuitText
targetModule.circuitNumber = module.circuit targetModule.pcsItemId = module.pcsItemId
canvas.add(moduleCircuitText) targetModule.circuitNumber = module.circuit
canvas.add(moduleCircuitText)
}
}) })
}) })
} }
@ -441,8 +443,8 @@ export default function StepUp(props) {
canvas.renderAll() canvas.renderAll()
roofSurface.moduleList.forEach((module) => { roofSurface.moduleList.forEach((module) => {
const targetModule = canvas.getObjects().filter((obj) => obj.id === module.uniqueId)[0] const targetModule = canvas.getObjects().find((obj) => obj.id === module.uniqueId)
if (module.circuit !== '' && module.circuit) { if (targetModule && module.circuit !== '' && module.circuit !== null) {
const moduleCircuitText = new fabric.Text(module.circuit, { const moduleCircuitText = new fabric.Text(module.circuit, {
left: targetModule.left + targetModule.width / 2, left: targetModule.left + targetModule.width / 2,
top: targetModule.top + targetModule.height / 2, top: targetModule.top + targetModule.height / 2,