Merge branch 'qcast-pub' into dev

src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx

@@ -92,12 +92,29 @@ export default function PowerConditionalSelect(props) {
   }
 
   const onCheckSeries = (data) => {
-    const copySeries = series.map((s) => {
+    let copySeries = []
-      return {
+    if (data.pcsMkrMultiType === 'MULTI') {
-        ...s,
+      copySeries = series.map((s) => {
-        selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected,
+        return {
-      }
+          ...s,
-    })
+          selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected,
+        }
+      })
+    } else if (data.pcsMkrMultiType === 'SINGLE-P') {
+      copySeries = series.map((s) => {
+        return {
+          ...s,
+          selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.pcsMkrMultiType === 'MULTI' ? s.selected : false,
+        }
+      })
+    } else {
+      copySeries = series.map((s) => {
+        return {
+          ...s,
+          selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : false,
+        }
+      })
+    }
     setSeries(copySeries)
     handleSetmodels(copySeries.filter((s) => s.selected))
   }
@@ -147,7 +164,11 @@ export default function PowerConditionalSelect(props) {
 
       return
     }
-    setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
+    if (selectedMaker.pcsMkrMultiType === 'MULTI') {
+      setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
+    } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) {
+      setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }])
+    }
     setSelectedRow(null)
   }
 
@@ -160,8 +181,6 @@ export default function PowerConditionalSelect(props) {
       setModels([])
       setSelectedModels([])
       setSelectedMaker(option)
-      console.log('option', option)
-      getUseModuleItemList
       const param = {
         pcsMkrCd: option.pcsMkrCd,
         mixMatlNo: getUseModuleItemList()[0].mixMatlNo,

src/util/common-utils.js

@@ -130,7 +130,7 @@ export const calculateFlowDirection = (canvasAngle) => {
  */
 export const getQueryString = (o) => {
   const queryString = Object.keys(o)
-    .map((key) => `${key}=${o[key]}`)
+    .map((key) => `${key}=${o[key] ?? ''}`)
     .join('&')
   return `?${queryString}`
 }