Merge branch 'qcast-pub' into dev

src/components/floor-plan/CanvasMenu.jsx

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

src/components/floor-plan/MenuDepth01.jsx

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

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

@@ -210,8 +210,10 @@ export default function PassivityCircuitAllocation(props) {
         result[firstPart].count += 1
       }
     }
+    console.log('🚀 ~ handleCircuitNumberFix ~ result:', result)
     const usedPcses = pcsList.filter((model) => model.isUsed)
     const pcsItemList = usedPcses.map((model, index) => {
+      if (result[(index + 1).toString()]) {
         return {
           pcsMkrCd: model.pcsMkrCd,
           pcsSerCd: model.pcsSerCd,
@@ -228,6 +230,7 @@ export default function PassivityCircuitAllocation(props) {
             },
           ],
         }
+      }
     })
 
     const params = {