diff --git a/src/components/common/draggable/WithDraggable.jsx b/src/components/common/draggable/WithDraggable.jsx
index e2f769cc..49552eac 100644
--- a/src/components/common/draggable/WithDraggable.jsx
+++ b/src/components/common/draggable/WithDraggable.jsx
@@ -3,16 +3,7 @@
import { useState } from 'react'
import Draggable from 'react-draggable'
-export default function WithDraggable({
- isShow,
- children,
- pos = { x: 0, y: 0 },
- handle = '',
- className = '',
- isModal = true,
- hasFooter = true,
- isHidden = false,
-}) {
+export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 }, handle = '', className = '', hasFooter = true, isHidden = false }) {
const [position, setPosition] = useState(pos)
const handleOnDrag = (e, data) => {
@@ -31,14 +22,10 @@ export default function WithDraggable({
onDrag={(e, data) => handleOnDrag(e, data)}
handle={handle === '' ? '.modal-handle' : handle}
>
- {isModal ? (
-
- {children}
- {hasFooter && }
-
- ) : (
- <>{children}>
- )}
+
+ {children}
+ {hasFooter && }
+
)}
>
@@ -68,15 +55,10 @@ function WithDraggableBody({ children }) {
)
}
-function WithDraggablePanel({ children }) {
- return <>{children}>
-}
-
function WithDraggableFooter() {
return
}
WithDraggable.Header = WithDraggableHeader
WithDraggable.Body = WithDraggableBody
-WithDraggable.Panel = WithDraggablePanel
WithDraggable.Footer = WithDraggableFooter
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
index 89aa30d7..b48ecffd 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
@@ -165,6 +165,15 @@ export default function PowerConditionalSelect(props) {
return
}
+ if (selectedRow.pcsSerParallelYn === 'Y' && selectedModels.length === 0 && selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.SINGLE_P) {
+ swalFire({
+ title: getMessage('modal.module.pcs.error1'),
+ icon: 'warning',
+ })
+
+ return
+ }
+
if (selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) {
setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4() }])
} else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) {
@@ -174,6 +183,11 @@ export default function PowerConditionalSelect(props) {
}
const onRemoveSelectedModel = (model) => {
+ const tempModels = selectedModels.filter((m) => m.id !== model.id)
+ if (tempModels.length === 1 && tempModels[0].pcsSerParallelYn === 'Y') {
+ setSelectedModels([])
+ return
+ }
setSelectedModels(selectedModels.filter((m) => m.id !== model.id))
}
@@ -282,14 +296,6 @@ export default function PowerConditionalSelect(props) {
- {/*
-
-
-
*/}
>
)
}
diff --git a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
index e789bc4a..fa4703be 100644
--- a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
+++ b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
@@ -11,60 +11,64 @@ import { canvasState } from '@/store/canvasAtom'
import { POLYGON_TYPE } from '@/common/common'
import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle'
import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
+import Draggable from 'react-draggable'
export default function PanelBatchStatistics() {
const { getMessage } = useMessage()
const [isFold, setIsFold] = useState(false)
- const [pos, setPos] = useState({
- x: 0,
- y: 30,
- })
const canvas = useRecoilValue(canvasState)
const { header, rows, footer } = useRecoilValue(moduleStatisticsState)
const { setModuleStatisticsData } = useCircuitTrestle(true)
const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState)
+ const [position, setPosition] = useState({
+ x: 0,
+ y: 30,
+ })
+
+ const handleOnDrag = (e, data) => {
+ e.stopPropagation()
+ setPosition({ x: data.x, y: data.y })
+ }
useEffect(() => {
if (moduleSelectionDataStore && moduleSelectionDataStore.module) setModuleStatisticsData()
}, [])
return (
-
-
-
-
{getMessage('modal.panel.batch.statistic')}
-
-
-
-
-
- {header.map((item, index) => (
- | {item.name} |
- ))}
-
-
-
- {rows.map((row, index) => (
-
- {header.map((item, i) => (
- | {row[item.prop] ?? 0} |
- ))}
-
+ handleOnDrag(e, data)} handle=".penal-wrap">
+
+
{getMessage('modal.panel.batch.statistic')}
+
+
+
+
+
+ {header.map((item, index) => (
+ | {item.name} |
))}
-
- {header.map((header, index) => (
- |
- {typeof footer[header.prop] === 'number'
- ? footer[header.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 })
- : footer[header.prop]}
- |
+
+
+
+ {rows.map((row, index) => (
+
+ {header.map((item, i) => (
+ | {row[item.prop] ?? 0} |
))}
-
-
-
+ ))}
+
+ {header.map((header, index) => (
+ |
+ {typeof footer[header.prop] === 'number'
+ ? footer[header.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 })
+ : footer[header.prop]}
+ |
+ ))}
+
+
+
-
-
+
+
)
}