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-25 11:22:13 +09:00
commit a7b11b374e
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/floor-plan/CanvasMenu.jsx
View File

@ -183,7 +183,7 @@ export default function CanvasMenu(props) {
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 'surface': case 'surface':
if (selectedMenu > menu.index) { if (['module', 'estimate', 'simulation'].some((menu) => menu === selectedMenu)) {
const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE)
if (modules.length > 0) { if (modules.length > 0) {
@ -223,7 +223,7 @@ export default function CanvasMenu(props) {
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 'module': case 'module':
if (selectedMenu < menu.index) { if (['placement', 'outline', 'surface'].some((menu) => menu === selectedMenu)) {
if (!checkMenuAndCanvasState()) { if (!checkMenuAndCanvasState()) {
swalFire({ text: getMessage('menu.validation.canvas.roof') }) swalFire({ text: getMessage('menu.validation.canvas.roof') })
return return

4
src/components/floor-plan/MenuDepth01.jsx
View File

@ -25,10 +25,6 @@ export default function MenuDepth01() {
} }
} }
useEffect(() => {
console.log(subMenus[selectedMenu])
}, [selectedMenu])
useEffect(() => { useEffect(() => {
handleMenu(selectedMenu) handleMenu(selectedMenu)
canvas?.discardActiveObject() canvas?.discardActiveObject()

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

@ -210,23 +210,26 @@ export default function PassivityCircuitAllocation(props) {
result[firstPart].count += 1 result[firstPart].count += 1
} }
} }
console.log('🚀 ~ handleCircuitNumberFix ~ result:', result)
const usedPcses = pcsList.filter((model) => model.isUsed) const usedPcses = pcsList.filter((model) => model.isUsed)
const pcsItemList = usedPcses.map((model, index) => { const pcsItemList = usedPcses.map((model, index) => {
return { if (result[(index + 1).toString()]) {
pcsMkrCd: model.pcsMkrCd, return {
pcsSerCd: model.pcsSerCd, pcsMkrCd: model.pcsMkrCd,
itemId: model.itemId, pcsSerCd: model.pcsSerCd,
itemNm: model.itemNm, itemId: model.itemId,
goodsNo: model.goodsNo, itemNm: model.itemNm,
serQtyList: [ goodsNo: model.goodsNo,
{ serQtyList: [
serQty: result[(index + 1).toString()].maxValue, {
paralQty: result[(index + 1).toString()].count, serQty: result[(index + 1).toString()].maxValue,
rmdYn: 'Y', paralQty: result[(index + 1).toString()].count,
usePossYn: 'Y', rmdYn: 'Y',
roofSurfaceList: roofSurfaceList, usePossYn: 'Y',
}, roofSurfaceList: roofSurfaceList,
], },
],
}
} }
}) })