Merge branch 'qcast-pub' into dev

This commit is contained in:
김민식 2025-02-06 20:54:50 +09:00
commit 12d5ffeaf8
5 changed files with 13 additions and 1 deletions

View File

@ -193,7 +193,7 @@ export default function CircuitTrestleSetting({ id }) {
// //
const getUseModuleItemList = () => { const getUseModuleItemList = () => {
return selectedModules.itemList.map((m) => { return selectedModules?.itemList?.map((m) => {
return { return {
itemId: m.itemId, itemId: m.itemId,
mixMatlNo: m.mixMatlNo, mixMatlNo: m.mixMatlNo,

View File

@ -121,6 +121,7 @@ export default function StepUp(props) {
name: 'circuitNumber', name: 'circuitNumber',
parentId: targetModule.id, parentId: targetModule.id,
circuitInfo: module.pcsItemId, circuitInfo: module.pcsItemId,
selectable: false,
visible: isDisplayCircuitNumber, visible: isDisplayCircuitNumber,
}) })
targetModule.circuit = moduleCircuitText targetModule.circuit = moduleCircuitText

View File

@ -139,6 +139,7 @@ export default function PassivityCircuitAllocation(props) {
originX: 'center', originX: 'center',
originY: 'center', originY: 'center',
name: 'circuitNumber', name: 'circuitNumber',
selectable: false,
parentId: obj.id, parentId: obj.id,
circuitInfo: selectedPcs, circuitInfo: selectedPcs,
visible: isDisplayCircuitNumber, visible: isDisplayCircuitNumber,

View File

@ -882,6 +882,14 @@ export function useModule() {
const modulesRemove = () => { const modulesRemove = () => {
const activeModule = canvas.getObjects().filter((obj) => canvas.getActiveObjects()[0].id === obj.id)[0] const activeModule = canvas.getObjects().filter((obj) => canvas.getActiveObjects()[0].id === obj.id)[0]
if (activeModule.circuit) {
swalFire({
title: getMessage('can.not.remove.module'),
icon: 'error',
type: 'alert',
})
return
}
const modules = canvas const modules = canvas
.getObjects() .getObjects()
.filter((obj) => obj.surfaceId === activeModule.surfaceId && obj.name === POLYGON_TYPE.MODULE && activeModule.id !== obj.id) .filter((obj) => obj.surfaceId === activeModule.surfaceId && obj.name === POLYGON_TYPE.MODULE && activeModule.id !== obj.id)

View File

@ -176,6 +176,7 @@ export function useContextMenu() {
shortcut: ['d', 'D'], shortcut: ['d', 'D'],
name: `${getMessage('contextmenu.auxiliary.remove')}(D)`, name: `${getMessage('contextmenu.auxiliary.remove')}(D)`,
fn: () => { fn: () => {
if (!currentObject) return
const roof = canvas.getObjects().filter((obj) => obj.id === currentObject.attributes.roofId)[0] const roof = canvas.getObjects().filter((obj) => obj.id === currentObject.attributes.roofId)[0]
const innerLines = roof.innerLines?.filter((line) => currentObject.id !== line.id) const innerLines = roof.innerLines?.filter((line) => currentObject.id !== line.id)
roof.innerLines = [...innerLines] roof.innerLines = [...innerLines]
@ -187,6 +188,7 @@ export function useContextMenu() {
id: 'auxiliaryVerticalBisector', id: 'auxiliaryVerticalBisector',
name: getMessage('contextmenu.auxiliary.vertical.bisector'), name: getMessage('contextmenu.auxiliary.vertical.bisector'),
fn: () => { fn: () => {
if (!currentObject) return
const slope = (currentObject.y2 - currentObject.y1) / (currentObject.x2 - currentObject.x1) const slope = (currentObject.y2 - currentObject.y1) / (currentObject.x2 - currentObject.x1)
const length = currentObject.length const length = currentObject.length